[SCM] Wormux PKG branch, upstream, updated. 5c8f2b4bddad9f1f75083467d38922ca97847507

Eddy Petrișor eddy.petrisor at gmail.com
Mon Nov 3 23:44:25 UTC 2008


The following commit has been merged in the upstream branch:
commit 5c8f2b4bddad9f1f75083467d38922ca97847507
Author: Eddy Petrișor <eddy.petrisor at gmail.com>
Date:   Tue Nov 4 01:39:03 2008 +0200

    Committed the unpacked wormux_0.8.1.orig.tar.gz file

diff --git a/ChangeLog b/ChangeLog
index 394d83f..93427ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+> 2008/09/16 - 0.8.1 release
+  - Game mode editor for local game (allows you to choose some game options)
+  - Team editor for local game (allows you to personalize characters names)
+  - Better menus: tabs, basic keyboard control, more options,...
+  - All characters redrawn: better graphisms, new positions, new clothes,...
+  - 2 new skins: Pidgin and Suse
+  - New maps: Lonely island and oktopus
+  - New waters: add lava, dirty water,...
+  - Better minimap
+  - New weapon: slap
+  - Some sounds added (thanks a lot to wesnoth project)
+  - A lot of bug fixes
+  - A lot of improvements (code and graphism)
+  - Translations updates
+
 > 2008/05/16 - 0.8 release
   - Network game fixes
   - Lot of bugfixes /cleaning code
diff --git a/INSTALL b/INSTALL
index bfec279..29ba11e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,10 +17,10 @@ before attempting to install Wormux 0.8 on your computer...
 * All dependencies in one command (Debian/Ubuntu)
 -------------------------------------------------
 
-sudo apt-get install g++ \
-   libxml++2.6-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev \
+sudo apt-get install g++ gettext \
+   libxml2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev \
    libsdl-image1.2-dev libsdl-gfx1.2-dev \
-   libcurl4-dev libsdl-net1.2-d
+   libcurl4-dev libsdl-net1.2-dev
 
 * SDL
 -----
diff --git a/Makefile.am b/Makefile.am
index 9e56eb2..cf67355 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,12 +18,11 @@ EXTRA_DIST = data/wormux.desktop                   \
              doc/howto_play/pl.pdf                 \
              doc/howto_play/sk.pdf                 \
              doc/howto_play/sv.pdf                 \
-			 mac/Info.plist.in					   \
-			 mac/PkgInfo.in						   \
-			 mac/README-mac.txt					   \
-			 mac/build_wormux_fink.sh			   \
-			 mac/build_wormux_first.sh			   \
-			 mac/build_wormux_macports.sh		   \
+	     mac/Info.plist.in			   \
+	     mac/PkgInfo.in			   \
+	     mac/README-mac.txt			   \
+	     mac/README-mac.txt			   \
+	     mac/cmake_build.sh                    \
              visual/wormux.vcproj                  \
              src/msvc/config.h                     \
              src/msvc/getopt.c                     \
diff --git a/Makefile.in b/Makefile.in
index 0b4dcdd..e09d7ff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -36,11 +32,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
 	ChangeLog INSTALL TODO config.guess config.rpath config.sub \
 	depcomp install-sh missing
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_warn_all.m4 \
 	$(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/po.m4 \
@@ -48,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_warn_all.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
@@ -56,10 +52,13 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -75,14 +74,10 @@ GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
-AUTOPACKAGE_FALSE = @AUTOPACKAGE_FALSE@
-AUTOPACKAGE_TRUE = @AUTOPACKAGE_TRUE@
 AWK = @AWK@
 BUILD_ENV = @BUILD_ENV@
 CC = @CC@
@@ -104,13 +99,10 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FONTFILE = @FONTFILE@
-GCC_FALSE = @GCC_FALSE@
-GCC_TRUE = @GCC_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-INCLUDEDINTL_FALSE = @INCLUDEDINTL_FALSE@
-INCLUDEDINTL_TRUE = @INCLUDEDINTL_TRUE@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -129,6 +121,7 @@ LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -148,23 +141,19 @@ SDL_GFX_PREFIX = @SDL_GFX_PREFIX@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STATIC_FALSE = @STATIC_FALSE@
-STATIC_TRUE = @STATIC_TRUE@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WIN32_FALSE = @WIN32_FALSE@
-WIN32_TRUE = @WIN32_TRUE@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 _libcurl_config = @_libcurl_config@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -176,6 +165,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cxx_present = @cxx_present@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -204,12 +194,15 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = data src po doc
 EXTRA_DIST = data/wormux.desktop                   \
              doc/license/COPYING.de.txt            \
@@ -229,12 +222,11 @@ EXTRA_DIST = data/wormux.desktop                   \
              doc/howto_play/pl.pdf                 \
              doc/howto_play/sk.pdf                 \
              doc/howto_play/sv.pdf                 \
-			 mac/Info.plist.in					   \
-			 mac/PkgInfo.in						   \
-			 mac/README-mac.txt					   \
-			 mac/build_wormux_fink.sh			   \
-			 mac/build_wormux_first.sh			   \
-			 mac/build_wormux_macports.sh		   \
+	     mac/Info.plist.in			   \
+	     mac/PkgInfo.in			   \
+	     mac/README-mac.txt			   \
+	     mac/README-mac.txt			   \
+	     mac/cmake_build.sh                    \
              visual/wormux.vcproj                  \
              src/msvc/config.h                     \
              src/msvc/getopt.c                     \
@@ -282,7 +274,6 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -315,8 +306,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -360,8 +350,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -386,8 +376,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -397,13 +387,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -418,24 +407,22 @@ distclean-tags:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/data $(distdir)/doc/howto_play $(distdir)/doc/license $(distdir)/m4 $(distdir)/mac $(distdir)/src/msvc $(distdir)/tools/win32_setup $(distdir)/visual
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -449,7 +436,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -457,6 +444,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -464,7 +453,7 @@ distdir: $(DISTFILES)
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -474,6 +463,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -500,6 +493,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -539,7 +534,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -608,12 +603,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -634,23 +637,25 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-recursive distclean-tags distcleancheck distdir \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
 
 
 @WIN32_TRUE at install: all
diff --git a/aclocal.m4 b/aclocal.m4
index f603683..40441c5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,8 +11,16 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# gettext.m4 serial 59 (gettext-0.16.1)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# gettext.m4 serial 60 (gettext-0.17)
+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -375,44 +383,6 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
 ])
 
 
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in MacOS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    gt_cv_func_CFPreferencesCopyAppValue,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
-      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Check for API introduced in MacOS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
-      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
-
-
 dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
 m4_define([gt_NEEDS_INIT],
 [
@@ -431,8 +401,8 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED],
 dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# iconv.m4 serial AM6 (gettext-0.17)
+dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -454,6 +424,7 @@ AC_DEFUN([AM_ICONV_LINK],
 [
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
@@ -466,7 +437,7 @@ AC_DEFUN([AM_ICONV_LINK],
   am_save_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+  AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     AC_TRY_LINK([#include <stdlib.h>
@@ -489,7 +460,85 @@ AC_DEFUN([AM_ICONV_LINK],
     fi
   ])
   if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+      dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1,
+      [Define if you have the iconv() function and it works.])
   fi
   if test "$am_cv_lib_iconv" = yes; then
     AC_MSG_CHECKING([how to link with libiconv])
@@ -533,6 +582,58 @@ size_t iconv();
   fi
 ])
 
+# intlmacosx.m4 serial 1 (gettext-0.17)
+dnl Copyright (C) 2004-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    gt_cv_func_CFPreferencesCopyAppValue,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
 # lib-ld.m4 serial 3 (gettext-0.13)
 dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -644,20 +745,22 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_LIB_PROG_LD_GNU
 ])
 
-# lib-link.m4 serial 9 (gettext-0.16)
-dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
+# lib-link.m4 serial 13 (gettext-0.17)
+dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
 dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
@@ -670,13 +773,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
   ])
   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
   LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
   INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
   AC_SUBST([LIB]NAME)
   AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
   dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
   dnl results of this search when this library appears as a dependency.
   HAVE_LIB[]NAME=yes
@@ -692,6 +798,8 @@ dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
 dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
 dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
 dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
@@ -728,17 +836,23 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
     CPPFLAGS="$ac_save_CPPFLAGS"
     LIB[]NAME=
     LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
   fi
   AC_SUBST([HAVE_LIB]NAME)
   AC_SUBST([LIB]NAME)
   AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
   undefine([Name])
   undefine([NAME])
 ])
 
 dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],
 [
   dnl Tell automake >= 1.10 to complain if config.rpath is missing.
@@ -755,12 +869,14 @@ AC_DEFUN([AC_LIB_RPATH],
     acl_cv_rpath=done
   ])
   wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
   dnl Determine whether the user wants rpath handling at all.
   AC_ARG_ENABLE(rpath,
     [  --disable-rpath         do not hardcode runtime library paths],
@@ -770,20 +886,24 @@ AC_DEFUN([AC_LIB_RPATH],
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
   AC_LIB_WITH_FINAL_PREFIX([
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   ])
-  AC_LIB_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
+  AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
+[  --with-lib]N_A_M_E[-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib]N_A_M_E[-prefix     don't search for lib$1 in includedir and libdir],
 [
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -804,6 +924,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
   LIB[]NAME=
   LTLIB[]NAME=
   INC[]NAME=
+  LIB[]NAME[]_PREFIX=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -843,27 +964,53 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" \
-               && { test -f "$additional_libdir/lib$name.$shlibext" \
-                    || { test "$shlibext" = dll \
-                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
-              found_dir="$additional_libdir"
-              if test -f "$additional_libdir/lib$name.$shlibext"; then
-                found_so="$additional_libdir/lib$name.$shlibext"
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
               else
-                found_so="$additional_libdir/lib$name.dll.a"
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
               fi
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
               fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
               fi
             fi
           fi
@@ -873,26 +1020,44 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" \
-                     && { test -f "$dir/lib$name.$shlibext" \
-                          || { test "$shlibext" = dll \
-                               && test -f "$dir/lib$name.dll.a"; }; }; then
-                    found_dir="$dir"
-                    if test -f "$dir/lib$name.$shlibext"; then
-                      found_so="$dir/lib$name.$shlibext"
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
                     else
-                      found_so="$dir/lib$name.dll.a"
-                    fi
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
                     fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
                     fi
                   fi
                   ;;
@@ -928,12 +1093,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
                 dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
+                if test "$acl_hardcode_direct" = yes; then
                   dnl Using DIR/libNAME.so during linking hardcodes DIR into the
                   dnl resulting binary.
                   LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                     dnl Use an explicit option to hardcode DIR into the resulting
                     dnl binary.
                     LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
@@ -964,13 +1129,13 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     if test -z "$haveit"; then
                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                       dnl FIXME: Not sure whether we should use
                       dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
                       dnl here.
                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
                     else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
                       dnl here, because this doesn't fit in flags passed to the
                       dnl compiler. So give up. No hardcoding. This affects only
                       dnl very old systems.
@@ -997,6 +1162,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIB[]NAME[]_PREFIX="$basedir"
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -1158,18 +1324,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
       dnl Weird platform: only the last -rpath option counts, the user must
       dnl pass all path elements in one option. We can arrange that for a
       dnl single library, but not when more than one $LIBNAMEs are used.
       alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
       acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
     else
@@ -1177,7 +1343,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
       for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
       done
@@ -1226,7 +1392,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   $1=
   if test "$enable_rpath" != no; then
-    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
       dnl Use an explicit option to hardcode directories into the resulting
       dnl binary.
       rpathdirs=
@@ -1260,16 +1426,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
           done
         else
           dnl The linker is used for linking directly.
-          if test -n "$hardcode_libdir_separator"; then
+          if test -n "$acl_hardcode_libdir_separator"; then
             dnl Weird platform: only the last -rpath option counts, the user
             dnl must pass all path elements in one option.
             alldirs=
             for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
             done
             acl_save_libdir="$libdir"
             libdir="$alldirs"
-            eval flag=\"$hardcode_libdir_flag_spec\"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
             libdir="$acl_save_libdir"
             $1="$flag"
           else
@@ -1277,7 +1443,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
             for dir in $rpathdirs; do
               acl_save_libdir="$libdir"
               libdir="$dir"
-              eval flag=\"$hardcode_libdir_flag_spec\"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
               libdir="$acl_save_libdir"
               $1="${$1}${$1:+ }$flag"
             done
@@ -1600,7 +1766,7 @@ fi
 AC_SUBST($1)dnl
 ])
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1610,14 +1776,31 @@ AC_SUBST($1)dnl
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -1674,14 +1857,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -1690,8 +1873,10 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -1705,15 +1890,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -1741,6 +1925,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -1806,6 +1991,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -1858,7 +2044,8 @@ if test "x$enable_dependency_tracking" != xno; then
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -1883,8 +2070,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -1943,14 +2131,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -1967,16 +2155,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -1996,6 +2188,9 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -2031,6 +2226,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -2044,16 +2243,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -2066,7 +2266,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -2144,14 +2344,14 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -2167,6 +2367,7 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -2177,7 +2378,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2185,60 +2386,23 @@ fi
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -2350,9 +2514,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
diff --git a/configure b/configure
index 26707b4..d965ac4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Wormux 0.8.
+# Generated by GNU Autoconf 2.61 for Wormux 0.8.1.
 #
 # Report bugs to <wormux-dev at gna.org>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Wormux'
 PACKAGE_TARNAME='wormux'
-PACKAGE_VERSION='0.8'
-PACKAGE_STRING='Wormux 0.8'
+PACKAGE_VERSION='0.8.1'
+PACKAGE_STRING='Wormux 0.8.1'
 PACKAGE_BUGREPORT='wormux-dev at gna.org'
 
 ac_unique_file="src/main.cpp"
@@ -668,6 +668,7 @@ target_os
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -1268,7 +1269,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Wormux 0.8 to adapt to many kinds of systems.
+\`configure' configures Wormux 0.8.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1339,7 +1340,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Wormux 0.8:";;
+     short | recursive ) echo "Configuration of Wormux 0.8.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1454,7 +1455,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Wormux configure 0.8
+Wormux configure 0.8.1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1468,7 +1469,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Wormux $as_me 0.8, which was
+It was created by Wormux $as_me 0.8.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1983,7 +1984,8 @@ test -n "$target_alias" &&
   program_prefix=${target_alias}-
 
 #AC_CONFIG_AUX_DIR([config])
-am__api_version="1.9"
+am__api_version='1.10'
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2135,38 +2137,53 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
@@ -2249,12 +2266,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2269,7 +2290,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='wormux'
- VERSION='0.8'
+ VERSION='0.8.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2297,7 +2318,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2401,7 +2422,7 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2779,9 +2800,7 @@ if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -2790,7 +2809,6 @@ else
 fi
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3777,6 +3795,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3806,9 +3825,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -3952,12 +3969,14 @@ fi
 { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
 echo "${ECHO_T}$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then
   enableval=$enable_rpath; :
@@ -3992,6 +4011,7 @@ fi
 
 
 
+
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -4036,6 +4056,7 @@ fi
       LIBICONV=
   LTLIBICONV=
   INCICONV=
+  LIBICONV_PREFIX=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -4069,27 +4090,50 @@ fi
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" \
-               && { test -f "$additional_libdir/lib$name.$shlibext" \
-                    || { test "$shlibext" = dll \
-                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
-              found_dir="$additional_libdir"
-              if test -f "$additional_libdir/lib$name.$shlibext"; then
-                found_so="$additional_libdir/lib$name.$shlibext"
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
               else
-                found_so="$additional_libdir/lib$name.dll.a"
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
               fi
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
               fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
               fi
             fi
           fi
@@ -4107,26 +4151,42 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" \
-                     && { test -f "$dir/lib$name.$shlibext" \
-                          || { test "$shlibext" = dll \
-                               && test -f "$dir/lib$name.dll.a"; }; }; then
-                    found_dir="$dir"
-                    if test -f "$dir/lib$name.$shlibext"; then
-                      found_so="$dir/lib$name.$shlibext"
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
                     else
-                      found_so="$dir/lib$name.dll.a"
-                    fi
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
                     fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
                     fi
                   fi
                   ;;
@@ -4152,10 +4212,10 @@ fi
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$hardcode_direct" = yes; then
+                                if test "$acl_hardcode_direct" = yes; then
                                                       LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                                                             LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -4187,7 +4247,7 @@ fi
                     if test -z "$haveit"; then
                       LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                                                                                         LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                     else
                                                                                                                                                                                 LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
@@ -4206,6 +4266,7 @@ fi
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIBICONV_PREFIX="$basedir"
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -4356,21 +4417,21 @@ fi
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
@@ -4770,6 +4831,132 @@ fi
 { echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
+    { echo "$as_me:$LINENO: checking for working iconv" >&5
+echo $ECHO_N "checking for working iconv... $ECHO_C" >&6; }
+if test "${am_cv_func_iconv_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+            am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes; then
+  case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  am_cv_func_iconv_works=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+      LIBS="$am_save_LIBS"
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5
+echo "${ECHO_T}$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ICONV 1
@@ -4793,6 +4980,7 @@ echo "${ECHO_T}$LIBICONV" >&6; }
 
 
 
+
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -4837,6 +5025,7 @@ fi
       LIBINTL=
   LTLIBINTL=
   INCINTL=
+  LIBINTL_PREFIX=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -4870,27 +5059,50 @@ fi
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" \
-               && { test -f "$additional_libdir/lib$name.$shlibext" \
-                    || { test "$shlibext" = dll \
-                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
-              found_dir="$additional_libdir"
-              if test -f "$additional_libdir/lib$name.$shlibext"; then
-                found_so="$additional_libdir/lib$name.$shlibext"
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
               else
-                found_so="$additional_libdir/lib$name.dll.a"
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
               fi
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
               fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
               fi
             fi
           fi
@@ -4908,26 +5120,42 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" \
-                     && { test -f "$dir/lib$name.$shlibext" \
-                          || { test "$shlibext" = dll \
-                               && test -f "$dir/lib$name.dll.a"; }; }; then
-                    found_dir="$dir"
-                    if test -f "$dir/lib$name.$shlibext"; then
-                      found_so="$dir/lib$name.$shlibext"
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
                     else
-                      found_so="$dir/lib$name.dll.a"
-                    fi
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
                     fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
                     fi
                   fi
                   ;;
@@ -4953,10 +5181,10 @@ fi
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$hardcode_direct" = yes; then
+                                if test "$acl_hardcode_direct" = yes; then
                                                       LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                                                             LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -4988,7 +5216,7 @@ fi
                     if test -z "$haveit"; then
                       LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                                                                                         LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                     else
                                                                                                                                                                                 LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
@@ -5007,6 +5235,7 @@ fi
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIBINTL_PREFIX="$basedir"
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -5157,21 +5386,21 @@ fi
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
@@ -5419,6 +5648,11 @@ _ACEOF
 
 
 
+if test "x$USE_NLS" != "xyes"; then
+  { echo "$as_me:$LINENO: WARNING: gettext is disabled. If you want internationalisation, please install gettext package." >&5
+echo "$as_me: WARNING: gettext is disabled. If you want internationalisation, please install gettext package." >&2;}
+fi
+
 
 { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
@@ -6193,6 +6427,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -6222,9 +6457,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -6666,6 +6899,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -6695,9 +6929,7 @@ fi
 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
   am__fastdepCXX_TRUE=
@@ -7267,9 +7499,7 @@ echo "$as_me: error: windres could not be found within your path." >&2;}
      ;;
   *) WIN32="no" ;;
 esac
-
-
-if test "$WIN32" = "yes"; then
+ if test "$WIN32" = "yes"; then
   WIN32_TRUE=
   WIN32_FALSE='#'
 else
@@ -7318,9 +7548,7 @@ else
   enable_autopackage=no
 fi
 
-
-
-if test "$enable_autopackage" = "yes"; then
+ if test "$enable_autopackage" = "yes"; then
   AUTOPACKAGE_TRUE=
   AUTOPACKAGE_FALSE='#'
 else
@@ -7329,9 +7557,7 @@ else
 fi
 
 
-
-
-if test x$static = xyes; then
+ if test x$static = xyes; then
   STATIC_TRUE=
   STATIC_FALSE='#'
 else
@@ -7339,9 +7565,7 @@ else
   STATIC_FALSE=
 fi
 
-
-
-if test x$GXX = xyes; then
+ if test x$GXX = xyes; then
   GCC_TRUE=
   GCC_FALSE='#'
 else
@@ -7349,9 +7573,7 @@ else
   GCC_FALSE=
 fi
 
-
-
-if test x$nls_cv_use_gnu_gettext = xyes; then
+ if test x$nls_cv_use_gnu_gettext = xyes; then
   INCLUDEDINTL_TRUE=
   INCLUDEDINTL_FALSE='#'
 else
@@ -10702,7 +10924,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Wormux $as_me 0.8, which was
+This file was extended by Wormux $as_me 0.8.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10755,7 +10977,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Wormux config.status 0.8
+Wormux config.status 0.8.1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -10766,6 +10988,7 @@ gives unlimited permission to copy, distribute and modify it."
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -10997,6 +11220,7 @@ target_os!$target_os$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@@ -11041,7 +11265,6 @@ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
 am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
 INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
 LIBICONV!$LIBICONV$ac_delim
-LTLIBICONV!$LTLIBICONV$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -11083,6 +11306,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+LTLIBICONV!$LTLIBICONV$ac_delim
 INTLLIBS!$INTLLIBS$ac_delim
 LIBINTL!$LIBINTL$ac_delim
 LTLIBINTL!$LTLIBINTL$ac_delim
@@ -11125,7 +11349,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -11352,6 +11576,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -11405,6 +11634,7 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
 
@@ -11520,21 +11750,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -11682,8 +11913,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
@@ -12919,7 +13151,8 @@ else
    echo "* Game locale will be installed into $LOCALEDIR"
    echo "* Font file will be $FONTFILE"
    echo ""
-   echo "* [Optional] Bi-directional rendering : ${enable_fribidi:-no}"
+   echo "* [Optional] Bi-directional rendering (fribidi) : ${enable_fribidi:-no}"
+   echo "* [Optional] Internationalisation (gettext)     : ${USE_NLS:-no}"
 fi
 echo ""
 echo "Execute make to compile then execute make install to install..."
diff --git a/configure.ac b/configure.ac
index 54ea524..c44239d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ dnl ========================================================================
 dnl = Require at least automake 2.52
 AC_PREREQ(2.52)
 
-AC_INIT([Wormux], [0.8], [wormux-dev at gna.org], [wormux])
+AC_INIT([Wormux], [0.8.1], [wormux-dev at gna.org], [wormux])
 AC_CONFIG_SRCDIR([src/main.cpp])
 
 dnl Detect the canonical host and target build environment
@@ -24,6 +24,10 @@ AM_INIT_AUTOMAKE([foreign 1.5])
 
 AM_GNU_GETTEXT([external])
 
+if test "x$USE_NLS" != "xyes"; then
+  AC_MSG_WARN([gettext is disabled. If you want internationalisation, please install gettext package.])
+fi
+
 dnl ========================================================================
 dnl === Check for tools                                                    =
 dnl ========================================================================
@@ -394,7 +398,8 @@ else
    echo "* Game locale will be installed into $LOCALEDIR"
    echo "* Font file will be $FONTFILE"
    echo ""
-   echo "* [[Optional]] Bi-directional rendering : ${enable_fribidi:-no}"
+   echo "* [[Optional]] Bi-directional rendering (fribidi) : ${enable_fribidi:-no}"
+   echo "* [[Optional]] Internationalisation (gettext)     : ${USE_NLS:-no}"
 fi
 echo ""
 echo "Execute make to compile then execute make install to install..."
diff --git a/data/Makefile.in b/data/Makefile.in
index 3611eea..98c6346 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,14 +14,10 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -65,14 +61,10 @@ DATA = $(nobase_dist_pkgdata_DATA) $(pixmaps_DATA) $(xdg_apps_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgdatadir = @DATADIR@
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
-AUTOPACKAGE_FALSE = @AUTOPACKAGE_FALSE@
-AUTOPACKAGE_TRUE = @AUTOPACKAGE_TRUE@
 AWK = @AWK@
 BUILD_ENV = @BUILD_ENV@
 CC = @CC@
@@ -94,13 +86,10 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FONTFILE = @FONTFILE@
-GCC_FALSE = @GCC_FALSE@
-GCC_TRUE = @GCC_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-INCLUDEDINTL_FALSE = @INCLUDEDINTL_FALSE@
-INCLUDEDINTL_TRUE = @INCLUDEDINTL_TRUE@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -119,6 +108,7 @@ LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -138,23 +128,19 @@ SDL_GFX_PREFIX = @SDL_GFX_PREFIX@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STATIC_FALSE = @STATIC_FALSE@
-STATIC_TRUE = @STATIC_TRUE@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WIN32_FALSE = @WIN32_FALSE@
-WIN32_TRUE = @WIN32_TRUE@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 _libcurl_config = @_libcurl_config@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -166,6 +152,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cxx_present = @cxx_present@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -194,12 +181,15 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xdg_appsdir = $(prefix)/share/applications
 xdg_apps_DATA = wormux.desktop
 pixmapsdir = $(prefix)/share/pixmaps
@@ -238,10 +228,9 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-nobase_dist_pkgdataDATA: $(nobase_dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@$(am__vpath_adj_setup) \
 	list='$(nobase_dist_pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -260,7 +249,7 @@ uninstall-nobase_dist_pkgdataDATA:
 	done
 install-pixmapsDATA: $(pixmaps_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pixmapsdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapsdir)"
+	test -z "$(pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)"
 	@list='$(pixmaps_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -277,7 +266,7 @@ uninstall-pixmapsDATA:
 	done
 install-xdg_appsDATA: $(xdg_apps_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(xdg_appsdir)" || $(mkdir_p) "$(DESTDIR)$(xdg_appsdir)"
+	test -z "$(xdg_appsdir)" || $(MKDIR_P) "$(DESTDIR)$(xdg_appsdir)"
 	@list='$(xdg_apps_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -300,22 +289,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -331,7 +319,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pixmapsdir)" "$(DESTDIR)$(xdg_appsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -378,12 +366,20 @@ info-am:
 install-data-am: install-nobase_dist_pkgdataDATA install-pixmapsDATA \
 	install-xdg_appsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -402,18 +398,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-nobase_dist_pkgdataDATA \
-	uninstall-pixmapsDATA uninstall-xdg_appsDATA
+uninstall-am: uninstall-nobase_dist_pkgdataDATA uninstall-pixmapsDATA \
+	uninstall-xdg_appsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-nobase_dist_pkgdataDATA install-pixmapsDATA \
-	install-strip install-xdg_appsDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-nobase_dist_pkgdataDATA install-pdf install-pdf-am \
+	install-pixmapsDATA install-ps install-ps-am install-strip \
+	install-xdg_appsDATA installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
 	uninstall-nobase_dist_pkgdataDATA uninstall-pixmapsDATA \
 	uninstall-xdg_appsDATA
 
diff --git a/data/authors.xml b/data/authors.xml
index af8d169..9cc3844 100644
--- a/data/authors.xml
+++ b/data/authors.xml
@@ -22,12 +22,19 @@
       </author>
       <author>
 	<nickname>Kurosu</nickname>
-	<name>John DOE</name>
+	<name>Christophe GISQUET</name>
 	<description>Win32 port, programmer</description>
-	<email>kurosu_AT_free_DOT_fr</email>
+	<email>christophe_DOT_gisquet_AT_gmail_DOT_com</email>
 	<country>France</country>
       </author>
       <author>
+	<nickname>lynxlynxlynx</nickname>
+	<name>Jaka KRANJC</name>
+	<description>i18n manager, misc</description>
+	<email>svn_AT_lynxlynx_DOT_info</email>
+	<country>Slovenia</country>
+      </author>
+      <author>
 	<nickname>yeKcim</nickname>
 	<name>Anthony CARRÉ</name>
 	<description>Graphic artist</description>
@@ -165,7 +172,7 @@
       </author>
       <author>
 	<nickname>Pierre-Marie</nickname>
-	<name>Pierre-Marie</name>
+	<name>Pierre-Marie Pédrot</name>
 	<description>Update translation of Wormux in Esperanto</description>
 	<email>pedrotpmx_AT_wanadoo_DOT_fr</email>
 	<country>France</country>
@@ -227,13 +234,6 @@
 	<country>England</country>
       </author>
       <author>
-	<nickname>eddyp</nickname>
-	<name>Eddy PETRIȘOR </name>
-	<description>Translated Wormux in Romanian</description>
-	<email>eddy.petrisor_AT_gmail_DOT_com</email>
-	<country>Romania</country>
-      </author>
-      <author>
 	<nickname>Frank</nickname>
 	<name>Frank VAN DER LOO</name>
 	<description>First Dutch version of Wormux</description>
@@ -378,6 +378,7 @@
         <country>Hungary</country>
       </author>
       <author>
+        <nickname>Adrián</nickname>
 	<name>Adrián Chaves</name>
 	<description>Translated Wormux in Galician</description>
 	<email>adriyetichaves_AT_gmail_DOT_com</email>
@@ -387,13 +388,6 @@
 
     <section title="Package maintainers">
       <author>
-        <nickname>AbsintheSyringe</nickname>
-	<name>Adnan Hodzic</name>
-	<description>Prepares Wormux SlackBuilds for Slackware</description>
-	<email>AbsintheSyringe_AT_gmail_DOT_com</email>
-	<country>Bosnia-Herzegovina</country>
-      </author>
-      <author>
 	<nickname>artefact</nickname>
 	<name>Jean PARPAILLON</name>
 	<description>Debian GNU/Linux and Ubuntu packages of Wormux 0.7. Also: Some scripts</description>
@@ -423,6 +417,13 @@
 	<country>Germany</country>
       </author>
       <author>
+	<nickname>eddyp</nickname>
+	<name>Eddy PETRIȘOR </name>
+	<description>Debian packaging (in the Debian Games Team); Translated Wormux in Romanian; added chat logging</description>
+	<email>eddy.petrisor_AT_gmail_DOT_com</email>
+	<country>Romania</country>
+      </author>
+      <author>
 	<nickname>Emily</nickname>
 	<name>Emily BRANTLEY</name>
 	<description>Wormux 0.7beta2 package for Fedora Core 4</description>
@@ -458,7 +459,7 @@
     <name>Yoann Katchourine</name>
     <description>Prepare Mac OS X (Intel) packages</description>
     <website>http://plorf.homeip.net/</website>
-    <email>yplorf at gmail.com></email>
+    <email>yplorf_AT_gmail_DOT_com</email>
     <country>France</country>
         </author>
         <author>
@@ -475,7 +476,7 @@
       <author>
 	<nickname>AbsintheSyringe</nickname>
 	<name>Adnan HODZIC</name>
-	<description>Physics constant for wind particles, Bug fixes, First Bosnian translation of Wormux.</description>
+	<description>Physics constant for wind particles, Bug fixes, Prepares Wormux SlackBuilds for Slackware, First Bosnian translation of Wormux.</description>
 	<email>AbsintheSyringe_AT_gmail_DOT_com</email>
 	<country>Bosnia-Herzegovina</country>
       </author>
@@ -494,6 +495,13 @@
 	<country>France</country>
       </author>
       <author>
+	<nickname>Fredb219</nickname>
+	<name>Frédéric BERTOLUS</name>
+	<description>Code</description>
+	<email>fredb219_AT_gmail_DOT_com</email>
+	<country>France</country>
+      </author>
+      <author>
 	<nickname>funebre</nickname>
 	<name>Carlo MAISOLA</name>
 	<description>Flamethrower weapon</description>
@@ -529,6 +537,13 @@
 	<country>France</country>
       </author>
       <author>
+        <nickname>Jim++</nickname>
+        <name>Jean-Marie Traissard</name>
+        <description>Patch</description>
+        <email>jim_AT_lapin_DOT_org</email>
+        <country>France</country>
+      </author>
+      <author>
 	<nickname>Johannes</nickname>
 	<name>Johannes KRUDE</name>
 	<description>Patch, bug report</description>
@@ -557,13 +572,6 @@
 	<email>larry_AT_doubidou_DOT_net</email>
       </author>
       <author>
-	<nickname>lynxlynxlynx</nickname>
-	<name>Jaka KRANJC</name>
-	<description>Patch that enables cycling through characters backwards. G++ 4.2 support</description>
-	<email>svn_AT_lynxlynx_DOT_info</email>
-	<country>Slovenia</country>
-      </author>
-      <author>
 	<nickname>Mathias</nickname>
 	<name>Mathias PLICHTA</name>
 	<description>Automatic bazooka constant refresh</description>
@@ -571,6 +579,13 @@
 	<country>Germany</country>
       </author>
       <author>
+	<nickname>mrpouet</nickname>
+	<name>Romain PERIER</name>
+	<description>AI improvements</description>
+	<email>mrpouet_AT_tuxfamily_DOT_org </email>
+	<country>France</country>
+      </author>
+      <author>
 	<nickname>Pascal</nickname>
 	<name>Pascal GIARD</name>
 	<description>Wrote a patch to stop configure if clanlib and/or libxml++ is missing</description>
@@ -592,10 +607,10 @@
       </author>
       <author>
 	<nickname>Progs</nickname>
-	<name>Romain BIGNON</name>
+	<name>Romain Bignon</name>
 	<description>Developer</description>
-	<website>http://coderz.info</website>
-	<email>progs_AT_headfucking.net</email>
+	<website>http://romain.peerfuse.net</website>
+	<email>romain_AT_peerfuse.net</email>
 	<country>France</country>
       </author>
       <author>
@@ -762,7 +777,7 @@
 	<nickname>JLedN</nickname>
 	<name>Jeremie LEDENTU</name>
 	<description>Draw the map EasterIsland</description>
-	<email>jledn_AT_voila_DOT_fr</email>
+	<email>jledentu_AT_gmail_DOT_com</email>
 	<country>France</country>
       </author>
       <author>
diff --git a/data/body/beastie/arm1left.png b/data/body/beastie/arm1left.png
new file mode 100644
index 0000000..0dd677c
Binary files /dev/null and b/data/body/beastie/arm1left.png differ
diff --git a/data/body/beastie/arm1right.png b/data/body/beastie/arm1right.png
new file mode 100644
index 0000000..0dd677c
Binary files /dev/null and b/data/body/beastie/arm1right.png differ
diff --git a/data/body/beastie/arm2left.png b/data/body/beastie/arm2left.png
new file mode 100644
index 0000000..cd930ad
Binary files /dev/null and b/data/body/beastie/arm2left.png differ
diff --git a/data/body/beastie/arm2right.png b/data/body/beastie/arm2right.png
new file mode 100644
index 0000000..cd930ad
Binary files /dev/null and b/data/body/beastie/arm2right.png differ
diff --git a/data/body/beastie/arm3left.png b/data/body/beastie/arm3left.png
new file mode 100644
index 0000000..30dc02a
Binary files /dev/null and b/data/body/beastie/arm3left.png differ
diff --git a/data/body/beastie/arm3right.png b/data/body/beastie/arm3right.png
new file mode 100644
index 0000000..30dc02a
Binary files /dev/null and b/data/body/beastie/arm3right.png differ
diff --git a/data/body/beastie/back.png b/data/body/beastie/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/beastie/back.png differ
diff --git a/data/body/beastie/belt.png b/data/body/beastie/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/beastie/belt.png differ
diff --git a/data/body/beastie/black_arm1left.png b/data/body/beastie/black_arm1left.png
new file mode 100644
index 0000000..2b17b37
Binary files /dev/null and b/data/body/beastie/black_arm1left.png differ
diff --git a/data/body/beastie/black_arm1right.png b/data/body/beastie/black_arm1right.png
new file mode 100644
index 0000000..2b17b37
Binary files /dev/null and b/data/body/beastie/black_arm1right.png differ
diff --git a/data/body/beastie/black_arm2left.png b/data/body/beastie/black_arm2left.png
new file mode 100644
index 0000000..4cd1f41
Binary files /dev/null and b/data/body/beastie/black_arm2left.png differ
diff --git a/data/body/beastie/black_arm2right.png b/data/body/beastie/black_arm2right.png
new file mode 100644
index 0000000..4cd1f41
Binary files /dev/null and b/data/body/beastie/black_arm2right.png differ
diff --git a/data/body/beastie/black_arm3left.png b/data/body/beastie/black_arm3left.png
new file mode 100644
index 0000000..c073d39
Binary files /dev/null and b/data/body/beastie/black_arm3left.png differ
diff --git a/data/body/beastie/black_arm3right.png b/data/body/beastie/black_arm3right.png
new file mode 100644
index 0000000..c073d39
Binary files /dev/null and b/data/body/beastie/black_arm3right.png differ
diff --git a/data/body/beastie/black_back.png b/data/body/beastie/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/beastie/black_back.png differ
diff --git a/data/body/beastie/black_body.png b/data/body/beastie/black_body.png
new file mode 100644
index 0000000..bc1da06
Binary files /dev/null and b/data/body/beastie/black_body.png differ
diff --git a/data/body/beastie/black_eyelid.png b/data/body/beastie/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/beastie/black_eyelid.png differ
diff --git a/data/body/beastie/black_eyes.png b/data/body/beastie/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/beastie/black_eyes.png differ
diff --git a/data/body/beastie/black_footleft.png b/data/body/beastie/black_footleft.png
new file mode 100644
index 0000000..2c08453
Binary files /dev/null and b/data/body/beastie/black_footleft.png differ
diff --git a/data/body/beastie/black_footright.png b/data/body/beastie/black_footright.png
new file mode 100644
index 0000000..2c08453
Binary files /dev/null and b/data/body/beastie/black_footright.png differ
diff --git a/data/body/beastie/black_hair.png b/data/body/beastie/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/beastie/black_hair.png differ
diff --git a/data/body/beastie/black_head.png b/data/body/beastie/black_head.png
new file mode 100644
index 0000000..94136d1
Binary files /dev/null and b/data/body/beastie/black_head.png differ
diff --git a/data/body/beastie/black_hornleft.png b/data/body/beastie/black_hornleft.png
new file mode 100644
index 0000000..0394a66
Binary files /dev/null and b/data/body/beastie/black_hornleft.png differ
diff --git a/data/body/beastie/black_hornright.png b/data/body/beastie/black_hornright.png
new file mode 100644
index 0000000..3fcd79b
Binary files /dev/null and b/data/body/beastie/black_hornright.png differ
diff --git a/data/body/beastie/black_noze.png b/data/body/beastie/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/beastie/black_noze.png differ
diff --git a/data/body/beastie/black_pupil.png b/data/body/beastie/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/beastie/black_pupil.png differ
diff --git a/data/body/beastie/black_tail.png b/data/body/beastie/black_tail.png
new file mode 100644
index 0000000..ba56f9b
Binary files /dev/null and b/data/body/beastie/black_tail.png differ
diff --git a/data/body/beastie/body.png b/data/body/beastie/body.png
new file mode 100644
index 0000000..b4394bb
Binary files /dev/null and b/data/body/beastie/body.png differ
diff --git a/data/body/beastie/c1.png b/data/body/beastie/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/beastie/c1.png differ
diff --git a/data/body/beastie/c2.png b/data/body/beastie/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/beastie/c2.png differ
diff --git a/data/body/beastie/config.xml b/data/body/beastie/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/beastie/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/beastie/dead.png b/data/body/beastie/dead.png
new file mode 100644
index 0000000..1f29a7e
Binary files /dev/null and b/data/body/beastie/dead.png differ
diff --git a/data/body/beastie/eyelid.png b/data/body/beastie/eyelid.png
new file mode 100644
index 0000000..ba40341
Binary files /dev/null and b/data/body/beastie/eyelid.png differ
diff --git a/data/body/beastie/eyes.png b/data/body/beastie/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/beastie/eyes.png differ
diff --git a/data/body/beastie/footleft.png b/data/body/beastie/footleft.png
new file mode 100644
index 0000000..dcd2f26
Binary files /dev/null and b/data/body/beastie/footleft.png differ
diff --git a/data/body/beastie/footright.png b/data/body/beastie/footright.png
new file mode 100644
index 0000000..dcd2f26
Binary files /dev/null and b/data/body/beastie/footright.png differ
diff --git a/data/body/beastie/hair.png b/data/body/beastie/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/beastie/hair.png differ
diff --git a/data/body/beastie/hat.png b/data/body/beastie/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/beastie/hat.png differ
diff --git a/data/body/beastie/head.png b/data/body/beastie/head.png
new file mode 100644
index 0000000..3b3abe1
Binary files /dev/null and b/data/body/beastie/head.png differ
diff --git a/data/body/beastie/helmet.png b/data/body/beastie/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/beastie/helmet.png differ
diff --git a/data/body/beastieteam/hoop.png b/data/body/beastie/hoop.png
old mode 100644
new mode 100755
similarity index 100%
copy from data/body/beastieteam/hoop.png
copy to data/body/beastie/hoop.png
diff --git a/data/body/beastie/hornleft.png b/data/body/beastie/hornleft.png
new file mode 100644
index 0000000..c62393b
Binary files /dev/null and b/data/body/beastie/hornleft.png differ
diff --git a/data/body/beastie/hornright.png b/data/body/beastie/hornright.png
new file mode 100644
index 0000000..06b7610
Binary files /dev/null and b/data/body/beastie/hornright.png differ
diff --git a/data/body/beastieteam/hula.png b/data/body/beastie/hula.png
old mode 100644
new mode 100755
similarity index 100%
copy from data/body/beastieteam/hula.png
copy to data/body/beastie/hula.png
diff --git a/data/body/beastie/jetpack-fire.png b/data/body/beastie/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/beastie/jetpack-fire.png differ
diff --git a/data/body/beastie/jetpack.png b/data/body/beastie/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/beastie/jetpack.png differ
diff --git a/data/body/beastie/noze.png b/data/body/beastie/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/beastie/noze.png differ
diff --git a/data/body/beastie/pupil.png b/data/body/beastie/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/beastie/pupil.png differ
diff --git a/data/body/beastie/sick_head.png b/data/body/beastie/sick_head.png
new file mode 100644
index 0000000..b537a3c
Binary files /dev/null and b/data/body/beastie/sick_head.png differ
diff --git a/data/body/beastie/tail.png b/data/body/beastie/tail.png
new file mode 100644
index 0000000..1147ef4
Binary files /dev/null and b/data/body/beastie/tail.png differ
diff --git a/data/body/beastie/yoyo.png b/data/body/beastie/yoyo.png
new file mode 100755
index 0000000..6a22a92
Binary files /dev/null and b/data/body/beastie/yoyo.png differ
diff --git a/data/body/beastieteam/arm.png b/data/body/beastieteam/arm.png
deleted file mode 100644
index 798325e..0000000
Binary files a/data/body/beastieteam/arm.png and /dev/null differ
diff --git a/data/body/beastieteam/b_arm.png b/data/body/beastieteam/b_arm.png
deleted file mode 100644
index 9b8425f..0000000
Binary files a/data/body/beastieteam/b_arm.png and /dev/null differ
diff --git a/data/body/beastieteam/b_body.png b/data/body/beastieteam/b_body.png
deleted file mode 100644
index c59b227..0000000
Binary files a/data/body/beastieteam/b_body.png and /dev/null differ
diff --git a/data/body/beastieteam/b_eyelid.png b/data/body/beastieteam/b_eyelid.png
deleted file mode 100755
index ab0bb74..0000000
Binary files a/data/body/beastieteam/b_eyelid.png and /dev/null differ
diff --git a/data/body/beastieteam/b_foot.png b/data/body/beastieteam/b_foot.png
deleted file mode 100644
index 8da9979..0000000
Binary files a/data/body/beastieteam/b_foot.png and /dev/null differ
diff --git a/data/body/beastieteam/b_head.png b/data/body/beastieteam/b_head.png
deleted file mode 100644
index e38b2ad..0000000
Binary files a/data/body/beastieteam/b_head.png and /dev/null differ
diff --git a/data/body/beastieteam/b_tail.png b/data/body/beastieteam/b_tail.png
deleted file mode 100644
index e2a009f..0000000
Binary files a/data/body/beastieteam/b_tail.png and /dev/null differ
diff --git a/data/body/beastieteam/body.png b/data/body/beastieteam/body.png
deleted file mode 100644
index 660505a..0000000
Binary files a/data/body/beastieteam/body.png and /dev/null differ
diff --git a/data/body/beastieteam/c1.png b/data/body/beastieteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/beastieteam/c1.png and /dev/null differ
diff --git a/data/body/beastieteam/c2.png b/data/body/beastieteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/beastieteam/c2.png and /dev/null differ
diff --git a/data/body/beastieteam/config.xml b/data/body/beastieteam/config.xml
deleted file mode 100644
index bc5e5fa..0000000
--- a/data/body/beastieteam/config.xml
+++ /dev/null
@@ -1,2088 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-<alias movement="fly-black" correspond_to="fly" />
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body" >
-	<image file="body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
-	<attached member_type="head" frame="*" dx="14" dy="6"/>
-	<attached member_type="arm-right"  frame="*" dx="11" dy="12"/>
-	<attached member_type="arm-left"  frame="*" dx="16" dy="11"/>
-	<attached member_type="foot-left"  frame="*" dx="18" dy="26"/>
-	<attached member_type="foot-right"  frame="*" dx="12" dy="28"/>
-	<attached member_type="jetpack"  frame="*" dx="5" dy="-9"/>
-	<attached member_type="construct" frame="*" dx="12" dy="0"/>
-	<attached member_type="tail" frame="*" dx="8" dy="22"/>
-	<attached member_type="hula" frame="*" dx="14" dy="20"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Tail ###### -->
-<sprite name="tail" type="tail" >
-	<image file="tail.png"/>
-	<anchor dx="13" dy="0"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head-normal" type="head">
-	<image file="head.png"/>
-	<anchor dx="10" dy="16"/>
-	<attached member_type="helmet" frame="*" dx="1" dy="-1"/>
-	<attached member_type="eyes-normal" frame="*" dx="11" dy="10"/>
-</sprite>
-
-<!-- ###### eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<!-- ###### Arms ###### -->
-<sprite name="arm-left" type="arm-left" >
-	<image file="arm.png"/>
-	<anchor dx="7" dy="1"/>
-</sprite>
-
-<sprite name="arm-right" type="arm-right" >
-	<image file="arm.png"/>
-	<anchor dx="7" dy="1"/>
-	<attached member_type="weapon" frame="*" dx="3" dy="13"/>
-	<attached member_type="yoyo" frame="*" dx="-19" dy="5"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left" >
-	<image file="foot.png"/>
-	<anchor dx="3" dy="1"/>
-</sprite>
-<sprite name="foot-right" type="foot-right" >
-	<image file="foot.png"/>
-	<anchor dx="3" dy="1"/>
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet" >
-	<image file="helmet.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1" />
-	</image>
-	<anchor dx="29" dy="25"/>
-	<animation speed="150" />
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body" >
-	<image file="dead.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Black ###### -->
-<!-- Body -->
-<sprite name="body-black" type="body" >
-	<image file="b_body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
-	<attached member_type="head" frame="*" dx="14" dy="6"/>
-	<attached member_type="arm-right"  frame="*" dx="11" dy="12"/>
-	<attached member_type="arm-left"  frame="*" dx="16" dy="11"/>
-	<attached member_type="foot-left"  frame="*" dx="18" dy="26"/>
-	<attached member_type="foot-right"  frame="*" dx="12" dy="28"/>
-	<attached member_type="jetpack"  frame="*" dx="5" dy="-9"/>
-	<attached member_type="construct" frame="*" dx="12" dy="0"/>
-	<attached member_type="tail" frame="*" dx="8" dy="22"/>
-	<attached member_type="hula" frame="*" dx="14" dy="20"/>
-</sprite>
-<!-- Arms -->
-<sprite name="arm-left-black" type="arm-left" >
-	<image file="b_arm.png"/>
-	<anchor dx="7" dy="1"/>
-</sprite>
-<sprite name="arm-right-black" type="arm-right" >
-	<image file="b_arm.png"/>
-	<anchor dx="7" dy="1"/>
-	<attached member_type="weapon" frame="*" dx="3" dy="13"/>
-	<attached member_type="yoyo" frame="*" dx="-19" dy="5"/>
-</sprite>
-<!-- Legs -->
-<sprite name="foot-left-black" type="foot-left" >
-	<image file="b_foot.png"/>
-	<anchor dx="3" dy="1"/>
-</sprite>
-<sprite name="foot-right-black" type="foot-right" >
-	<image file="b_foot.png"/>
-	<anchor dx="3" dy="1"/>
-</sprite>
-<!-- Tail -->
-<sprite name="tail-black" type="tail" >
-	<image file="b_tail.png"/>
-	<anchor dx="13" dy="0"/>
-</sprite>
-<!-- Head -->
-<sprite name="head-black" type="head">
-	<image file="b_head.png"/>
-	<anchor dx="10" dy="16"/>
-	<attached member_type="helmet" frame="*" dx="1" dy="-1"/>
-	<attached member_type="eyes-normal" frame="*" dx="11" dy="10"/>
-</sprite>
-<sprite name="eyes-black" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-<sprite name="eyelid-black" type="eyelid">
-	<image file="b_eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<!-- ###### Jetpack ###### -->
-<sprite name="jetpack" type="jetpack" >
-	<image file="jetpack.png"/>
-	<anchor dx="0" dy="0"/>
-	<attached member_type="jetpack-heli"  frame="*" dx="-5" dy="-5"/>
-</sprite>
-
-<sprite name="jetpack-heli" type="jetpack-heli" >
-	<image file="jetpack-heli.png">
-		<grid pos="0,0" size="26,11" array="3,1"/>
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="tail"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack">
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="tail"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="jetpack"/>
-	<c_member name="jetpack-heli"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="tail"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="jetpack"/>
-	<c_member name="jetpack-heli"/>
-</clothe>
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="tail"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="helmet"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="tail"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="arm-left"/>
-	<c_member name="hula"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="tail"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="hoop"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="arm-left-black"/>
-	<c_member name="foot-left-black"/>
-	<c_member name="body-black"/>
-	<c_member name="tail"/>
-	<c_member name="head-black"/>
-	<c_member name="eyes-black"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-black"/>
-	<c_member name="foot-right-black"/>
-	<c_member name="arm-right-black"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Fly-Black ###### -->
-<clothe name="fly-black">
-	<c_member name="arm-left-black"/>
-	<c_member name="foot-left-black"/>
-	<c_member name="body-black"/>
-	<c_member name="tail-black"/>
-	<c_member name="head-black"/>
-	<c_member name="eyes-black"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-black"/>
-	<c_member name="foot-right-black"/>
-	<c_member name="arm-right-black"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="tail"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="tail"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="-40" />
-		<member type="foot-left" angle="40" />
-		<member type="foot-right" angle="-40" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />	
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-50" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-60" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-70" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-80" />
-		<member type="arm-right" angle="40" />
-		<member type="foot-left" angle="-40" />
-		<member type="foot-right" angle="40" />
-		<member type="tail" angle="2" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-70" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-60" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-50" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-<!-- ###### Black ###### -->
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" dx="-1" />
-		<member type="pupil-left" dx="-1" />		
-	</frame>
-</movement>
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-right" angle="-110"/>
-		<member type="yoyo" angle="110"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-1" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-1" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="7"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" angle="0" dx="0"  />
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-		<member type="jetpack-fire" dy="-5" /> <!-- hide the fire under the jetpack -->
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="jetpack-fire" dy="0" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="-1" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="-2" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="-5" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="-3" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-</movement>
-
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-</resources>
diff --git a/data/body/beastieteam/dead.png b/data/body/beastieteam/dead.png
deleted file mode 100644
index 30232a1..0000000
Binary files a/data/body/beastieteam/dead.png and /dev/null differ
diff --git a/data/body/beastieteam/eyelid.png b/data/body/beastieteam/eyelid.png
deleted file mode 100755
index e22fb16..0000000
Binary files a/data/body/beastieteam/eyelid.png and /dev/null differ
diff --git a/data/body/beastieteam/eyes.png b/data/body/beastieteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/beastieteam/eyes.png and /dev/null differ
diff --git a/data/body/beastieteam/foot.png b/data/body/beastieteam/foot.png
deleted file mode 100644
index c83e7d3..0000000
Binary files a/data/body/beastieteam/foot.png and /dev/null differ
diff --git a/data/body/beastieteam/head.png b/data/body/beastieteam/head.png
deleted file mode 100644
index d0f685c..0000000
Binary files a/data/body/beastieteam/head.png and /dev/null differ
diff --git a/data/body/beastieteam/helmet.png b/data/body/beastieteam/helmet.png
deleted file mode 100644
index 5dd4753..0000000
Binary files a/data/body/beastieteam/helmet.png and /dev/null differ
diff --git a/data/body/beastieteam/jetpack-heli.png b/data/body/beastieteam/jetpack-heli.png
deleted file mode 100644
index d501b4c..0000000
Binary files a/data/body/beastieteam/jetpack-heli.png and /dev/null differ
diff --git a/data/body/beastieteam/jetpack.png b/data/body/beastieteam/jetpack.png
deleted file mode 100644
index 5fcdf46..0000000
Binary files a/data/body/beastieteam/jetpack.png and /dev/null differ
diff --git a/data/body/beastieteam/pupil.png b/data/body/beastieteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/beastieteam/pupil.png and /dev/null differ
diff --git a/data/body/beastieteam/tail.png b/data/body/beastieteam/tail.png
deleted file mode 100644
index ed0d791..0000000
Binary files a/data/body/beastieteam/tail.png and /dev/null differ
diff --git a/data/body/beastieteam/yoyo.png b/data/body/beastieteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/beastieteam/yoyo.png and /dev/null differ
diff --git a/data/body/firefox/arm1left.png b/data/body/firefox/arm1left.png
new file mode 100644
index 0000000..061f67e
Binary files /dev/null and b/data/body/firefox/arm1left.png differ
diff --git a/data/body/firefox/arm1right.png b/data/body/firefox/arm1right.png
new file mode 100644
index 0000000..061f67e
Binary files /dev/null and b/data/body/firefox/arm1right.png differ
diff --git a/data/body/firefox/arm2left.png b/data/body/firefox/arm2left.png
new file mode 100644
index 0000000..39b43e5
Binary files /dev/null and b/data/body/firefox/arm2left.png differ
diff --git a/data/body/firefox/arm2right.png b/data/body/firefox/arm2right.png
new file mode 100644
index 0000000..39b43e5
Binary files /dev/null and b/data/body/firefox/arm2right.png differ
diff --git a/data/body/firefox/arm3left.png b/data/body/firefox/arm3left.png
new file mode 100644
index 0000000..a73d5c8
Binary files /dev/null and b/data/body/firefox/arm3left.png differ
diff --git a/data/body/firefox/arm3right.png b/data/body/firefox/arm3right.png
new file mode 100644
index 0000000..a73d5c8
Binary files /dev/null and b/data/body/firefox/arm3right.png differ
diff --git a/data/body/firefox/back.png b/data/body/firefox/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/firefox/back.png differ
diff --git a/data/body/firefox/belt.png b/data/body/firefox/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/firefox/belt.png differ
diff --git a/data/body/firefox/black_arm1left.png b/data/body/firefox/black_arm1left.png
new file mode 100644
index 0000000..0c4300b
Binary files /dev/null and b/data/body/firefox/black_arm1left.png differ
diff --git a/data/body/firefox/black_arm1right.png b/data/body/firefox/black_arm1right.png
new file mode 100644
index 0000000..0c4300b
Binary files /dev/null and b/data/body/firefox/black_arm1right.png differ
diff --git a/data/body/firefox/black_arm2left.png b/data/body/firefox/black_arm2left.png
new file mode 100644
index 0000000..6d7b7b8
Binary files /dev/null and b/data/body/firefox/black_arm2left.png differ
diff --git a/data/body/firefox/black_arm2right.png b/data/body/firefox/black_arm2right.png
new file mode 100644
index 0000000..6d7b7b8
Binary files /dev/null and b/data/body/firefox/black_arm2right.png differ
diff --git a/data/body/firefox/black_arm3left.png b/data/body/firefox/black_arm3left.png
new file mode 100644
index 0000000..5c2d123
Binary files /dev/null and b/data/body/firefox/black_arm3left.png differ
diff --git a/data/body/firefox/black_arm3right.png b/data/body/firefox/black_arm3right.png
new file mode 100644
index 0000000..5c2d123
Binary files /dev/null and b/data/body/firefox/black_arm3right.png differ
diff --git a/data/body/firefox/black_back.png b/data/body/firefox/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/firefox/black_back.png differ
diff --git a/data/body/firefox/black_body.png b/data/body/firefox/black_body.png
new file mode 100644
index 0000000..6d7d280
Binary files /dev/null and b/data/body/firefox/black_body.png differ
diff --git a/data/body/firefox/black_eyelid.png b/data/body/firefox/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/firefox/black_eyelid.png differ
diff --git a/data/body/firefox/black_eyes.png b/data/body/firefox/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/firefox/black_eyes.png differ
diff --git a/data/body/firefox/black_footleft.png b/data/body/firefox/black_footleft.png
new file mode 100644
index 0000000..126cf29
Binary files /dev/null and b/data/body/firefox/black_footleft.png differ
diff --git a/data/body/firefox/black_footright.png b/data/body/firefox/black_footright.png
new file mode 100644
index 0000000..126cf29
Binary files /dev/null and b/data/body/firefox/black_footright.png differ
diff --git a/data/body/firefox/black_hair.png b/data/body/firefox/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/firefox/black_hair.png differ
diff --git a/data/body/firefox/black_head.png b/data/body/firefox/black_head.png
new file mode 100644
index 0000000..4d7d13c
Binary files /dev/null and b/data/body/firefox/black_head.png differ
diff --git a/data/body/firefox/black_hornleft.png b/data/body/firefox/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/firefox/black_hornleft.png differ
diff --git a/data/body/firefox/black_hornright.png b/data/body/firefox/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/firefox/black_hornright.png differ
diff --git a/data/body/firefox/black_noze.png b/data/body/firefox/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/firefox/black_noze.png differ
diff --git a/data/body/firefox/black_pupil.png b/data/body/firefox/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/firefox/black_pupil.png differ
diff --git a/data/body/firefox/black_tail.png b/data/body/firefox/black_tail.png
new file mode 100644
index 0000000..a51d218
Binary files /dev/null and b/data/body/firefox/black_tail.png differ
diff --git a/data/body/firefox/body.png b/data/body/firefox/body.png
new file mode 100644
index 0000000..af22e36
Binary files /dev/null and b/data/body/firefox/body.png differ
diff --git a/data/body/firefox/c1.png b/data/body/firefox/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/firefox/c1.png differ
diff --git a/data/body/firefox/c2.png b/data/body/firefox/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/firefox/c2.png differ
diff --git a/data/body/firefox/config.xml b/data/body/firefox/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/firefox/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/firefox/dead.png b/data/body/firefox/dead.png
new file mode 100644
index 0000000..49406d6
Binary files /dev/null and b/data/body/firefox/dead.png differ
diff --git a/data/body/firefox/eyelid.png b/data/body/firefox/eyelid.png
new file mode 100644
index 0000000..fdeb5ac
Binary files /dev/null and b/data/body/firefox/eyelid.png differ
diff --git a/data/body/firefox/eyes.png b/data/body/firefox/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/firefox/eyes.png differ
diff --git a/data/body/firefox/footleft.png b/data/body/firefox/footleft.png
new file mode 100644
index 0000000..6b46909
Binary files /dev/null and b/data/body/firefox/footleft.png differ
diff --git a/data/body/firefox/footright.png b/data/body/firefox/footright.png
new file mode 100644
index 0000000..6b46909
Binary files /dev/null and b/data/body/firefox/footright.png differ
diff --git a/data/body/firefox/hair.png b/data/body/firefox/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/firefox/hair.png differ
diff --git a/data/body/firefox/hat.png b/data/body/firefox/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/firefox/hat.png differ
diff --git a/data/body/firefox/head.png b/data/body/firefox/head.png
new file mode 100644
index 0000000..522f32f
Binary files /dev/null and b/data/body/firefox/head.png differ
diff --git a/data/body/firefox/helmet.png b/data/body/firefox/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/firefox/helmet.png differ
diff --git a/data/body/firefoxteam/hoop.png b/data/body/firefox/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/firefoxteam/hoop.png
rename to data/body/firefox/hoop.png
diff --git a/data/body/firefox/hornleft.png b/data/body/firefox/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/firefox/hornleft.png differ
diff --git a/data/body/firefox/hornright.png b/data/body/firefox/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/firefox/hornright.png differ
diff --git a/data/body/firefoxteam/hula.png b/data/body/firefox/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/firefoxteam/hula.png
rename to data/body/firefox/hula.png
diff --git a/data/body/firefox/jetpack-fire.png b/data/body/firefox/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/firefox/jetpack-fire.png differ
diff --git a/data/body/firefox/jetpack.png b/data/body/firefox/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/firefox/jetpack.png differ
diff --git a/data/body/firefox/noze.png b/data/body/firefox/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/firefox/noze.png differ
diff --git a/data/body/firefox/pupil.png b/data/body/firefox/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/firefox/pupil.png differ
diff --git a/data/body/firefox/sick_head.png b/data/body/firefox/sick_head.png
new file mode 100644
index 0000000..84b3c34
Binary files /dev/null and b/data/body/firefox/sick_head.png differ
diff --git a/data/body/firefox/tail.png b/data/body/firefox/tail.png
new file mode 100644
index 0000000..c03f7fe
Binary files /dev/null and b/data/body/firefox/tail.png differ
diff --git a/data/body/firefox/yoyo.png b/data/body/firefox/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/firefox/yoyo.png differ
diff --git a/data/body/firefoxteam/arm1.png b/data/body/firefoxteam/arm1.png
deleted file mode 100644
index fd22554..0000000
Binary files a/data/body/firefoxteam/arm1.png and /dev/null differ
diff --git a/data/body/firefoxteam/arm2.png b/data/body/firefoxteam/arm2.png
deleted file mode 100644
index dc9a954..0000000
Binary files a/data/body/firefoxteam/arm2.png and /dev/null differ
diff --git a/data/body/firefoxteam/b_arm1.png b/data/body/firefoxteam/b_arm1.png
deleted file mode 100644
index 1530fee..0000000
Binary files a/data/body/firefoxteam/b_arm1.png and /dev/null differ
diff --git a/data/body/firefoxteam/b_arm2.png b/data/body/firefoxteam/b_arm2.png
deleted file mode 100644
index 596cfc9..0000000
Binary files a/data/body/firefoxteam/b_arm2.png and /dev/null differ
diff --git a/data/body/firefoxteam/b_body.png b/data/body/firefoxteam/b_body.png
deleted file mode 100644
index 3678674..0000000
Binary files a/data/body/firefoxteam/b_body.png and /dev/null differ
diff --git a/data/body/firefoxteam/b_ear-left.png b/data/body/firefoxteam/b_ear-left.png
deleted file mode 100644
index 0e9cdda..0000000
Binary files a/data/body/firefoxteam/b_ear-left.png and /dev/null differ
diff --git a/data/body/firefoxteam/b_ear-right.png b/data/body/firefoxteam/b_ear-right.png
deleted file mode 100644
index f3bcd92..0000000
Binary files a/data/body/firefoxteam/b_ear-right.png and /dev/null differ
diff --git a/data/body/firefoxteam/b_eyelid.png b/data/body/firefoxteam/b_eyelid.png
deleted file mode 100644
index ba39823..0000000
Binary files a/data/body/firefoxteam/b_eyelid.png and /dev/null differ
diff --git a/data/body/firefoxteam/b_foot.png b/data/body/firefoxteam/b_foot.png
deleted file mode 100644
index 7f1a442..0000000
Binary files a/data/body/firefoxteam/b_foot.png and /dev/null differ
diff --git a/data/body/firefoxteam/b_head.png b/data/body/firefoxteam/b_head.png
deleted file mode 100644
index 7a9da6f..0000000
Binary files a/data/body/firefoxteam/b_head.png and /dev/null differ
diff --git a/data/body/firefoxteam/b_tail.png b/data/body/firefoxteam/b_tail.png
deleted file mode 100644
index d678c16..0000000
Binary files a/data/body/firefoxteam/b_tail.png and /dev/null differ
diff --git a/data/body/firefoxteam/body.png b/data/body/firefoxteam/body.png
deleted file mode 100644
index 71013f1..0000000
Binary files a/data/body/firefoxteam/body.png and /dev/null differ
diff --git a/data/body/firefoxteam/c1.png b/data/body/firefoxteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/firefoxteam/c1.png and /dev/null differ
diff --git a/data/body/firefoxteam/c2.png b/data/body/firefoxteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/firefoxteam/c2.png and /dev/null differ
diff --git a/data/body/firefoxteam/config.xml b/data/body/firefoxteam/config.xml
deleted file mode 100644
index 56f00b0..0000000
--- a/data/body/firefoxteam/config.xml
+++ /dev/null
@@ -1,2247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-<alias movement="fly-black" correspond_to="fly" />
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body">
-	<image file="body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="27"/>
-	<attached member_type="head" frame="*" dx="8" dy="6"/>
-	<attached member_type="arm-right" frame="*" dx="3" dy="18"/>
-	<attached member_type="arm-left" frame="*" dx="8" dy="17"/>
-	<attached member_type="foot-left" frame="*" dx="10" dy="29"/>
-	<attached member_type="foot-right" frame="*" dx="5" dy="30"/>
-	<attached member_type="jetpack-belt" frame="*" dx="-1" dy="15"/>
-	<attached member_type="jetpack-right" frame="*" dx="-2" dy="20"/>
-	<attached member_type="jetpack-left" frame="*" dx="4" dy="19"/>
-	<attached member_type="tail" frame="*" dx="2" dy="31"/>
-	<attached member_type="construct" frame="*" dx="6" dy="7"/>
-	<attached member_type="hula" frame="*" dx="14" dy="25"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<sprite name="tail" type="tail">
-	<image file="tail.png"/>
-	<anchor dx="12" dy="13"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="head.png"/>
-	<anchor dx="2" dy="7"/>
-	<attached member_type="ear-left" frame="*" dx="3" dy="4"/>
-	<attached member_type="ear-right" frame="*" dx="-1" dy="4"/>
-	<attached member_type="eyes-normal" frame="*" dx="6" dy="6"/>
-	<attached member_type="helmet" frame="*" dx="3" dy="7"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="ear-right" type="ear-right">
-	<image file="ear-right.png"/>
-	<anchor dx="3" dy="6"/>
-</sprite>
-
-<sprite name="ear-left" type="ear-left">
-	<image file="ear-left.png"/>
-	<anchor dx="3" dy="7"/>
-</sprite>
-<!-- ###### Arms ###### -->
-<sprite name="arm-left-1" type="arm-left">
-	<image file="arm1.png"/>
-	<anchor dx="3" dy="0"/>
-</sprite>
-<sprite name="arm-right-1" type="arm-right">
-	<image file="arm1.png"/>
-	<anchor dx="3" dy="0"/>
-	<attached member_type="weapon" frame="*" dx="7" dy="7"/>
-</sprite>
-
-<sprite name="arm-left-2" type="arm-left">
-	<image file="arm2.png"/>
-	<anchor dx="3" dy="0"/>
-</sprite>
-<sprite name="arm-right-2" type="arm-right">
-	<image file="arm2.png"/>
-	<anchor dx="2" dy="1"/>
-	<attached member_type="yoyo" frame="*" dx="-1" dy="17"/>
-	<attached member_type="weapon" frame="*" dx="4" dy="20"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<!-- ###### Black ###### -->
-<!-- Body  -->
-<sprite name="body-black" type="body">
-	<image file="b_body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="27"/>
-	<attached member_type="head" frame="*" dx="8" dy="6"/>
-	<attached member_type="arm-right" frame="*" dx="3" dy="18"/>
-	<attached member_type="arm-left" frame="*" dx="8" dy="17"/>
-	<attached member_type="foot-left" frame="*" dx="10" dy="29"/>
-	<attached member_type="foot-right" frame="*" dx="5" dy="30"/>
-	<attached member_type="jetpack-belt" frame="*" dx="-1" dy="15"/>
-	<attached member_type="jetpack-right" frame="*" dx="-2" dy="20"/>
-	<attached member_type="jetpack-left" frame="*" dx="4" dy="19"/>
-	<attached member_type="tail" frame="*" dx="2" dy="31"/>
-	<attached member_type="construct" frame="*" dx="6" dy="7"/>
-	<attached member_type="hula" frame="*" dx="14" dy="25"/>
-</sprite>
-<!--  Head  -->
-<sprite name="head-black" type="head">
-	<image file="b_head.png"/>
-	<anchor dx="2" dy="7"/>
-	<attached member_type="ear-left" frame="*" dx="3" dy="4"/>
-	<attached member_type="ear-right" frame="*" dx="-1" dy="4"/>
-	<attached member_type="eyes-normal" frame="*" dx="6" dy="6"/>
-	<attached member_type="helmet" frame="*" dx="3" dy="7"/>
-</sprite>
-<!-- Eyes -->
-<sprite name="eyes-black" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-<!-- eyelid -->
-<sprite name="eyelid-black" type="eyelid">
-	<image file="b_eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-<!-- Ears -->
-<sprite name="ear-right-black" type="ear-right">
-	<image file="b_ear-right.png"/>
-	<anchor dx="3" dy="6"/>
-</sprite>
-<sprite name="ear-left-black" type="ear-left">
-	<image file="b_ear-left.png"/>
-	<anchor dx="3" dy="7"/>
-</sprite>
-<!--  Arms  -->
-<sprite name="arm-left-1-black" type="arm-left">
-	<image file="b_arm1.png"/>
-	<anchor dx="3" dy="0"/>
-</sprite>
-<sprite name="arm-right-1-black" type="arm-right">
-	<image file="b_arm1.png"/>
-	<anchor dx="3" dy="0"/>
-	<attached member_type="weapon" frame="*" dx="7" dy="7"/>
-</sprite>
-<sprite name="arm-left-2-black" type="arm-left">
-	<image file="b_arm2.png"/>
-	<anchor dx="3" dy="0"/>
-</sprite>
-<sprite name="arm-right-2-black" type="arm-right">
-	<image file="b_arm2.png"/>
-	<anchor dx="2" dy="1"/>
-	<attached member_type="yoyo" frame="*" dx="-1" dy="17"/>
-	<attached member_type="weapon" frame="*" dx="4" dy="20"/>
-</sprite>
-<!-- Legs -->
-<sprite name="foot-left-black" type="foot-left" >
-	<image file="b_foot.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-<sprite name="foot-right-black" type="foot-right" >
-	<image file="b_foot.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-<!-- Tail -->
-<sprite name="tail-black" type="tail">
-	<image file="b_tail.png"/>
-	<anchor dx="12" dy="13"/>
-</sprite>
-
-<!-- ###### Jetpack ###### -->
-<sprite name="jetpack-belt" type="jetpack-belt" >
-	<image file="jetpack-belt.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-right" type="jetpack-right" >
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-right" frame="*" dx="5" dy="18"/>
-</sprite>
-
-<sprite name="jetpack-left" type="jetpack-left" >
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-left" frame="*" dx="5" dy="18"/>
-</sprite>
-
-<sprite name="jetpack-fire-right" type="jetpack-fire-right" >
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-fire-left" type="jetpack-fire-left" >
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet" >
-	<image file="helmet.png"/>
-	<anchor dx="9" dy="13"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1"/>
-	</image>
-	<anchor dx="29" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body">
-	<image file="dead.png">
-		<grid pos="0,0" size="27,31" array="6,1"/>
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="tail"/>
-	<c_member name="arm-left-1"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-1"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="tail"/>	
-	<c_member name="arm-left-1"/>
-	<c_member name="foot-left"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="jetpack-right"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="arm-right-1"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="tail"/>	
-	<c_member name="arm-left-1"/>
-	<c_member name="foot-left"/>
-	<c_member name="jetpack-fire-left"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="jetpack-fire-right"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="jetpack-right"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="arm-right-1" layer="16"/>
-</clothe>
-
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="tail"/>	
-	<c_member name="arm-left-1"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="helmet"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-1"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="tail"/>
-	<c_member name="arm-left-1"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="arm-right-2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="tail"/>
-	<c_member name="arm-left-2"/>
-	<c_member name="hula"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-2"/>
-	<c_member name="hoop"/>
-</clothe>
-
-
-<!-- ###### Animation Tired ###### -->
-<clothe name="animation1">
-	<c_member name="tail"/>
-	<c_member name="arm-left-2"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### black ###### -->
-<clothe name="black">
-	<c_member name="tail-black"/>
-	<c_member name="arm-left-1-black"/>
-	<c_member name="foot-left-black"/>
-	<c_member name="ear-left-black"/>
-	<c_member name="body-black"/>
-	<c_member name="head-black"/>
-	<c_member name="eyes-black"/>
-	<c_member name="ear-right-black"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-black"/>
-	<c_member name="foot-right-black"/>
-	<c_member name="arm-right-1-black"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### fly-black ###### -->
-<clothe name="fly-black">
-	<c_member name="tail-black"/>
-	<c_member name="arm-left-1-black"/>
-	<c_member name="foot-left-black"/>
-	<c_member name="ear-left-black"/>
-	<c_member name="body-black"/>
-	<c_member name="head-black"/>
-	<c_member name="eyes-black"/>
-	<c_member name="ear-right-black"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-black"/>
-	<c_member name="foot-right-black"/>
-	<c_member name="arm-right-1-black"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- # Parachute # -->
-<clothe name="weapon-parachute">
-	<c_member name="tail"/>
-	<c_member name="arm-left-2"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="tail"/>
-	<c_member name="arm-left-1"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-1"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="tail"/>
-	<c_member name="arm-left-1"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-1"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Gun ###### -->
-<clothe name="weapon-gun">
-	<c_member name="tail"/>
-	<c_member name="arm-left-2"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### m16 ###### -->
-<clothe name="weapon-m16">
-	<c_member name="tail"/>
-	<c_member name="arm-left-2"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### shotgun ###### -->
-<clothe name="weapon-shotgun">
-	<c_member name="tail"/>
-	<c_member name="arm-left-2"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### snipe_rifle ###### -->
-<clothe name="weapon-snipe_rifle">
-	<c_member name="tail"/>
-	<c_member name="arm-left-2"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right-2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="tail" angle="-2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="tail" angle="-2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40" />
-		<member type="arm-right" angle="40" />
-		<member type="foot-left" angle="40" />
-		<member type="foot-right" angle="-40" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />	
-		<member type="tail" angle="-2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left-1" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="40" />
-		<member type="arm-right" angle="-40" />
-		<member type="foot-left-1" angle="-40" />
-		<member type="foot-right" angle="40" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="tail" angle="2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="false"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="false"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="-90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="-90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="tail" angle="-2" />	
-		<member type="pupil-right" dx="-1" />
-		<member type="pupil-left" dx="-1" />	
-	</frame>
-</movement>
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-right" angle="-90" />
-		<member type="yoyo" angle="90"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180" dx="2" />
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="1" dy="10"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175" dx="2" />
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="1" dy="10"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="170" dx="2" />
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="1" dy="10"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175" dx="2" />
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="1" dy="10"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180" dx="2" />
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="1" dy="10"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185" dx="2" />
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="1" dy="10"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="190" dx="2" />
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="1" dy="10"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185" dx="2" />
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="1" dy="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-		<member type="jetpack-fire" dy="-5" /> <!-- hide the fire under the jetpack -->
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="jetpack-fire-right" dy="0" />
-		<member type="jetpack-fire-left" dy="0" />
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="30" />
-	</frame>
-	<frame>
-		<member type="jetpack-fire-right" dy="7" />
-		<member type="jetpack-fire-left" dy="7" />
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="30" />
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-
-
-</resources>
diff --git a/data/body/firefoxteam/dead.png b/data/body/firefoxteam/dead.png
deleted file mode 100644
index dbde3e7..0000000
Binary files a/data/body/firefoxteam/dead.png and /dev/null differ
diff --git a/data/body/firefoxteam/ear-left.png b/data/body/firefoxteam/ear-left.png
deleted file mode 100644
index 05a0e76..0000000
Binary files a/data/body/firefoxteam/ear-left.png and /dev/null differ
diff --git a/data/body/firefoxteam/ear-right.png b/data/body/firefoxteam/ear-right.png
deleted file mode 100644
index 2e862a2..0000000
Binary files a/data/body/firefoxteam/ear-right.png and /dev/null differ
diff --git a/data/body/firefoxteam/eyelid.png b/data/body/firefoxteam/eyelid.png
deleted file mode 100644
index 7f963b1..0000000
Binary files a/data/body/firefoxteam/eyelid.png and /dev/null differ
diff --git a/data/body/firefoxteam/eyes.png b/data/body/firefoxteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/firefoxteam/eyes.png and /dev/null differ
diff --git a/data/body/firefoxteam/foot.png b/data/body/firefoxteam/foot.png
deleted file mode 100644
index 213dc87..0000000
Binary files a/data/body/firefoxteam/foot.png and /dev/null differ
diff --git a/data/body/firefoxteam/head.png b/data/body/firefoxteam/head.png
deleted file mode 100644
index 01acb20..0000000
Binary files a/data/body/firefoxteam/head.png and /dev/null differ
diff --git a/data/body/firefoxteam/helmet.png b/data/body/firefoxteam/helmet.png
deleted file mode 100644
index cff3a64..0000000
Binary files a/data/body/firefoxteam/helmet.png and /dev/null differ
diff --git a/data/body/firefoxteam/jetpack-belt.png b/data/body/firefoxteam/jetpack-belt.png
deleted file mode 100644
index a10fa6e..0000000
Binary files a/data/body/firefoxteam/jetpack-belt.png and /dev/null differ
diff --git a/data/body/firefoxteam/jetpack-fire.png b/data/body/firefoxteam/jetpack-fire.png
deleted file mode 100644
index cf12cc5..0000000
Binary files a/data/body/firefoxteam/jetpack-fire.png and /dev/null differ
diff --git a/data/body/firefoxteam/jetpack.png b/data/body/firefoxteam/jetpack.png
deleted file mode 100644
index b762daa..0000000
Binary files a/data/body/firefoxteam/jetpack.png and /dev/null differ
diff --git a/data/body/firefoxteam/pupil.png b/data/body/firefoxteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/firefoxteam/pupil.png and /dev/null differ
diff --git a/data/body/firefoxteam/tail.png b/data/body/firefoxteam/tail.png
deleted file mode 100644
index 11a224e..0000000
Binary files a/data/body/firefoxteam/tail.png and /dev/null differ
diff --git a/data/body/firefoxteam/yoyo.png b/data/body/firefoxteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/firefoxteam/yoyo.png and /dev/null differ
diff --git a/data/body/gnu/arm1left.png b/data/body/gnu/arm1left.png
new file mode 100644
index 0000000..3771b7b
Binary files /dev/null and b/data/body/gnu/arm1left.png differ
diff --git a/data/body/gnu/arm1right.png b/data/body/gnu/arm1right.png
new file mode 100644
index 0000000..3771b7b
Binary files /dev/null and b/data/body/gnu/arm1right.png differ
diff --git a/data/body/gnu/arm2left.png b/data/body/gnu/arm2left.png
new file mode 100644
index 0000000..f340f1d
Binary files /dev/null and b/data/body/gnu/arm2left.png differ
diff --git a/data/body/gnu/arm2right.png b/data/body/gnu/arm2right.png
new file mode 100644
index 0000000..f340f1d
Binary files /dev/null and b/data/body/gnu/arm2right.png differ
diff --git a/data/body/gnu/arm3left.png b/data/body/gnu/arm3left.png
new file mode 100644
index 0000000..32ea904
Binary files /dev/null and b/data/body/gnu/arm3left.png differ
diff --git a/data/body/gnu/arm3right.png b/data/body/gnu/arm3right.png
new file mode 100644
index 0000000..32ea904
Binary files /dev/null and b/data/body/gnu/arm3right.png differ
diff --git a/data/body/gnu/back.png b/data/body/gnu/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/gnu/back.png differ
diff --git a/data/body/gnu/belt.png b/data/body/gnu/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/gnu/belt.png differ
diff --git a/data/body/gnu/black_arm1left.png b/data/body/gnu/black_arm1left.png
new file mode 100644
index 0000000..0413391
Binary files /dev/null and b/data/body/gnu/black_arm1left.png differ
diff --git a/data/body/gnu/black_arm1right.png b/data/body/gnu/black_arm1right.png
new file mode 100644
index 0000000..0413391
Binary files /dev/null and b/data/body/gnu/black_arm1right.png differ
diff --git a/data/body/gnu/black_arm2left.png b/data/body/gnu/black_arm2left.png
new file mode 100644
index 0000000..dc29158
Binary files /dev/null and b/data/body/gnu/black_arm2left.png differ
diff --git a/data/body/gnu/black_arm2right.png b/data/body/gnu/black_arm2right.png
new file mode 100644
index 0000000..dc29158
Binary files /dev/null and b/data/body/gnu/black_arm2right.png differ
diff --git a/data/body/gnu/black_arm3left.png b/data/body/gnu/black_arm3left.png
new file mode 100644
index 0000000..f154477
Binary files /dev/null and b/data/body/gnu/black_arm3left.png differ
diff --git a/data/body/gnu/black_arm3right.png b/data/body/gnu/black_arm3right.png
new file mode 100644
index 0000000..f154477
Binary files /dev/null and b/data/body/gnu/black_arm3right.png differ
diff --git a/data/body/gnu/black_back.png b/data/body/gnu/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/gnu/black_back.png differ
diff --git a/data/body/gnu/black_body.png b/data/body/gnu/black_body.png
new file mode 100644
index 0000000..c676724
Binary files /dev/null and b/data/body/gnu/black_body.png differ
diff --git a/data/body/gnu/black_eyelid.png b/data/body/gnu/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/gnu/black_eyelid.png differ
diff --git a/data/body/gnu/black_eyes.png b/data/body/gnu/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/gnu/black_eyes.png differ
diff --git a/data/body/gnu/black_footleft.png b/data/body/gnu/black_footleft.png
new file mode 100644
index 0000000..a4266ed
Binary files /dev/null and b/data/body/gnu/black_footleft.png differ
diff --git a/data/body/gnu/black_footright.png b/data/body/gnu/black_footright.png
new file mode 100644
index 0000000..a4266ed
Binary files /dev/null and b/data/body/gnu/black_footright.png differ
diff --git a/data/body/gnu/black_hair.png b/data/body/gnu/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/gnu/black_hair.png differ
diff --git a/data/body/gnu/black_head.png b/data/body/gnu/black_head.png
new file mode 100644
index 0000000..be3fd20
Binary files /dev/null and b/data/body/gnu/black_head.png differ
diff --git a/data/body/gnu/black_hornleft.png b/data/body/gnu/black_hornleft.png
new file mode 100644
index 0000000..86125f4
Binary files /dev/null and b/data/body/gnu/black_hornleft.png differ
diff --git a/data/body/gnu/black_hornright.png b/data/body/gnu/black_hornright.png
new file mode 100644
index 0000000..146a409
Binary files /dev/null and b/data/body/gnu/black_hornright.png differ
diff --git a/data/body/gnu/black_noze.png b/data/body/gnu/black_noze.png
new file mode 100644
index 0000000..0124289
Binary files /dev/null and b/data/body/gnu/black_noze.png differ
diff --git a/data/body/gnu/black_pupil.png b/data/body/gnu/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/gnu/black_pupil.png differ
diff --git a/data/body/gnu/black_tail.png b/data/body/gnu/black_tail.png
new file mode 100644
index 0000000..e260919
Binary files /dev/null and b/data/body/gnu/black_tail.png differ
diff --git a/data/body/gnu/body.png b/data/body/gnu/body.png
new file mode 100644
index 0000000..bd30ac5
Binary files /dev/null and b/data/body/gnu/body.png differ
diff --git a/data/body/gnu/c1.png b/data/body/gnu/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/gnu/c1.png differ
diff --git a/data/body/gnu/c2.png b/data/body/gnu/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/gnu/c2.png differ
diff --git a/data/body/gnu/config.xml b/data/body/gnu/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/gnu/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/gnu/dead.png b/data/body/gnu/dead.png
new file mode 100644
index 0000000..d3701e8
Binary files /dev/null and b/data/body/gnu/dead.png differ
diff --git a/data/body/gnu/eyelid.png b/data/body/gnu/eyelid.png
new file mode 100644
index 0000000..e672700
Binary files /dev/null and b/data/body/gnu/eyelid.png differ
diff --git a/data/body/gnu/eyes.png b/data/body/gnu/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/gnu/eyes.png differ
diff --git a/data/body/gnu/footleft.png b/data/body/gnu/footleft.png
new file mode 100644
index 0000000..1545356
Binary files /dev/null and b/data/body/gnu/footleft.png differ
diff --git a/data/body/gnu/footright.png b/data/body/gnu/footright.png
new file mode 100644
index 0000000..1545356
Binary files /dev/null and b/data/body/gnu/footright.png differ
diff --git a/data/body/gnu/hair.png b/data/body/gnu/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/gnu/hair.png differ
diff --git a/data/body/gnu/hat.png b/data/body/gnu/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/gnu/hat.png differ
diff --git a/data/body/gnu/head.png b/data/body/gnu/head.png
new file mode 100644
index 0000000..322e4d2
Binary files /dev/null and b/data/body/gnu/head.png differ
diff --git a/data/body/gnu/helmet.png b/data/body/gnu/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/gnu/helmet.png differ
diff --git a/data/body/gnuteam/hoop.png b/data/body/gnu/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/gnuteam/hoop.png
rename to data/body/gnu/hoop.png
diff --git a/data/body/gnu/hornleft.png b/data/body/gnu/hornleft.png
new file mode 100644
index 0000000..b3cd9f7
Binary files /dev/null and b/data/body/gnu/hornleft.png differ
diff --git a/data/body/gnu/hornright.png b/data/body/gnu/hornright.png
new file mode 100644
index 0000000..12a4d04
Binary files /dev/null and b/data/body/gnu/hornright.png differ
diff --git a/data/body/gnuteam/hula.png b/data/body/gnu/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/gnuteam/hula.png
rename to data/body/gnu/hula.png
diff --git a/data/body/gnu/jetpack-fire.png b/data/body/gnu/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/gnu/jetpack-fire.png differ
diff --git a/data/body/gnu/jetpack.png b/data/body/gnu/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/gnu/jetpack.png differ
diff --git a/data/body/gnu/noze.png b/data/body/gnu/noze.png
new file mode 100644
index 0000000..7cf5b8c
Binary files /dev/null and b/data/body/gnu/noze.png differ
diff --git a/data/body/gnu/pupil.png b/data/body/gnu/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/gnu/pupil.png differ
diff --git a/data/body/gnu/sick_head.png b/data/body/gnu/sick_head.png
new file mode 100644
index 0000000..6362a64
Binary files /dev/null and b/data/body/gnu/sick_head.png differ
diff --git a/data/body/gnu/tail.png b/data/body/gnu/tail.png
new file mode 100644
index 0000000..0754574
Binary files /dev/null and b/data/body/gnu/tail.png differ
diff --git a/data/body/gnu/yoyo.png b/data/body/gnu/yoyo.png
new file mode 100755
index 0000000..6a22a92
Binary files /dev/null and b/data/body/gnu/yoyo.png differ
diff --git a/data/body/gnuteam/arm.png b/data/body/gnuteam/arm.png
deleted file mode 100644
index d678cd8..0000000
Binary files a/data/body/gnuteam/arm.png and /dev/null differ
diff --git a/data/body/gnuteam/b_arm.png b/data/body/gnuteam/b_arm.png
deleted file mode 100644
index 067d14c..0000000
Binary files a/data/body/gnuteam/b_arm.png and /dev/null differ
diff --git a/data/body/gnuteam/b_body.png b/data/body/gnuteam/b_body.png
deleted file mode 100644
index 3b5ae12..0000000
Binary files a/data/body/gnuteam/b_body.png and /dev/null differ
diff --git a/data/body/gnuteam/b_eyelid.png b/data/body/gnuteam/b_eyelid.png
deleted file mode 100644
index da505b3..0000000
Binary files a/data/body/gnuteam/b_eyelid.png and /dev/null differ
diff --git a/data/body/gnuteam/b_foot.png b/data/body/gnuteam/b_foot.png
deleted file mode 100644
index b813ac6..0000000
Binary files a/data/body/gnuteam/b_foot.png and /dev/null differ
diff --git a/data/body/gnuteam/b_head.png b/data/body/gnuteam/b_head.png
deleted file mode 100644
index 84fe095..0000000
Binary files a/data/body/gnuteam/b_head.png and /dev/null differ
diff --git a/data/body/gnuteam/body.png b/data/body/gnuteam/body.png
deleted file mode 100644
index 0402f42..0000000
Binary files a/data/body/gnuteam/body.png and /dev/null differ
diff --git a/data/body/gnuteam/c1.png b/data/body/gnuteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/gnuteam/c1.png and /dev/null differ
diff --git a/data/body/gnuteam/c2.png b/data/body/gnuteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/gnuteam/c2.png and /dev/null differ
diff --git a/data/body/gnuteam/config.xml b/data/body/gnuteam/config.xml
deleted file mode 100644
index 1836fe5..0000000
--- a/data/body/gnuteam/config.xml
+++ /dev/null
@@ -1,2099 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-<alias movement="fly-black" correspond_to="fly" />
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body">
-	<image file="body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="27"/>
-	<attached member_type="head" frame="*" dx="9" dy="6"/>
-	<attached member_type="arm-right" frame="*" dx="3" dy="18"/>
-	<attached member_type="arm-left" frame="*" dx="08" dy="17"/>
-	<attached member_type="foot-left" frame="*" dx="11" dy="30"/>
-	<attached member_type="foot-right" frame="*" dx="5" dy="31"/>
-	<attached member_type="jetpack-belt" frame="*" dx="1" dy="21"/>
-	<attached member_type="jetpack-right" frame="*" dx="1" dy="23"/>
-	<attached member_type="jetpack-left" frame="*" dx="9" dy="23"/>
-	<attached member_type="tail" frame="*" dx="2" dy="28"/>
-	<attached member_type="construct" frame="*" dx="8" dy="4"/>
-	<attached member_type="hula" frame="*" dx="14" dy="25"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Tail ###### -->
-<sprite name="tail" type="tail">
-	<image file="tail.png"/>
-	<anchor dx="8" dy="6"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="head.png"/>
-	<anchor dx="11" dy="12"/>
-	<attached member_type="eyes-normal" frame="*" dx="11" dy="11"/>
-	<attached member_type="helmet" frame="*" dx="9" dy="11"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Arms ###### -->
-<sprite name="arm-left" type="arm-left">
-	<image file="arm.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-
-<sprite name="arm-right" type="arm-right">
-	<image file="arm.png"/>
-	<anchor dx="5" dy="3"/>
-	<attached member_type="weapon" frame="*" dx="3" dy="16"/>
-	<attached member_type="yoyo" frame="*" dx="3" dy="16"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left">
-	<image file="foot.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right">
-	<image file="foot.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-
-<!-- ###### Jetpack ###### -->
-<sprite name="jetpack-belt" type="jetpack-belt">
-	<image file="jetpack-belt.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-right" type="jetpack-right">
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-right" frame="*" dx="3" dy="13"/>
-</sprite>
-
-<sprite name="jetpack-left" type="jetpack-left">
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-left" frame="*" dx="3" dy="13"/>
-</sprite>
-
-<sprite name="jetpack-fire-right" type="jetpack-fire-right">
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-fire-left" type="jetpack-fire-left">
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet">
-	<image file="helmet.png"/>
-	<anchor dx="9" dy="13"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1"/>
-	</image>
-	<anchor dx="29" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body">
-	<image file="dead.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Black ###### -->
-<!-- Body -->
-<sprite name="body-black" type="body">
-	<image file="b_body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="27"/>
-	<attached member_type="head" frame="*" dx="9" dy="6"/>
-	<attached member_type="arm-right" frame="*" dx="3" dy="18"/>
-	<attached member_type="arm-left" frame="*" dx="08" dy="17"/>
-	<attached member_type="foot-left" frame="*" dx="11" dy="30"/>
-	<attached member_type="foot-right" frame="*" dx="5" dy="31"/>
-	<attached member_type="jetpack-belt" frame="*" dx="1" dy="21"/>
-	<attached member_type="jetpack-right" frame="*" dx="1" dy="23"/>
-	<attached member_type="jetpack-left" frame="*" dx="9" dy="23"/>
-	<attached member_type="tail" frame="*" dx="2" dy="28"/>
-	<attached member_type="construct" frame="*" dx="8" dy="4"/>
-	<attached member_type="hula" frame="*" dx="14" dy="25"/>
-</sprite>
-<!-- Head -->
-<sprite name="head-black" type="head">
-	<image file="b_head.png"/>
-	<anchor dx="11" dy="12"/>
-	<attached member_type="eyes-normal" frame="*" dx="11" dy="11"/>
-	<attached member_type="helmet" frame="*" dx="9" dy="11"/>
-</sprite>
-<!-- Eyes -->
-<sprite name="eyes-black" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-<sprite name="eyelid-black" type="eyelid">
-	<image file="b_eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-<!-- Arms -->
-<sprite name="arm-left-black" type="arm-left">
-	<image file="b_arm.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-<sprite name="arm-right-black" type="arm-right">
-	<image file="b_arm.png"/>
-	<anchor dx="5" dy="3"/>
-	<attached member_type="weapon" frame="*" dx="3" dy="16"/>
-	<attached member_type="yoyo" frame="*" dx="3" dy="16"/>
-</sprite>
-<!-- Legs -->
-<sprite name="foot-left-black" type="foot-left">
-	<image file="b_foot.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-<sprite name="foot-right-black" type="foot-right">
-	<image file="b_foot.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="tail" />
-	<c_member name="arm-left" />
-	<c_member name="foot-left" />
-	<c_member name="body-normal" />
-	<c_member name="head" />
-	<c_member name="eyes-normal" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right" />
-	<c_member name="arm-right" />
-	<c_member name="weapon" />
-</clothe>
-
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="tail" />
-	<c_member name="arm-left" />
-	<c_member name="foot-left" />
-	<c_member name="jetpack-left" />
-	<c_member name="jetpack-right" />
-	<c_member name="body-normal" />
-	<c_member name="head" />
-	<c_member name="eyes-normal" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="foot-right" />
-	<c_member name="jetpack-belt" />
-	<c_member name="arm-right" />
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="tail" />
-	<c_member name="arm-left" />
-	<c_member name="foot-left" />
-	<c_member name="jetpack-fire-left" />
-	<c_member name="jetpack-left" />
-	<c_member name="jetpack-fire-right" />
-	<c_member name="jetpack-right" />
-	<c_member name="body-normal" />
-	<c_member name="head" />
-	<c_member name="eyes-normal" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="jetpack-belt" />
-	<c_member name="foot-right" />
-	<c_member name="arm-right" layer="114"/>
-</clothe>
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="tail" />
-	<c_member name="arm-left" />
-	<c_member name="foot-left" />
-	<c_member name="body-normal" />
-	<c_member name="head" />
-	<c_member name="eyes-normal" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="foot-right" />
-	<c_member name="arm-right" />
-	<c_member name="helmet" />
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="tail" />
-	<c_member name="arm-left" />
-	<c_member name="foot-left" />
-	<c_member name="body-normal" />
-	<c_member name="head" />
-	<c_member name="eyes-normal" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="foot-right" />
-	<c_member name="yoyo" />
-	<c_member name="arm-right" />
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula" />
-	<c_member name="tail" />
-	<c_member name="arm-left" />
-	<c_member name="foot-left" />
-	<c_member name="body-normal" />
-	<c_member name="head" />
-	<c_member name="eyes-normal" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="foot-right" />
-	<c_member name="arm-right" />
-	<c_member name="hoop" />
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead" />
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="tail" />
-	<c_member name="arm-left-black" />
-	<c_member name="foot-left-black" />
-	<c_member name="body-black" />
-	<c_member name="head-black" />
-	<c_member name="eyes-black" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="eyelid-black"/>
-	<c_member name="foot-right-black" />
-	<c_member name="arm-right-black" />
-	<c_member name="weapon" />
-</clothe>
-
-<!-- ###### fly-black ###### -->
-<clothe name="fly-black">
-	<c_member name="tail" />
-	<c_member name="arm-left-black" />
-	<c_member name="foot-left-black" />
-	<c_member name="body-black" />
-	<c_member name="head-black" />
-	<c_member name="eyes-black" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="eyelid-black"/>
-	<c_member name="foot-right-black" />
-	<c_member name="arm-right-black" />
-	<c_member name="weapon" />
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2" />
-	<c_member name="tail" />
-	<c_member name="arm-left" />
-	<c_member name="foot-left" />
-	<c_member name="body-normal" />
-	<c_member name="head" />
-	<c_member name="eyes-normal" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="construct" />
-	<c_member name="foot-right" />
-	<c_member name="arm-right" />
-	<c_member name="weapon" />
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2" />
-	<c_member name="tail" />
-	<c_member name="arm-left" />
-	<c_member name="foot-left" />
-	<c_member name="body-normal" />
-	<c_member name="head" />
-	<c_member name="eyes-normal" />
-	<c_member name="pupil-right" />
-	<c_member name="pupil-left" />
-	<c_member name="construct" />
-	<c_member name="foot-right" />
-	<c_member name="arm-right" />
-	<c_member name="weapon" />
-</clothe>
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40" />
-		<member type="arm-right" angle="40" />
-		<member type="foot-left" angle="40" />
-		<member type="foot-right" angle="-40" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />	
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="40" />
-		<member type="arm-right" angle="-40" />
-		<member type="foot-left" angle="-40" />
-		<member type="foot-right" angle="40" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="tail" angle="2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="tail" angle="-2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-</movement>
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-right" angle="-90"/>
-		<member type="yoyo" angle="90"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-4" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-4" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-4" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-4" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-4" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-4" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-4" dy="7"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-4" dy="7"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-		<member type="jetpack-fire" dy="-5"/> <!-- hide the fire under the jetpack -->
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire-right" dy="7"/>
-		<member type="jetpack-fire-left" dy="7"/>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire-right" dy="7"/>
-		<member type="jetpack-fire-left" dy="7"/>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="10" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="10" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="20" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="20" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="30" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="30" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="40" dy="-2" dx="-1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="40" dy="-2" dx="-1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="50" dy="-2" dx="-1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="50" dy="-2" dx="-2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-2" dx="-2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-2" dx="-2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-
-</resources>
diff --git a/data/body/gnuteam/dead.png b/data/body/gnuteam/dead.png
deleted file mode 100644
index 518a8ad..0000000
Binary files a/data/body/gnuteam/dead.png and /dev/null differ
diff --git a/data/body/gnuteam/eyelid.png b/data/body/gnuteam/eyelid.png
deleted file mode 100644
index ccf29a0..0000000
Binary files a/data/body/gnuteam/eyelid.png and /dev/null differ
diff --git a/data/body/gnuteam/eyes.png b/data/body/gnuteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/gnuteam/eyes.png and /dev/null differ
diff --git a/data/body/gnuteam/foot.png b/data/body/gnuteam/foot.png
deleted file mode 100644
index 4d10142..0000000
Binary files a/data/body/gnuteam/foot.png and /dev/null differ
diff --git a/data/body/gnuteam/head.png b/data/body/gnuteam/head.png
deleted file mode 100644
index a3b738a..0000000
Binary files a/data/body/gnuteam/head.png and /dev/null differ
diff --git a/data/body/gnuteam/helmet.png b/data/body/gnuteam/helmet.png
deleted file mode 100644
index f209d60..0000000
Binary files a/data/body/gnuteam/helmet.png and /dev/null differ
diff --git a/data/body/gnuteam/jetpack-belt.png b/data/body/gnuteam/jetpack-belt.png
deleted file mode 100644
index dc53afe..0000000
Binary files a/data/body/gnuteam/jetpack-belt.png and /dev/null differ
diff --git a/data/body/gnuteam/jetpack-fire.png b/data/body/gnuteam/jetpack-fire.png
deleted file mode 100644
index c24e41d..0000000
Binary files a/data/body/gnuteam/jetpack-fire.png and /dev/null differ
diff --git a/data/body/gnuteam/jetpack.png b/data/body/gnuteam/jetpack.png
deleted file mode 100644
index 4a5a90e..0000000
Binary files a/data/body/gnuteam/jetpack.png and /dev/null differ
diff --git a/data/body/gnuteam/pupil.png b/data/body/gnuteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/gnuteam/pupil.png and /dev/null differ
diff --git a/data/body/gnuteam/tail.png b/data/body/gnuteam/tail.png
deleted file mode 100644
index 5c9a683..0000000
Binary files a/data/body/gnuteam/tail.png and /dev/null differ
diff --git a/data/body/gnuteam/yoyo.png b/data/body/gnuteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/gnuteam/yoyo.png and /dev/null differ
diff --git a/data/body/konqi/arm1left.png b/data/body/konqi/arm1left.png
new file mode 100644
index 0000000..a7a173e
Binary files /dev/null and b/data/body/konqi/arm1left.png differ
diff --git a/data/body/konqi/arm1right.png b/data/body/konqi/arm1right.png
new file mode 100644
index 0000000..a7a173e
Binary files /dev/null and b/data/body/konqi/arm1right.png differ
diff --git a/data/body/konqi/arm2left.png b/data/body/konqi/arm2left.png
new file mode 100644
index 0000000..258404c
Binary files /dev/null and b/data/body/konqi/arm2left.png differ
diff --git a/data/body/konqi/arm2right.png b/data/body/konqi/arm2right.png
new file mode 100644
index 0000000..258404c
Binary files /dev/null and b/data/body/konqi/arm2right.png differ
diff --git a/data/body/konqi/arm3left.png b/data/body/konqi/arm3left.png
new file mode 100644
index 0000000..ce461e6
Binary files /dev/null and b/data/body/konqi/arm3left.png differ
diff --git a/data/body/konqi/arm3right.png b/data/body/konqi/arm3right.png
new file mode 100644
index 0000000..ce461e6
Binary files /dev/null and b/data/body/konqi/arm3right.png differ
diff --git a/data/body/konqi/back.png b/data/body/konqi/back.png
new file mode 100644
index 0000000..8666c12
Binary files /dev/null and b/data/body/konqi/back.png differ
diff --git a/data/body/konqi/belt.png b/data/body/konqi/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/konqi/belt.png differ
diff --git a/data/body/konqi/black_arm1left.png b/data/body/konqi/black_arm1left.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/konqi/black_arm1left.png differ
diff --git a/data/body/konqi/black_arm1right.png b/data/body/konqi/black_arm1right.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/konqi/black_arm1right.png differ
diff --git a/data/body/konqi/black_arm2left.png b/data/body/konqi/black_arm2left.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/konqi/black_arm2left.png differ
diff --git a/data/body/konqi/black_arm2right.png b/data/body/konqi/black_arm2right.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/konqi/black_arm2right.png differ
diff --git a/data/body/konqi/black_arm3left.png b/data/body/konqi/black_arm3left.png
new file mode 100644
index 0000000..5c762c7
Binary files /dev/null and b/data/body/konqi/black_arm3left.png differ
diff --git a/data/body/konqi/black_arm3right.png b/data/body/konqi/black_arm3right.png
new file mode 100644
index 0000000..5c762c7
Binary files /dev/null and b/data/body/konqi/black_arm3right.png differ
diff --git a/data/body/konqi/black_back.png b/data/body/konqi/black_back.png
new file mode 100644
index 0000000..99383d7
Binary files /dev/null and b/data/body/konqi/black_back.png differ
diff --git a/data/body/konqi/black_body.png b/data/body/konqi/black_body.png
new file mode 100644
index 0000000..f943e8f
Binary files /dev/null and b/data/body/konqi/black_body.png differ
diff --git a/data/body/konqi/black_eyelid.png b/data/body/konqi/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/konqi/black_eyelid.png differ
diff --git a/data/body/konqi/black_eyes.png b/data/body/konqi/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/konqi/black_eyes.png differ
diff --git a/data/body/konqi/black_footleft.png b/data/body/konqi/black_footleft.png
new file mode 100644
index 0000000..9790217
Binary files /dev/null and b/data/body/konqi/black_footleft.png differ
diff --git a/data/body/konqi/black_footright.png b/data/body/konqi/black_footright.png
new file mode 100644
index 0000000..9790217
Binary files /dev/null and b/data/body/konqi/black_footright.png differ
diff --git a/data/body/konqi/black_hair.png b/data/body/konqi/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/konqi/black_hair.png differ
diff --git a/data/body/konqi/black_head.png b/data/body/konqi/black_head.png
new file mode 100644
index 0000000..a457db0
Binary files /dev/null and b/data/body/konqi/black_head.png differ
diff --git a/data/body/konqi/black_hornleft.png b/data/body/konqi/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/konqi/black_hornleft.png differ
diff --git a/data/body/konqi/black_hornright.png b/data/body/konqi/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/konqi/black_hornright.png differ
diff --git a/data/body/konqi/black_noze.png b/data/body/konqi/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/konqi/black_noze.png differ
diff --git a/data/body/konqi/black_pupil.png b/data/body/konqi/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/konqi/black_pupil.png differ
diff --git a/data/body/konqi/black_tail.png b/data/body/konqi/black_tail.png
new file mode 100644
index 0000000..8957438
Binary files /dev/null and b/data/body/konqi/black_tail.png differ
diff --git a/data/body/konqi/body.png b/data/body/konqi/body.png
new file mode 100644
index 0000000..9e2a643
Binary files /dev/null and b/data/body/konqi/body.png differ
diff --git a/data/body/konqi/c1.png b/data/body/konqi/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/konqi/c1.png differ
diff --git a/data/body/konqi/c2.png b/data/body/konqi/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/konqi/c2.png differ
diff --git a/data/body/konqi/config.xml b/data/body/konqi/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/konqi/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/konqi/dead.png b/data/body/konqi/dead.png
new file mode 100644
index 0000000..9c58ecd
Binary files /dev/null and b/data/body/konqi/dead.png differ
diff --git a/data/body/konqi/eyelid.png b/data/body/konqi/eyelid.png
new file mode 100644
index 0000000..de4008f
Binary files /dev/null and b/data/body/konqi/eyelid.png differ
diff --git a/data/body/konqi/eyes.png b/data/body/konqi/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/konqi/eyes.png differ
diff --git a/data/body/konqi/footleft.png b/data/body/konqi/footleft.png
new file mode 100644
index 0000000..76de3e9
Binary files /dev/null and b/data/body/konqi/footleft.png differ
diff --git a/data/body/konqi/footright.png b/data/body/konqi/footright.png
new file mode 100644
index 0000000..76de3e9
Binary files /dev/null and b/data/body/konqi/footright.png differ
diff --git a/data/body/konqi/hair.png b/data/body/konqi/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/konqi/hair.png differ
diff --git a/data/body/konqi/hat.png b/data/body/konqi/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/konqi/hat.png differ
diff --git a/data/body/konqi/head.png b/data/body/konqi/head.png
new file mode 100644
index 0000000..2ad1fb1
Binary files /dev/null and b/data/body/konqi/head.png differ
diff --git a/data/body/konqi/helmet.png b/data/body/konqi/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/konqi/helmet.png differ
diff --git a/data/body/konqiteam/hoop.png b/data/body/konqi/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/konqiteam/hoop.png
rename to data/body/konqi/hoop.png
diff --git a/data/body/konqi/hornleft.png b/data/body/konqi/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/konqi/hornleft.png differ
diff --git a/data/body/konqi/hornright.png b/data/body/konqi/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/konqi/hornright.png differ
diff --git a/data/body/konqiteam/hula.png b/data/body/konqi/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/konqiteam/hula.png
rename to data/body/konqi/hula.png
diff --git a/data/body/konqi/jetpack-fire.png b/data/body/konqi/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/konqi/jetpack-fire.png differ
diff --git a/data/body/konqi/jetpack.png b/data/body/konqi/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/konqi/jetpack.png differ
diff --git a/data/body/konqi/noze.png b/data/body/konqi/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/konqi/noze.png differ
diff --git a/data/body/konqi/pupil.png b/data/body/konqi/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/konqi/pupil.png differ
diff --git a/data/body/konqi/sick_head.png b/data/body/konqi/sick_head.png
new file mode 100644
index 0000000..1b6bdc7
Binary files /dev/null and b/data/body/konqi/sick_head.png differ
diff --git a/data/body/konqi/tail.png b/data/body/konqi/tail.png
new file mode 100644
index 0000000..511027b
Binary files /dev/null and b/data/body/konqi/tail.png differ
diff --git a/data/body/konqi/yoyo.png b/data/body/konqi/yoyo.png
new file mode 100755
index 0000000..6a22a92
Binary files /dev/null and b/data/body/konqi/yoyo.png differ
diff --git a/data/body/konqiteam/arm1.png b/data/body/konqiteam/arm1.png
deleted file mode 100644
index 26c9bd7..0000000
Binary files a/data/body/konqiteam/arm1.png and /dev/null differ
diff --git a/data/body/konqiteam/arm2.png b/data/body/konqiteam/arm2.png
deleted file mode 100644
index 7d877bb..0000000
Binary files a/data/body/konqiteam/arm2.png and /dev/null differ
diff --git a/data/body/konqiteam/black.png b/data/body/konqiteam/black.png
deleted file mode 100644
index 23ab110..0000000
Binary files a/data/body/konqiteam/black.png and /dev/null differ
diff --git a/data/body/konqiteam/body.png b/data/body/konqiteam/body.png
deleted file mode 100644
index da66a9b..0000000
Binary files a/data/body/konqiteam/body.png and /dev/null differ
diff --git a/data/body/konqiteam/c1.png b/data/body/konqiteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/konqiteam/c1.png and /dev/null differ
diff --git a/data/body/konqiteam/c2.png b/data/body/konqiteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/konqiteam/c2.png and /dev/null differ
diff --git a/data/body/konqiteam/config.xml b/data/body/konqiteam/config.xml
deleted file mode 100644
index 5b8d376..0000000
--- a/data/body/konqiteam/config.xml
+++ /dev/null
@@ -1,2100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body">
-	<image file="body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="27"/>
-	<attached member_type="head" frame="*" dx="9" dy="7"/>
-	<attached member_type="arm-right" frame="*" dx="3" dy="18"/>
-	<attached member_type="arm-left" frame="*" dx="8" dy="17"/>
-	<attached member_type="foot-left" frame="*" dx="10" dy="29"/>
-	<attached member_type="foot-right" frame="*" dx="5" dy="30"/>
-	<attached member_type="tail" frame="*" dx="2" dy="38"/>
-	<attached member_type="wing-right" frame="*" dx="2" dy="23"/>
-	<attached member_type="wing-left" frame="*" dx="5" dy="22"/>
-	<attached member_type="construct" frame="*" dx="7" dy="6"/>
-	<attached member_type="hula" frame="*" dx="14" dy="25"/>
-</sprite>
-
-<sprite name="tail" type="tail">
-	<image file="tail.png"/>
-	<anchor dx="12" dy="13"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="nose.png"/>
-	<anchor dx="-1" dy="0"/>
-	<attached member_type="horns" frame="*" dx="-2" dy="-4"/>
-	<attached member_type="eyes-normal" frame="*" dx="1" dy="-1"/>
-	<attached member_type="helmet" frame="*" dx="-1" dy="1"/>
-</sprite>
-
-<sprite name="horns" type="horns">
-	<image file="horns.png"/>
-	<anchor dx="3" dy="6"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-
-<!-- ###### Arms ###### -->
-<sprite name="arm-left" type="arm-left">
-	<image file="arm1.png"/>
-	<anchor dx="3" dy="0"/>
-</sprite>
-
-<sprite name="arm-right" type="arm-right">
-	<image file="arm1.png"/>
-	<anchor dx="3" dy="0"/>
-	<attached member_type="weapon" frame="*" dx="7" dy="7"/>
-
-</sprite>
-
-<sprite name="arm-left2" type="arm-left">
-	<image file="arm2.png"/>
-	<anchor dx="6" dy="0"/>
-	<attached member_type="yoyo" frame="*" dx="7" dy="19"/>
-</sprite>
-
-<sprite name="arm-right2" type="arm-right">
-	<image file="arm2.png"/>
-	<anchor dx="6" dy="0"/>
-	<attached member_type="weapon" frame="*" dx="7" dy="19"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left">
-	<image file="foot-left.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right">
-	<image file="foot-right.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<!-- ###### Wings ###### -->
-<sprite name="wing-right" type="wing-right">
-	<image file="wing.png"/>
-	<anchor dx="15" dy="10"/>
-</sprite>
-
-<sprite name="wing-left" type="wing-left">
-	<image file="wing.png"/>
-	<anchor dx="15" dy="10"/>
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet">
-	<image file="helmet.png"/>
-	<anchor dx="9" dy="13"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1"/>
-	</image>
-	<anchor dx="29" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body">
-	<image file="dead.png">
-		<grid pos="0,0" size="27,31" array="6,1"/>
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-
-<!-- ###### Black ###### -->
-<sprite name="body-black" type="body">
-	<image file="black.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="c2"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="c2"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- # Parachute # -->
-<clothe name="weapon-parachute">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left2"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right2"/>
-	<c_member name="weapon"/>
-</clothe>
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="helmet"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left2"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right2"/>
-	<c_member name="yoyo"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-right2"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-left2"/>
-	<c_member name="hoop"/>
-</clothe>
-
-<!-- ###### Animation Tired ###### -->
-<clothe name="animation1">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left2"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right2"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="body-black"/>
-</clothe>
-
-<!-- ###### Gun ###### -->
-<clothe name="weapon-gun">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left2"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### m16 ###### -->
-<clothe name="weapon-m16">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left2"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### shotgun ###### -->
-<clothe name="weapon-shotgun">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left2"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### snipe_rifle ###### -->
-<clothe name="weapon-snipe_rifle">
-	<c_member name="wing-left"/>
-	<c_member name="tail"/>
-	<c_member name="wing-right"/>
-	<c_member name="arm-left2"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="horns"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right2"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>	
-		<member type="tail" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>	
-		<member type="tail" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-20"/>
-		<member type="arm-right" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>	
-		<member type="tail" angle="-10"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-30"/>
-		<member type="arm-right" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="tail" angle="-10"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-40"/>
-		<member type="arm-right" angle="40"/>
-		<member type="foot-left" angle="40"/>
-		<member type="foot-right" angle="-40"/>
-		<member type="tail" angle="0"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-30"/>
-		<member type="arm-right" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="tail" angle="0"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-20"/>
-		<member type="arm-right" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>
-		<member type="tail" angle="10"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-		<member type="tail" angle="10"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>	
-		<member type="tail" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="tail" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="20"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="tail" angle="-10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="30"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="tail" angle="-10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="40"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="foot-left" angle="-40"/>
-		<member type="foot-right" angle="40"/>
-		<member type="tail" angle="0"/>		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="30"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="tail" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="20"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="tail" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="tail" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="false"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="false"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="-90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="-90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="0"/>
-	</frame>
-</movement>
-
-
-
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-left" angle="-100" />
-		<member type="arm-right" dx="-3" />
-		<member type="yoyo" angle="100" />
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-137"/>
-		<member type="arm-right" angle="-137"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-184"/>
-		<member type="arm-right" angle="-184"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-231"/>
-		<member type="arm-right" angle="-231"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-280"/>
-		<member type="arm-right" angle="-280"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-280"/>
-		<member type="arm-right" angle="-280"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-280"/>
-		<member type="arm-right" angle="-280"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-231"/>
-		<member type="arm-right" angle="-231"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-184"/>
-		<member type="arm-right" angle="-184"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-137"/>
-		<member type="arm-right" angle="-137"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-200"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-210"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-220"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-230"/>
-		<member type="arm-right" angle="-50"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-220"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-210"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-200"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-195"/>
-		<member type="arm-right" angle="-15"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-185"/>
-		<member type="arm-right" angle="-5"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-195"/>
-		<member type="arm-right" angle="-15"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-200"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-210"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-220"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-230"/>
-		<member type="arm-right" angle="-50"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-220"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-210"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-200"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-195"/>
-		<member type="arm-right" angle="-15"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-185"/>
-		<member type="arm-right" angle="-5"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-195"/>
-		<member type="arm-right" angle="-5"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-200"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-210"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-220"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-230"/>
-		<member type="arm-right" angle="-50"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-220"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-210"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-200"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-195"/>
-		<member type="arm-right" angle="-15"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-185"/>
-		<member type="arm-right" angle="-5"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-195"/>
-		<member type="arm-right" angle="-15"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="13"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="13"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-1" dy="13"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="13"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="13"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="13"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-1" dy="13"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-90"/>
-		<member type="arm-right" angle="-195"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="13"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wing-left" angle="20" />
-		<member type="wing-right" angle="20" />
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wing-left" angle="-10" />
-		<member type="wing-right" angle="-10" />
-		<member type="foot-left" angle="50" />
-		<member type="foot-right" angle="50" />
-	</frame>
-	<frame>
-		<member type="wing-left" angle="30" />
-		<member type="wing-right" angle="30" />
-		<member type="foot-left" angle="50" />
-		<member type="foot-right" angle="50" />
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-
-</resources>
diff --git a/data/body/konqiteam/dead.png b/data/body/konqiteam/dead.png
deleted file mode 100644
index abb930a..0000000
Binary files a/data/body/konqiteam/dead.png and /dev/null differ
diff --git a/data/body/konqiteam/eyelid.png b/data/body/konqiteam/eyelid.png
deleted file mode 100644
index 247b878..0000000
Binary files a/data/body/konqiteam/eyelid.png and /dev/null differ
diff --git a/data/body/konqiteam/eyes.png b/data/body/konqiteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/konqiteam/eyes.png and /dev/null differ
diff --git a/data/body/konqiteam/foot-left.png b/data/body/konqiteam/foot-left.png
deleted file mode 100644
index 8fe64a8..0000000
Binary files a/data/body/konqiteam/foot-left.png and /dev/null differ
diff --git a/data/body/konqiteam/foot-right.png b/data/body/konqiteam/foot-right.png
deleted file mode 100644
index c7edc44..0000000
Binary files a/data/body/konqiteam/foot-right.png and /dev/null differ
diff --git a/data/body/konqiteam/helmet.png b/data/body/konqiteam/helmet.png
deleted file mode 100644
index 741be99..0000000
Binary files a/data/body/konqiteam/helmet.png and /dev/null differ
diff --git a/data/body/konqiteam/horns.png b/data/body/konqiteam/horns.png
deleted file mode 100644
index b5b3e4a..0000000
Binary files a/data/body/konqiteam/horns.png and /dev/null differ
diff --git a/data/body/konqiteam/nose.png b/data/body/konqiteam/nose.png
deleted file mode 100644
index c383064..0000000
Binary files a/data/body/konqiteam/nose.png and /dev/null differ
diff --git a/data/body/konqiteam/pupil.png b/data/body/konqiteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/konqiteam/pupil.png and /dev/null differ
diff --git a/data/body/konqiteam/tail.png b/data/body/konqiteam/tail.png
deleted file mode 100644
index 7090847..0000000
Binary files a/data/body/konqiteam/tail.png and /dev/null differ
diff --git a/data/body/konqiteam/wing.png b/data/body/konqiteam/wing.png
deleted file mode 100644
index a969dd7..0000000
Binary files a/data/body/konqiteam/wing.png and /dev/null differ
diff --git a/data/body/konqiteam/yoyo.png b/data/body/konqiteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/konqiteam/yoyo.png and /dev/null differ
diff --git a/data/body/nupik/arm1left.png b/data/body/nupik/arm1left.png
new file mode 100644
index 0000000..31c5a81
Binary files /dev/null and b/data/body/nupik/arm1left.png differ
diff --git a/data/body/nupik/arm1right.png b/data/body/nupik/arm1right.png
new file mode 100644
index 0000000..31c5a81
Binary files /dev/null and b/data/body/nupik/arm1right.png differ
diff --git a/data/body/nupik/arm2left.png b/data/body/nupik/arm2left.png
new file mode 100644
index 0000000..fbfe58b
Binary files /dev/null and b/data/body/nupik/arm2left.png differ
diff --git a/data/body/nupik/arm2right.png b/data/body/nupik/arm2right.png
new file mode 100644
index 0000000..fbfe58b
Binary files /dev/null and b/data/body/nupik/arm2right.png differ
diff --git a/data/body/nupik/arm3left.png b/data/body/nupik/arm3left.png
new file mode 100644
index 0000000..93c04e2
Binary files /dev/null and b/data/body/nupik/arm3left.png differ
diff --git a/data/body/nupik/arm3right.png b/data/body/nupik/arm3right.png
new file mode 100644
index 0000000..93c04e2
Binary files /dev/null and b/data/body/nupik/arm3right.png differ
diff --git a/data/body/nupik/back.png b/data/body/nupik/back.png
new file mode 100644
index 0000000..67b1f34
Binary files /dev/null and b/data/body/nupik/back.png differ
diff --git a/data/body/nupik/belt.png b/data/body/nupik/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/nupik/belt.png differ
diff --git a/data/body/nupik/black_arm1left.png b/data/body/nupik/black_arm1left.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/nupik/black_arm1left.png differ
diff --git a/data/body/nupik/black_arm1right.png b/data/body/nupik/black_arm1right.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/nupik/black_arm1right.png differ
diff --git a/data/body/nupik/black_arm2left.png b/data/body/nupik/black_arm2left.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/nupik/black_arm2left.png differ
diff --git a/data/body/nupik/black_arm2right.png b/data/body/nupik/black_arm2right.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/nupik/black_arm2right.png differ
diff --git a/data/body/nupik/black_arm3left.png b/data/body/nupik/black_arm3left.png
new file mode 100644
index 0000000..444af50
Binary files /dev/null and b/data/body/nupik/black_arm3left.png differ
diff --git a/data/body/nupik/black_arm3right.png b/data/body/nupik/black_arm3right.png
new file mode 100644
index 0000000..444af50
Binary files /dev/null and b/data/body/nupik/black_arm3right.png differ
diff --git a/data/body/nupik/black_back.png b/data/body/nupik/black_back.png
new file mode 100644
index 0000000..980a842
Binary files /dev/null and b/data/body/nupik/black_back.png differ
diff --git a/data/body/nupik/black_body.png b/data/body/nupik/black_body.png
new file mode 100644
index 0000000..f65c7ab
Binary files /dev/null and b/data/body/nupik/black_body.png differ
diff --git a/data/body/nupik/black_eyelid.png b/data/body/nupik/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/nupik/black_eyelid.png differ
diff --git a/data/body/nupik/black_eyes.png b/data/body/nupik/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/nupik/black_eyes.png differ
diff --git a/data/body/nupik/black_footleft.png b/data/body/nupik/black_footleft.png
new file mode 100644
index 0000000..2bca5e4
Binary files /dev/null and b/data/body/nupik/black_footleft.png differ
diff --git a/data/body/nupik/black_footright.png b/data/body/nupik/black_footright.png
new file mode 100644
index 0000000..2bca5e4
Binary files /dev/null and b/data/body/nupik/black_footright.png differ
diff --git a/data/body/nupik/black_hair.png b/data/body/nupik/black_hair.png
new file mode 100644
index 0000000..57937d2
Binary files /dev/null and b/data/body/nupik/black_hair.png differ
diff --git a/data/body/nupik/black_head.png b/data/body/nupik/black_head.png
new file mode 100644
index 0000000..c26d902
Binary files /dev/null and b/data/body/nupik/black_head.png differ
diff --git a/data/body/nupik/black_hornleft.png b/data/body/nupik/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/nupik/black_hornleft.png differ
diff --git a/data/body/nupik/black_hornright.png b/data/body/nupik/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/nupik/black_hornright.png differ
diff --git a/data/body/nupik/black_noze.png b/data/body/nupik/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/nupik/black_noze.png differ
diff --git a/data/body/nupik/black_pupil.png b/data/body/nupik/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/nupik/black_pupil.png differ
diff --git a/data/body/nupik/black_tail.png b/data/body/nupik/black_tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/nupik/black_tail.png differ
diff --git a/data/body/nupik/body.png b/data/body/nupik/body.png
new file mode 100644
index 0000000..0a17b74
Binary files /dev/null and b/data/body/nupik/body.png differ
diff --git a/data/body/nupik/c1.png b/data/body/nupik/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/nupik/c1.png differ
diff --git a/data/body/nupik/c2.png b/data/body/nupik/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/nupik/c2.png differ
diff --git a/data/body/nupik/config.xml b/data/body/nupik/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/nupik/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/nupik/dead.png b/data/body/nupik/dead.png
new file mode 100644
index 0000000..5d97712
Binary files /dev/null and b/data/body/nupik/dead.png differ
diff --git a/data/body/nupik/eyelid.png b/data/body/nupik/eyelid.png
new file mode 100644
index 0000000..b4a7de7
Binary files /dev/null and b/data/body/nupik/eyelid.png differ
diff --git a/data/body/nupik/eyes.png b/data/body/nupik/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/nupik/eyes.png differ
diff --git a/data/body/nupik/footleft.png b/data/body/nupik/footleft.png
new file mode 100644
index 0000000..d3da324
Binary files /dev/null and b/data/body/nupik/footleft.png differ
diff --git a/data/body/nupik/footright.png b/data/body/nupik/footright.png
new file mode 100644
index 0000000..d3da324
Binary files /dev/null and b/data/body/nupik/footright.png differ
diff --git a/data/body/nupik/hair.png b/data/body/nupik/hair.png
new file mode 100644
index 0000000..ac7eb15
Binary files /dev/null and b/data/body/nupik/hair.png differ
diff --git a/data/body/nupik/hat.png b/data/body/nupik/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/nupik/hat.png differ
diff --git a/data/body/nupik/head.png b/data/body/nupik/head.png
new file mode 100644
index 0000000..84b3b30
Binary files /dev/null and b/data/body/nupik/head.png differ
diff --git a/data/body/nupik/helmet.png b/data/body/nupik/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/nupik/helmet.png differ
diff --git a/data/body/nupikteam/hoop.png b/data/body/nupik/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/nupikteam/hoop.png
rename to data/body/nupik/hoop.png
diff --git a/data/body/nupik/hornleft.png b/data/body/nupik/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/nupik/hornleft.png differ
diff --git a/data/body/nupik/hornright.png b/data/body/nupik/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/nupik/hornright.png differ
diff --git a/data/body/nupikteam/hula.png b/data/body/nupik/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/nupikteam/hula.png
rename to data/body/nupik/hula.png
diff --git a/data/body/nupik/jetpack-fire.png b/data/body/nupik/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/nupik/jetpack-fire.png differ
diff --git a/data/body/nupik/jetpack.png b/data/body/nupik/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/nupik/jetpack.png differ
diff --git a/data/body/nupik/noze.png b/data/body/nupik/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/nupik/noze.png differ
diff --git a/data/body/nupik/pupil.png b/data/body/nupik/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/nupik/pupil.png differ
diff --git a/data/body/nupik/sick_head.png b/data/body/nupik/sick_head.png
new file mode 100644
index 0000000..7efe254
Binary files /dev/null and b/data/body/nupik/sick_head.png differ
diff --git a/data/body/nupik/tail.png b/data/body/nupik/tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/nupik/tail.png differ
diff --git a/data/body/nupik/yoyo.png b/data/body/nupik/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/nupik/yoyo.png differ
diff --git a/data/body/nupikteam/arm.png b/data/body/nupikteam/arm.png
deleted file mode 100644
index ed33a38..0000000
Binary files a/data/body/nupikteam/arm.png and /dev/null differ
diff --git a/data/body/nupikteam/black.png b/data/body/nupikteam/black.png
deleted file mode 100644
index 8db4411..0000000
Binary files a/data/body/nupikteam/black.png and /dev/null differ
diff --git a/data/body/nupikteam/body.png b/data/body/nupikteam/body.png
deleted file mode 100644
index a778d21..0000000
Binary files a/data/body/nupikteam/body.png and /dev/null differ
diff --git a/data/body/nupikteam/c1.png b/data/body/nupikteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/nupikteam/c1.png and /dev/null differ
diff --git a/data/body/nupikteam/c2.png b/data/body/nupikteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/nupikteam/c2.png and /dev/null differ
diff --git a/data/body/nupikteam/config.xml b/data/body/nupikteam/config.xml
deleted file mode 100644
index 0df67d1..0000000
--- a/data/body/nupikteam/config.xml
+++ /dev/null
@@ -1,1974 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body" >
-	<image file="body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="12" dy="22"/>
-	<attached member_type="head" frame="*" dx="11" dy="6"/>
-	<attached member_type="arm-right"  frame="*" dx="7" dy="13"/>
-	<attached member_type="fixedarm"  frame="*" dx="7" dy="13"/>
-	<attached member_type="arm-left"  frame="*" dx="12" dy="12"/>
-	<attached member_type="foot-left"  frame="*" dx="9" dy="22"/>
-	<attached member_type="foot-right"  frame="*" dx="5" dy="24"/>
-	<attached member_type="spines1"  frame="*" dx="5" dy="21"/>
-	<attached member_type="spines2"  frame="*" dx="5" dy="34"/>
-	<attached member_type="jetpack"  frame="*" dx="0" dy="-6"/>
-	<attached member_type="construct" frame="*" dx="7" dy="2"/>
-	<attached member_type="hula" frame="*" dx="12" dy="20"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### spines ###### -->
-<sprite name="spines1" type="spines1" >
-	<image file="spines1.png"/>
-	<anchor dx="15" dy="36"/>
-</sprite>
-
-<sprite name="spines2" type="spines2" >
-	<image file="spines2.png"/>
-	<anchor dx="15" dy="36"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="head.png"/>
-	<anchor dx="8" dy="10"/>
-	<attached member_type="eyes-normal" frame="*" dx="8" dy="4"/>
-	<attached member_type="helmet" frame="*" dx="1" dy="-1"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Arms ###### -->
-<sprite name="arm-left" type="arm-left" >
-	<image file="arm.png"/>
-	<anchor dx="3" dy="2"/>
-</sprite>
-
-<sprite name="arm-right" type="arm-right" >
-	<image file="arm.png"/>
-	<anchor dx="3" dy="2"/>
-	<attached member_type="weapon" frame="*" dx="10" dy="11"/>
-	<attached member_type="yoyo" frame="*" dx="10" dy="5"/>
-</sprite>
-
-<sprite name="fixedarm" type="fixedarm" >
-	<image file="arm.png"/>
-	<anchor dx="3" dy="2"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left" >
-	<image file="foot.png"/>
-	<anchor dx="3" dy="1"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right" >
-	<image file="foot.png"/>
-	<anchor dx="3" dy="1"/>
-</sprite>
-
-<!-- ###### Jetpack ###### -->
-<sprite name="jetpack" type="jetpack" >
-	<image file="jetpack.png"/>
-	<anchor dx="0" dy="0"/>
-	<attached member_type="jetpack-heli"  frame="*" dx="-5" dy="-5"/>
-</sprite>
-
-<sprite name="jetpack-heli" type="jetpack-heli" >
-	<image file="jetpack-heli.png">
-		<grid pos="0,0" size="26,11" array="3,1"/>
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="150"/>
-
-</sprite>
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet" >
-	<image file="helmet.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1" />
-	</image>
-	<anchor dx="29" dy="25"/>
-	<animation speed="150" />
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body" >
-	<image file="dead.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Black ###### -->
-<sprite name="body-black" type="body" >
-	<image file="black.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="spines1"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack">
-	<c_member name="spines2"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="jetpack"/>
-	<c_member name="jetpack-heli"/>
-	<c_member name="fixedarm"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="spines2"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="jetpack"/>
-	<c_member name="foot-right"/>
-	<c_member name="jetpack-heli"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="spines1"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="helmet"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="spines1"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="spines1"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="hoop"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="body-black"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="spines2"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="spines2"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="-40" />
-		<member type="arm-right" angle="40" />
-		<member type="foot-left" angle="40" />
-		<member type="foot-right" angle="-40" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="40" />
-		<member type="arm-right" angle="-40" />
-		<member type="foot-left" angle="-40" />
-		<member type="foot-right" angle="40" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0" />
-	</frame>
-</movement>
-
-
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-right" angle="-50"/>
-		<member type="yoyo" angle="45" dx="5" dy="25" />
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body-normal" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="4" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="4" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="4" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="4" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="4" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="4" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="4" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="4" dy="12"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" follow_speed="true" />
-		<member type="fixedarm" angle="0" dx="0"  />
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-		<member type="jetpack-fire" dy="-5" /> <!-- hide the fire under the jetpack -->
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="jetpack-fire" dy="0" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="-1" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="-2" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="-5" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="-3" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="2"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="35" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="40" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-</resources>
diff --git a/data/body/nupikteam/dead.png b/data/body/nupikteam/dead.png
deleted file mode 100644
index e5700ba..0000000
Binary files a/data/body/nupikteam/dead.png and /dev/null differ
diff --git a/data/body/nupikteam/eyelid.png b/data/body/nupikteam/eyelid.png
deleted file mode 100644
index 788a4ee..0000000
Binary files a/data/body/nupikteam/eyelid.png and /dev/null differ
diff --git a/data/body/nupikteam/eyes.png b/data/body/nupikteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/nupikteam/eyes.png and /dev/null differ
diff --git a/data/body/nupikteam/fixedarm.png b/data/body/nupikteam/fixedarm.png
deleted file mode 100644
index ed33a38..0000000
Binary files a/data/body/nupikteam/fixedarm.png and /dev/null differ
diff --git a/data/body/nupikteam/foot.png b/data/body/nupikteam/foot.png
deleted file mode 100644
index a997a9a..0000000
Binary files a/data/body/nupikteam/foot.png and /dev/null differ
diff --git a/data/body/nupikteam/head.png b/data/body/nupikteam/head.png
deleted file mode 100644
index b895004..0000000
Binary files a/data/body/nupikteam/head.png and /dev/null differ
diff --git a/data/body/nupikteam/helmet.png b/data/body/nupikteam/helmet.png
deleted file mode 100644
index ae8507d..0000000
Binary files a/data/body/nupikteam/helmet.png and /dev/null differ
diff --git a/data/body/nupikteam/jetpack-heli.png b/data/body/nupikteam/jetpack-heli.png
deleted file mode 100644
index d501b4c..0000000
Binary files a/data/body/nupikteam/jetpack-heli.png and /dev/null differ
diff --git a/data/body/nupikteam/jetpack.png b/data/body/nupikteam/jetpack.png
deleted file mode 100644
index c6d18c1..0000000
Binary files a/data/body/nupikteam/jetpack.png and /dev/null differ
diff --git a/data/body/nupikteam/pupil.png b/data/body/nupikteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/nupikteam/pupil.png and /dev/null differ
diff --git a/data/body/nupikteam/spines1.png b/data/body/nupikteam/spines1.png
deleted file mode 100644
index f1304ee..0000000
Binary files a/data/body/nupikteam/spines1.png and /dev/null differ
diff --git a/data/body/nupikteam/spines2.png b/data/body/nupikteam/spines2.png
deleted file mode 100644
index 478d257..0000000
Binary files a/data/body/nupikteam/spines2.png and /dev/null differ
diff --git a/data/body/nupikteam/yoyo.png b/data/body/nupikteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/nupikteam/yoyo.png and /dev/null differ
diff --git a/data/body/ooo/arm1left.png b/data/body/ooo/arm1left.png
new file mode 100644
index 0000000..cad0bae
Binary files /dev/null and b/data/body/ooo/arm1left.png differ
diff --git a/data/body/ooo/arm1right.png b/data/body/ooo/arm1right.png
new file mode 100644
index 0000000..cad0bae
Binary files /dev/null and b/data/body/ooo/arm1right.png differ
diff --git a/data/body/ooo/arm2left.png b/data/body/ooo/arm2left.png
new file mode 100644
index 0000000..fe82f33
Binary files /dev/null and b/data/body/ooo/arm2left.png differ
diff --git a/data/body/ooo/arm2right.png b/data/body/ooo/arm2right.png
new file mode 100644
index 0000000..fe82f33
Binary files /dev/null and b/data/body/ooo/arm2right.png differ
diff --git a/data/body/ooo/arm3left.png b/data/body/ooo/arm3left.png
new file mode 100644
index 0000000..eae153e
Binary files /dev/null and b/data/body/ooo/arm3left.png differ
diff --git a/data/body/ooo/arm3right.png b/data/body/ooo/arm3right.png
new file mode 100644
index 0000000..eae153e
Binary files /dev/null and b/data/body/ooo/arm3right.png differ
diff --git a/data/body/ooo/back.png b/data/body/ooo/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/ooo/back.png differ
diff --git a/data/body/ooo/belt.png b/data/body/ooo/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/ooo/belt.png differ
diff --git a/data/body/ooo/black_arm1left.png b/data/body/ooo/black_arm1left.png
new file mode 100644
index 0000000..2bbbfc9
Binary files /dev/null and b/data/body/ooo/black_arm1left.png differ
diff --git a/data/body/ooo/black_arm1right.png b/data/body/ooo/black_arm1right.png
new file mode 100644
index 0000000..fed926f
Binary files /dev/null and b/data/body/ooo/black_arm1right.png differ
diff --git a/data/body/ooo/black_arm2left.png b/data/body/ooo/black_arm2left.png
new file mode 100644
index 0000000..b21eba3
Binary files /dev/null and b/data/body/ooo/black_arm2left.png differ
diff --git a/data/body/ooo/black_arm2right.png b/data/body/ooo/black_arm2right.png
new file mode 100644
index 0000000..648c842
Binary files /dev/null and b/data/body/ooo/black_arm2right.png differ
diff --git a/data/body/ooo/black_arm3left.png b/data/body/ooo/black_arm3left.png
new file mode 100644
index 0000000..ded7764
Binary files /dev/null and b/data/body/ooo/black_arm3left.png differ
diff --git a/data/body/ooo/black_arm3right.png b/data/body/ooo/black_arm3right.png
new file mode 100644
index 0000000..8dca094
Binary files /dev/null and b/data/body/ooo/black_arm3right.png differ
diff --git a/data/body/ooo/black_back.png b/data/body/ooo/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/ooo/black_back.png differ
diff --git a/data/body/ooo/black_body.png b/data/body/ooo/black_body.png
new file mode 100644
index 0000000..45bc6f9
Binary files /dev/null and b/data/body/ooo/black_body.png differ
diff --git a/data/body/ooo/black_eyelid.png b/data/body/ooo/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/ooo/black_eyelid.png differ
diff --git a/data/body/ooo/black_eyes.png b/data/body/ooo/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/ooo/black_eyes.png differ
diff --git a/data/body/ooo/black_footleft.png b/data/body/ooo/black_footleft.png
new file mode 100644
index 0000000..7505677
Binary files /dev/null and b/data/body/ooo/black_footleft.png differ
diff --git a/data/body/ooo/black_footright.png b/data/body/ooo/black_footright.png
new file mode 100644
index 0000000..7505677
Binary files /dev/null and b/data/body/ooo/black_footright.png differ
diff --git a/data/body/ooo/black_hair.png b/data/body/ooo/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/ooo/black_hair.png differ
diff --git a/data/body/ooo/black_head.png b/data/body/ooo/black_head.png
new file mode 100644
index 0000000..d023198
Binary files /dev/null and b/data/body/ooo/black_head.png differ
diff --git a/data/body/ooo/black_hornleft.png b/data/body/ooo/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/ooo/black_hornleft.png differ
diff --git a/data/body/ooo/black_hornright.png b/data/body/ooo/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/ooo/black_hornright.png differ
diff --git a/data/body/ooo/black_noze.png b/data/body/ooo/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/ooo/black_noze.png differ
diff --git a/data/body/ooo/black_pupil.png b/data/body/ooo/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/ooo/black_pupil.png differ
diff --git a/data/body/ooo/black_tail.png b/data/body/ooo/black_tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/ooo/black_tail.png differ
diff --git a/data/body/ooo/body.png b/data/body/ooo/body.png
new file mode 100644
index 0000000..1918ac6
Binary files /dev/null and b/data/body/ooo/body.png differ
diff --git a/data/body/ooo/c1.png b/data/body/ooo/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/ooo/c1.png differ
diff --git a/data/body/ooo/c2.png b/data/body/ooo/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/ooo/c2.png differ
diff --git a/data/body/ooo/config.xml b/data/body/ooo/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/ooo/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/ooo/dead.png b/data/body/ooo/dead.png
new file mode 100644
index 0000000..f768715
Binary files /dev/null and b/data/body/ooo/dead.png differ
diff --git a/data/body/ooo/eyelid.png b/data/body/ooo/eyelid.png
new file mode 100644
index 0000000..4762113
Binary files /dev/null and b/data/body/ooo/eyelid.png differ
diff --git a/data/body/ooo/eyes.png b/data/body/ooo/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/ooo/eyes.png differ
diff --git a/data/body/ooo/footleft.png b/data/body/ooo/footleft.png
new file mode 100644
index 0000000..54d1aab
Binary files /dev/null and b/data/body/ooo/footleft.png differ
diff --git a/data/body/ooo/footright.png b/data/body/ooo/footright.png
new file mode 100644
index 0000000..54d1aab
Binary files /dev/null and b/data/body/ooo/footright.png differ
diff --git a/data/body/ooo/hair.png b/data/body/ooo/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/ooo/hair.png differ
diff --git a/data/body/ooo/hat.png b/data/body/ooo/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/ooo/hat.png differ
diff --git a/data/body/ooo/head.png b/data/body/ooo/head.png
new file mode 100644
index 0000000..34dea65
Binary files /dev/null and b/data/body/ooo/head.png differ
diff --git a/data/body/ooo/helmet.png b/data/body/ooo/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/ooo/helmet.png differ
diff --git a/data/body/oooteam/hoop.png b/data/body/ooo/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/oooteam/hoop.png
rename to data/body/ooo/hoop.png
diff --git a/data/body/ooo/hornleft.png b/data/body/ooo/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/ooo/hornleft.png differ
diff --git a/data/body/ooo/hornright.png b/data/body/ooo/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/ooo/hornright.png differ
diff --git a/data/body/oooteam/hula.png b/data/body/ooo/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/oooteam/hula.png
rename to data/body/ooo/hula.png
diff --git a/data/body/ooo/jetpack-fire.png b/data/body/ooo/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/ooo/jetpack-fire.png differ
diff --git a/data/body/ooo/jetpack.png b/data/body/ooo/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/ooo/jetpack.png differ
diff --git a/data/body/ooo/noze.png b/data/body/ooo/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/ooo/noze.png differ
diff --git a/data/body/ooo/pupil.png b/data/body/ooo/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/ooo/pupil.png differ
diff --git a/data/body/ooo/sick_head.png b/data/body/ooo/sick_head.png
new file mode 100644
index 0000000..94193f5
Binary files /dev/null and b/data/body/ooo/sick_head.png differ
diff --git a/data/body/ooo/tail.png b/data/body/ooo/tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/ooo/tail.png differ
diff --git a/data/body/ooo/yoyo.png b/data/body/ooo/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/ooo/yoyo.png differ
diff --git a/data/body/oooteam/black.png b/data/body/oooteam/black.png
deleted file mode 100644
index 253310e..0000000
Binary files a/data/body/oooteam/black.png and /dev/null differ
diff --git a/data/body/oooteam/body.png b/data/body/oooteam/body.png
deleted file mode 100644
index 9cfd13f..0000000
Binary files a/data/body/oooteam/body.png and /dev/null differ
diff --git a/data/body/oooteam/c1.png b/data/body/oooteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/oooteam/c1.png and /dev/null differ
diff --git a/data/body/oooteam/c2.png b/data/body/oooteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/oooteam/c2.png and /dev/null differ
diff --git a/data/body/oooteam/config.xml b/data/body/oooteam/config.xml
deleted file mode 100644
index aa5013d..0000000
--- a/data/body/oooteam/config.xml
+++ /dev/null
@@ -1,1941 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body">
-	<image file="body.png"/>
-	<anchor dx="9" dy="20"/>
-	<attached member_type="hoop" frame="*" dx="12" dy="27"/>
-	<attached member_type="head" frame="*" dx="11" dy="9"/>
-	<attached member_type="wingright" frame="*" dx="5" dy="15"/>
-	<attached member_type="wingleft" frame="*" dx="12" dy="15"/>
-	<attached member_type="foot-left" frame="*" dx="12" dy="38"/>
-	<attached member_type="foot-right" frame="*" dx="7" dy="39"/>
-	<attached member_type="construct" frame="*" dx="7" dy="8"/>
-	<attached member_type="hula" frame="*" dx="12" dy="25"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="nozzle.png"/>
-	<anchor dx="-1" dy="0"/>
-	<attached member_type="eyes-normal" frame="*" dx="0" dy="-3"/>
-	<attached member_type="helmet" frame="*" dx="2" dy="3"/>
-</sprite>
-
-<sprite name="nozzle" type="nozzle">
-	<image file="nozzle.png"/>
-	<anchor dx="3" dy="2"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Wings ###### -->
-<sprite name="wingleft" type="wingleft">
-	<image file="wingleft.png"/>
-	<anchor dx="2" dy="4"/>
-</sprite>
-<sprite name="wingright" type="wingright">
-	<image file="wingright.png"/>
-	<anchor dx="9" dy="4"/>
-	<attached member_type="weapon" frame="*" dx="2" dy="22"/>
-	<attached member_type="yoyo" frame="*" dx="13" dy="25"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="1"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="1"/>
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet" >
-	<image file="helmet.png"/>
-	<anchor dx="9" dy="13"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1"/>
-	</image>
-	<anchor dx="29" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body">
-	<image file="dead.png" />
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-<!-- ###### Black ###### -->
-<sprite name="body-black" type="body">
-	<image file="black.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-</clothe>
-
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="helmet"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="hoop"/>
-	<c_member name="wingright"/>
-</clothe>
-
-<!-- ###### Animation Tired ###### -->
-<clothe name="animation1">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="body-black"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" />
-		<member type="wingright" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-1" dy="1" />
-		<member type="wingright" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-2" dy="1" />
-		<member type="wingright" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-2" dy="0" />
-		<member type="wingright" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-2" dy="0" />
-		<member type="wingright" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-1" dy="1" />
-		<member type="wingright" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-10"/>
-		<member type="wingright" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-20"/>
-		<member type="wingright" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-30"/>
-		<member type="wingright" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-40"/>
-		<member type="wingright" angle="40"/>
-		<member type="foot-left" angle="40"/>
-		<member type="foot-right" angle="-40"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-30"/>
-		<member type="wingright" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-20"/>
-		<member type="wingright" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-10"/>
-		<member type="wingright" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="20"/>
-		<member type="wingright" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="30"/>
-		<member type="wingright" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="40"/>
-		<member type="wingright" angle="-40"/>
-		<member type="foot-left" angle="-40"/>
-		<member type="foot-right" angle="40"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="30"/>
-		<member type="wingright" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="20"/>
-		<member type="wingright" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="wingleft" angle="90" follow_speed="false"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="wingright" angle="90" follow_speed="false"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="wingleft" angle="-90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="wingright" angle="-90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="wingleft" angle="5"/>
-		<member type="wingright" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="wingleft" angle="15"/>
-		<member type="wingright" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="wingleft" angle="5"/>
-		<member type="wingright" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="45"/>
-		<member type="wingright" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="-45"/>
-		<member type="wingright" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="45"/>
-		<member type="wingright" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="-45"/>
-		<member type="wingright" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0" />
-	</frame>
-</movement>
-
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wingright" angle="-90"/>
-		<member type="yoyo" angle="90"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="wingleft" angle="-47"/>
-		<member type="wingright" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="wingleft" angle="-94"/>
-		<member type="wingright" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="wingleft" angle="-141"/>
-		<member type="wingright" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="wingleft" angle="-190"/>
-		<member type="wingright" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="wingleft" angle="-190"/>
-		<member type="wingright" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="wingleft" angle="-190"/>
-		<member type="wingright" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="wingleft" angle="-141"/>
-		<member type="wingright" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="wingleft" angle="-94"/>
-		<member type="wingright" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="wingleft" angle="-47"/>
-		<member type="wingright" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-140"/>
-		<member type="wingright" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-95"/>
-		<member type="wingright" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-140"/>
-		<member type="wingright" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-95"/>
-		<member type="wingright" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-140"/>
-		<member type="wingright" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-95"/>
-		<member type="wingright" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="wingleft" angle="-10"/>
-		<member type="wingright" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="180" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-9" dy="5"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="175" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-9" dy="5"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="170" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-9" dy="5"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="175" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-9" dy="5"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="180" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-9" dy="5"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="185" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-9" dy="5"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="190" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-9" dy="5"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="185" dx="-8"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-9" dy="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wingleft" angle="20" />
-		<member type="wingright" angle="20" />
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="150"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wingleft" angle="150" />
-		<member type="wingright" angle="150" />
-		<member type="foot-left" angle="50" />
-		<member type="foot-right" angle="50" />
-	</frame>
-	<frame>
-		<member type="wingleft" angle="20" />
-		<member type="wingright" angle="20" />
-		<member type="foot-left" angle="50" />
-		<member type="foot-right" angle="50" />
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="wingright" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="wingright" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="wingright" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="wingright" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="wingright" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="wingright" angle="40"/>
-		<member type="wingleft" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="wingright" angle="80"/>
-		<member type="wingleft" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="120"/>
-		<member type="wingleft" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="wingright" angle="120"/>
-		<member type="wingleft" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="wingright" angle="120"/>
-		<member type="wingleft" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="wingright" angle="110"/>
-		<member type="wingleft" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="wingright" angle="90"/>
-		<member type="wingleft" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="60"/>
-		<member type="wingleft" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="wingright" angle="30"/>
-		<member type="wingleft" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="wingright" angle="20"/>
-		<member type="wingleft" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="wingright" angle="10"/>
-		<member type="wingleft" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-3" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-3" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-3" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-4" dx="1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-4" dx="1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-4" dx="1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-5" dx="1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-5" dx="1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-5" dx="1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-</movement>
-
-
-</resources>
diff --git a/data/body/oooteam/dead.png b/data/body/oooteam/dead.png
deleted file mode 100644
index 055097b..0000000
Binary files a/data/body/oooteam/dead.png and /dev/null differ
diff --git a/data/body/oooteam/eyelid.png b/data/body/oooteam/eyelid.png
deleted file mode 100644
index e1a0d12..0000000
Binary files a/data/body/oooteam/eyelid.png and /dev/null differ
diff --git a/data/body/oooteam/eyes.png b/data/body/oooteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/oooteam/eyes.png and /dev/null differ
diff --git a/data/body/oooteam/foot.png b/data/body/oooteam/foot.png
deleted file mode 100644
index 0618eb6..0000000
Binary files a/data/body/oooteam/foot.png and /dev/null differ
diff --git a/data/body/oooteam/helmet.png b/data/body/oooteam/helmet.png
deleted file mode 100644
index 2063daf..0000000
Binary files a/data/body/oooteam/helmet.png and /dev/null differ
diff --git a/data/body/oooteam/nozzle.png b/data/body/oooteam/nozzle.png
deleted file mode 100644
index 1c26002..0000000
Binary files a/data/body/oooteam/nozzle.png and /dev/null differ
diff --git a/data/body/oooteam/pupil.png b/data/body/oooteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/oooteam/pupil.png and /dev/null differ
diff --git a/data/body/oooteam/wingleft.png b/data/body/oooteam/wingleft.png
deleted file mode 100644
index 6b318bb..0000000
Binary files a/data/body/oooteam/wingleft.png and /dev/null differ
diff --git a/data/body/oooteam/wingright.png b/data/body/oooteam/wingright.png
deleted file mode 100644
index 85595a8..0000000
Binary files a/data/body/oooteam/wingright.png and /dev/null differ
diff --git a/data/body/oooteam/yoyo.png b/data/body/oooteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/oooteam/yoyo.png and /dev/null differ
diff --git a/data/body/php/arm1left.png b/data/body/php/arm1left.png
new file mode 100644
index 0000000..abead3a
Binary files /dev/null and b/data/body/php/arm1left.png differ
diff --git a/data/body/php/arm1right.png b/data/body/php/arm1right.png
new file mode 100644
index 0000000..abead3a
Binary files /dev/null and b/data/body/php/arm1right.png differ
diff --git a/data/body/php/arm2left.png b/data/body/php/arm2left.png
new file mode 100644
index 0000000..7d59c5e
Binary files /dev/null and b/data/body/php/arm2left.png differ
diff --git a/data/body/php/arm2right.png b/data/body/php/arm2right.png
new file mode 100644
index 0000000..7d59c5e
Binary files /dev/null and b/data/body/php/arm2right.png differ
diff --git a/data/body/php/arm3left.png b/data/body/php/arm3left.png
new file mode 100644
index 0000000..656f1ae
Binary files /dev/null and b/data/body/php/arm3left.png differ
diff --git a/data/body/php/arm3right.png b/data/body/php/arm3right.png
new file mode 100644
index 0000000..656f1ae
Binary files /dev/null and b/data/body/php/arm3right.png differ
diff --git a/data/body/php/back.png b/data/body/php/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/php/back.png differ
diff --git a/data/body/php/belt.png b/data/body/php/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/php/belt.png differ
diff --git a/data/body/php/black_arm1left.png b/data/body/php/black_arm1left.png
new file mode 100644
index 0000000..5866534
Binary files /dev/null and b/data/body/php/black_arm1left.png differ
diff --git a/data/body/php/black_arm1right.png b/data/body/php/black_arm1right.png
new file mode 100644
index 0000000..5866534
Binary files /dev/null and b/data/body/php/black_arm1right.png differ
diff --git a/data/body/php/black_arm2left.png b/data/body/php/black_arm2left.png
new file mode 100644
index 0000000..163377d
Binary files /dev/null and b/data/body/php/black_arm2left.png differ
diff --git a/data/body/php/black_arm2right.png b/data/body/php/black_arm2right.png
new file mode 100644
index 0000000..163377d
Binary files /dev/null and b/data/body/php/black_arm2right.png differ
diff --git a/data/body/php/black_arm3left.png b/data/body/php/black_arm3left.png
new file mode 100644
index 0000000..c060398
Binary files /dev/null and b/data/body/php/black_arm3left.png differ
diff --git a/data/body/php/black_arm3right.png b/data/body/php/black_arm3right.png
new file mode 100644
index 0000000..c060398
Binary files /dev/null and b/data/body/php/black_arm3right.png differ
diff --git a/data/body/php/black_back.png b/data/body/php/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/php/black_back.png differ
diff --git a/data/body/php/black_body.png b/data/body/php/black_body.png
new file mode 100644
index 0000000..f65c7ab
Binary files /dev/null and b/data/body/php/black_body.png differ
diff --git a/data/body/php/black_eyelid.png b/data/body/php/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/php/black_eyelid.png differ
diff --git a/data/body/php/black_eyes.png b/data/body/php/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/php/black_eyes.png differ
diff --git a/data/body/php/black_footleft.png b/data/body/php/black_footleft.png
new file mode 100644
index 0000000..698e6aa
Binary files /dev/null and b/data/body/php/black_footleft.png differ
diff --git a/data/body/php/black_footright.png b/data/body/php/black_footright.png
new file mode 100644
index 0000000..698e6aa
Binary files /dev/null and b/data/body/php/black_footright.png differ
diff --git a/data/body/php/black_hair.png b/data/body/php/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/php/black_hair.png differ
diff --git a/data/body/php/black_head.png b/data/body/php/black_head.png
new file mode 100644
index 0000000..466f1bd
Binary files /dev/null and b/data/body/php/black_head.png differ
diff --git a/data/body/php/black_hornleft.png b/data/body/php/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/php/black_hornleft.png differ
diff --git a/data/body/php/black_hornright.png b/data/body/php/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/php/black_hornright.png differ
diff --git a/data/body/php/black_noze.png b/data/body/php/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/php/black_noze.png differ
diff --git a/data/body/php/black_pupil.png b/data/body/php/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/php/black_pupil.png differ
diff --git a/data/body/php/black_tail.png b/data/body/php/black_tail.png
new file mode 100644
index 0000000..3535c57
Binary files /dev/null and b/data/body/php/black_tail.png differ
diff --git a/data/body/php/body.png b/data/body/php/body.png
new file mode 100644
index 0000000..c06af79
Binary files /dev/null and b/data/body/php/body.png differ
diff --git a/data/body/php/c1.png b/data/body/php/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/php/c1.png differ
diff --git a/data/body/php/c2.png b/data/body/php/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/php/c2.png differ
diff --git a/data/body/php/config.xml b/data/body/php/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/php/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/php/dead.png b/data/body/php/dead.png
new file mode 100644
index 0000000..2bf326b
Binary files /dev/null and b/data/body/php/dead.png differ
diff --git a/data/body/php/eyelid.png b/data/body/php/eyelid.png
new file mode 100644
index 0000000..bc831eb
Binary files /dev/null and b/data/body/php/eyelid.png differ
diff --git a/data/body/php/eyes.png b/data/body/php/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/php/eyes.png differ
diff --git a/data/body/php/footleft.png b/data/body/php/footleft.png
new file mode 100644
index 0000000..68bbc14
Binary files /dev/null and b/data/body/php/footleft.png differ
diff --git a/data/body/php/footright.png b/data/body/php/footright.png
new file mode 100644
index 0000000..68bbc14
Binary files /dev/null and b/data/body/php/footright.png differ
diff --git a/data/body/php/hair.png b/data/body/php/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/php/hair.png differ
diff --git a/data/body/php/hat.png b/data/body/php/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/php/hat.png differ
diff --git a/data/body/php/head.png b/data/body/php/head.png
new file mode 100644
index 0000000..669236f
Binary files /dev/null and b/data/body/php/head.png differ
diff --git a/data/body/php/helmet.png b/data/body/php/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/php/helmet.png differ
diff --git a/data/body/phpteam/hoop.png b/data/body/php/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/phpteam/hoop.png
rename to data/body/php/hoop.png
diff --git a/data/body/php/hornleft.png b/data/body/php/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/php/hornleft.png differ
diff --git a/data/body/php/hornright.png b/data/body/php/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/php/hornright.png differ
diff --git a/data/body/phpteam/hula.png b/data/body/php/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/phpteam/hula.png
rename to data/body/php/hula.png
diff --git a/data/body/php/jetpack-fire.png b/data/body/php/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/php/jetpack-fire.png differ
diff --git a/data/body/php/jetpack.png b/data/body/php/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/php/jetpack.png differ
diff --git a/data/body/php/noze.png b/data/body/php/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/php/noze.png differ
diff --git a/data/body/php/pupil.png b/data/body/php/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/php/pupil.png differ
diff --git a/data/body/php/sick_head.png b/data/body/php/sick_head.png
new file mode 100644
index 0000000..3825f9c
Binary files /dev/null and b/data/body/php/sick_head.png differ
diff --git a/data/body/php/tail.png b/data/body/php/tail.png
new file mode 100644
index 0000000..ed877ab
Binary files /dev/null and b/data/body/php/tail.png differ
diff --git a/data/body/php/yoyo.png b/data/body/php/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/php/yoyo.png differ
diff --git a/data/body/phpteam/arm.png b/data/body/phpteam/arm.png
deleted file mode 100644
index 842e373..0000000
Binary files a/data/body/phpteam/arm.png and /dev/null differ
diff --git a/data/body/phpteam/black.png b/data/body/phpteam/black.png
deleted file mode 100644
index 1d91f28..0000000
Binary files a/data/body/phpteam/black.png and /dev/null differ
diff --git a/data/body/phpteam/body.png b/data/body/phpteam/body.png
deleted file mode 100644
index 608ca35..0000000
Binary files a/data/body/phpteam/body.png and /dev/null differ
diff --git a/data/body/phpteam/c1.png b/data/body/phpteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/phpteam/c1.png and /dev/null differ
diff --git a/data/body/phpteam/c2.png b/data/body/phpteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/phpteam/c2.png and /dev/null differ
diff --git a/data/body/phpteam/config.xml b/data/body/phpteam/config.xml
deleted file mode 100644
index 143d7e5..0000000
--- a/data/body/phpteam/config.xml
+++ /dev/null
@@ -1,2047 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body">
-	<image file="body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="12" dy="27"/>
-	<attached member_type="head" frame="*" dx="8" dy="12"/>
-	<attached member_type="arm-right" frame="*" dx="5" dy="21"/>
-	<attached member_type="arm-left" frame="*" dx="6" dy="20"/>
-	<attached member_type="foot-left" frame="*" dx="15" dy="34"/>
-	<attached member_type="foot-right" frame="*" dx="8" dy="35"/>
-	<attached member_type="jetpack-belt" frame="*" dx="1" dy="21"/>
-	<attached member_type="jetpack-right" frame="*" dx="1" dy="23"/>
-	<attached member_type="jetpack-left" frame="*" dx="9" dy="23"/>
-	<attached member_type="tail" frame="*" dx="2" dy="28"/>
-	<attached member_type="construct" frame="*" dx="8" dy="7"/>
-	<attached member_type="hula" frame="*" dx="12" dy="25"/>
-</sprite>
-
-<!-- ###### Tail ###### -->
-<sprite name="tail" type="tail">
-	<image file="tail.png"/>
-	<anchor dx="8" dy="6"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="nose.png"/>
-	<anchor dx="-1" dy="3"/>
-	<attached member_type="ear-left" frame="*" dx="4" dy="-8"/>
-	<attached member_type="ear-right" frame="*" dx="-6" dy="-7"/>
-	<attached member_type="eyes-normal" frame="*" dx="2" dy="-2"/>
-	<attached member_type="helmet" frame="*" dx="-3" dy="0"/>
-</sprite>
-
-<!-- ###### Ears ###### -->
-<sprite name="ear-left" type="ear-left">
-	<image file="ear-left.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-
-<sprite name="ear-right" type="ear-right">
-	<image file="ear-right.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Arms ###### -->
-<sprite name="arm-left" type="arm-left">
-	<image file="arm.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-
-<sprite name="arm-right" type="arm-right">
-	<image file="arm.png"/>
-	<anchor dx="5" dy="3"/>
-	<attached member_type="weapon" frame="*" dx="3" dy="16"/>
-	<attached member_type="yoyo" frame="*" dx="5" dy="10"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left">
-	<image file="foot-left.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right">
-	<image file="foot-right.png"/>
-	<anchor dx="5" dy="3"/>
-</sprite>
-
-<!-- ###### Jetpack ###### -->
-<sprite name="jetpack-belt" type="jetpack-belt">
-	<image file="jetpack-belt.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-right" type="jetpack-right">
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-right" frame="*" dx="3" dy="13"/>
-</sprite>
-
-<sprite name="jetpack-left" type="jetpack-left">
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-left" frame="*" dx="3" dy="13"/>
-</sprite>
-
-<sprite name="jetpack-fire-right" type="jetpack-fire-right">
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-fire-left" type="jetpack-fire-left">
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet">
-	<image file="helmet.png"/>
-	<anchor dx="9" dy="13"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1"/>
-	</image>
-	<anchor dx="29" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body">
-	<image file="dead.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Black ###### -->
-<sprite name="body-black" type="body">
-	<image file="black.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="ear-right"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="jetpack-right"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="ear-right"/>
-	<c_member name="foot-right"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="jetpack-fire-left"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="jetpack-fire-right"/>
-	<c_member name="jetpack-right"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="ear-right"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right" layer="13"/>
-</clothe>
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="ear-right"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="helmet"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="ear-right"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="ear-right"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="hoop"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="body-black"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="ear-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="ear-right"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />			
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20"/>
-		<member type="arm-right" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>	
-		<member type="tail" angle="-10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30"/>
-		<member type="arm-right" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="tail" angle="-10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40"/>
-		<member type="arm-right" angle="40"/>
-		<member type="foot-left" angle="40"/>
-		<member type="foot-right" angle="-40"/>
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30"/>
-		<member type="arm-right" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20"/>
-		<member type="arm-right" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>
-		<member type="tail" angle="10" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-		<member type="tail" angle="10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-		<member type="tail" angle="-10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-		<member type="tail" angle="-10" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="40"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="foot-left" angle="-40"/>
-		<member type="foot-right" angle="40"/>	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="tail" angle="10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="tail" angle="10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Black ###### -->
-<movement name="black" speed="1000">
-        <collision_rect left="5" right="5" top="10" bottom="2" />
-        <frame>
-                <member type="body" angle="0" />
-        </frame>
-</movement>
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-right" angle="-90"/>
-		<member type="yoyo" angle="90"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-3" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-3" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-3" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-3" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-3" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-3" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-3" dy="12"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-3" dy="12"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-		<member type="jetpack-fire" dy="-5"/> <!-- hide the fire under the jetpack -->
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire-right" dy="7"/>
-		<member type="jetpack-fire-left" dy="7"/>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire-right" dy="7"/>
-		<member type="jetpack-fire-left" dy="7"/>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="arm-left" follow_speed="true"/>
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="40" dy="-1" dx="1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="50" dy="-1" dx="1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="1"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="70" dy="-2" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-
-</resources>
diff --git a/data/body/phpteam/dead.png b/data/body/phpteam/dead.png
deleted file mode 100644
index 238fcc9..0000000
Binary files a/data/body/phpteam/dead.png and /dev/null differ
diff --git a/data/body/phpteam/ear-left.png b/data/body/phpteam/ear-left.png
deleted file mode 100644
index 3a0d962..0000000
Binary files a/data/body/phpteam/ear-left.png and /dev/null differ
diff --git a/data/body/phpteam/ear-right.png b/data/body/phpteam/ear-right.png
deleted file mode 100644
index d0b8150..0000000
Binary files a/data/body/phpteam/ear-right.png and /dev/null differ
diff --git a/data/body/phpteam/eyelid.png b/data/body/phpteam/eyelid.png
deleted file mode 100644
index f335d4b..0000000
Binary files a/data/body/phpteam/eyelid.png and /dev/null differ
diff --git a/data/body/phpteam/eyes.png b/data/body/phpteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/phpteam/eyes.png and /dev/null differ
diff --git a/data/body/phpteam/foot-left.png b/data/body/phpteam/foot-left.png
deleted file mode 100644
index 73baa9a..0000000
Binary files a/data/body/phpteam/foot-left.png and /dev/null differ
diff --git a/data/body/phpteam/foot-right.png b/data/body/phpteam/foot-right.png
deleted file mode 100644
index 7ec98a6..0000000
Binary files a/data/body/phpteam/foot-right.png and /dev/null differ
diff --git a/data/body/phpteam/helmet.png b/data/body/phpteam/helmet.png
deleted file mode 100644
index d4d550c..0000000
Binary files a/data/body/phpteam/helmet.png and /dev/null differ
diff --git a/data/body/phpteam/jetpack-belt.png b/data/body/phpteam/jetpack-belt.png
deleted file mode 100644
index 9d28936..0000000
Binary files a/data/body/phpteam/jetpack-belt.png and /dev/null differ
diff --git a/data/body/phpteam/jetpack-fire.png b/data/body/phpteam/jetpack-fire.png
deleted file mode 100644
index c24e41d..0000000
Binary files a/data/body/phpteam/jetpack-fire.png and /dev/null differ
diff --git a/data/body/phpteam/jetpack.png b/data/body/phpteam/jetpack.png
deleted file mode 100644
index 4a5a90e..0000000
Binary files a/data/body/phpteam/jetpack.png and /dev/null differ
diff --git a/data/body/phpteam/nose.png b/data/body/phpteam/nose.png
deleted file mode 100644
index f148760..0000000
Binary files a/data/body/phpteam/nose.png and /dev/null differ
diff --git a/data/body/phpteam/pupil.png b/data/body/phpteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/phpteam/pupil.png and /dev/null differ
diff --git a/data/body/phpteam/tail.png b/data/body/phpteam/tail.png
deleted file mode 100644
index d8d1cc6..0000000
Binary files a/data/body/phpteam/tail.png and /dev/null differ
diff --git a/data/body/phpteam/yoyo.png b/data/body/phpteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/phpteam/yoyo.png and /dev/null differ
diff --git a/data/body/pidgin/arm1left.png b/data/body/pidgin/arm1left.png
new file mode 100644
index 0000000..cc81f26
Binary files /dev/null and b/data/body/pidgin/arm1left.png differ
diff --git a/data/body/pidgin/arm1right.png b/data/body/pidgin/arm1right.png
new file mode 100644
index 0000000..cc81f26
Binary files /dev/null and b/data/body/pidgin/arm1right.png differ
diff --git a/data/body/pidgin/arm2left.png b/data/body/pidgin/arm2left.png
new file mode 100644
index 0000000..0158beb
Binary files /dev/null and b/data/body/pidgin/arm2left.png differ
diff --git a/data/body/pidgin/arm2right.png b/data/body/pidgin/arm2right.png
new file mode 100644
index 0000000..0158beb
Binary files /dev/null and b/data/body/pidgin/arm2right.png differ
diff --git a/data/body/pidgin/arm3left.png b/data/body/pidgin/arm3left.png
new file mode 100644
index 0000000..789e544
Binary files /dev/null and b/data/body/pidgin/arm3left.png differ
diff --git a/data/body/pidgin/arm3right.png b/data/body/pidgin/arm3right.png
new file mode 100644
index 0000000..789e544
Binary files /dev/null and b/data/body/pidgin/arm3right.png differ
diff --git a/data/body/pidgin/back.png b/data/body/pidgin/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/pidgin/back.png differ
diff --git a/data/body/pidgin/belt.png b/data/body/pidgin/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/pidgin/belt.png differ
diff --git a/data/body/pidgin/black_arm1left.png b/data/body/pidgin/black_arm1left.png
new file mode 100644
index 0000000..51cdee8
Binary files /dev/null and b/data/body/pidgin/black_arm1left.png differ
diff --git a/data/body/pidgin/black_arm1right.png b/data/body/pidgin/black_arm1right.png
new file mode 100644
index 0000000..51cdee8
Binary files /dev/null and b/data/body/pidgin/black_arm1right.png differ
diff --git a/data/body/pidgin/black_arm2left.png b/data/body/pidgin/black_arm2left.png
new file mode 100644
index 0000000..7511d59
Binary files /dev/null and b/data/body/pidgin/black_arm2left.png differ
diff --git a/data/body/pidgin/black_arm2right.png b/data/body/pidgin/black_arm2right.png
new file mode 100644
index 0000000..7511d59
Binary files /dev/null and b/data/body/pidgin/black_arm2right.png differ
diff --git a/data/body/pidgin/black_arm3left.png b/data/body/pidgin/black_arm3left.png
new file mode 100644
index 0000000..1a0a2f6
Binary files /dev/null and b/data/body/pidgin/black_arm3left.png differ
diff --git a/data/body/pidgin/black_arm3right.png b/data/body/pidgin/black_arm3right.png
new file mode 100644
index 0000000..1a0a2f6
Binary files /dev/null and b/data/body/pidgin/black_arm3right.png differ
diff --git a/data/body/pidgin/black_back.png b/data/body/pidgin/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/pidgin/black_back.png differ
diff --git a/data/body/pidgin/black_body.png b/data/body/pidgin/black_body.png
new file mode 100644
index 0000000..ab92962
Binary files /dev/null and b/data/body/pidgin/black_body.png differ
diff --git a/data/body/pidgin/black_eyelid.png b/data/body/pidgin/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/pidgin/black_eyelid.png differ
diff --git a/data/body/pidgin/black_eyes.png b/data/body/pidgin/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/pidgin/black_eyes.png differ
diff --git a/data/body/pidgin/black_footleft.png b/data/body/pidgin/black_footleft.png
new file mode 100644
index 0000000..61214b1
Binary files /dev/null and b/data/body/pidgin/black_footleft.png differ
diff --git a/data/body/pidgin/black_footright.png b/data/body/pidgin/black_footright.png
new file mode 100644
index 0000000..61214b1
Binary files /dev/null and b/data/body/pidgin/black_footright.png differ
diff --git a/data/body/pidgin/black_hair.png b/data/body/pidgin/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/pidgin/black_hair.png differ
diff --git a/data/body/pidgin/black_head.png b/data/body/pidgin/black_head.png
new file mode 100644
index 0000000..a280c34
Binary files /dev/null and b/data/body/pidgin/black_head.png differ
diff --git a/data/body/pidgin/black_hornleft.png b/data/body/pidgin/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/pidgin/black_hornleft.png differ
diff --git a/data/body/pidgin/black_hornright.png b/data/body/pidgin/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/pidgin/black_hornright.png differ
diff --git a/data/body/pidgin/black_noze.png b/data/body/pidgin/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/pidgin/black_noze.png differ
diff --git a/data/body/pidgin/black_pupil.png b/data/body/pidgin/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/pidgin/black_pupil.png differ
diff --git a/data/body/pidgin/black_tail.png b/data/body/pidgin/black_tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/pidgin/black_tail.png differ
diff --git a/data/body/pidgin/body.png b/data/body/pidgin/body.png
new file mode 100644
index 0000000..f0c2b5d
Binary files /dev/null and b/data/body/pidgin/body.png differ
diff --git a/data/body/pidgin/c1.png b/data/body/pidgin/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/pidgin/c1.png differ
diff --git a/data/body/pidgin/c2.png b/data/body/pidgin/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/pidgin/c2.png differ
diff --git a/data/body/pidgin/config.xml b/data/body/pidgin/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/pidgin/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/pidgin/dead.png b/data/body/pidgin/dead.png
new file mode 100644
index 0000000..7f9d075
Binary files /dev/null and b/data/body/pidgin/dead.png differ
diff --git a/data/body/pidgin/eyelid.png b/data/body/pidgin/eyelid.png
new file mode 100644
index 0000000..adceeba
Binary files /dev/null and b/data/body/pidgin/eyelid.png differ
diff --git a/data/body/pidgin/eyes.png b/data/body/pidgin/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/pidgin/eyes.png differ
diff --git a/data/body/pidgin/footleft.png b/data/body/pidgin/footleft.png
new file mode 100644
index 0000000..f052e78
Binary files /dev/null and b/data/body/pidgin/footleft.png differ
diff --git a/data/body/pidgin/footright.png b/data/body/pidgin/footright.png
new file mode 100644
index 0000000..f052e78
Binary files /dev/null and b/data/body/pidgin/footright.png differ
diff --git a/data/body/pidgin/hair.png b/data/body/pidgin/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/pidgin/hair.png differ
diff --git a/data/body/pidgin/hat.png b/data/body/pidgin/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/pidgin/hat.png differ
diff --git a/data/body/pidgin/head.png b/data/body/pidgin/head.png
new file mode 100644
index 0000000..f910714
Binary files /dev/null and b/data/body/pidgin/head.png differ
diff --git a/data/body/pidgin/helmet.png b/data/body/pidgin/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/pidgin/helmet.png differ
diff --git a/data/body/snortteam/hoop.png b/data/body/pidgin/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/snortteam/hoop.png
rename to data/body/pidgin/hoop.png
diff --git a/data/body/pidgin/hornleft.png b/data/body/pidgin/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/pidgin/hornleft.png differ
diff --git a/data/body/pidgin/hornright.png b/data/body/pidgin/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/pidgin/hornright.png differ
diff --git a/data/body/snortteam/hula.png b/data/body/pidgin/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/snortteam/hula.png
rename to data/body/pidgin/hula.png
diff --git a/data/body/pidgin/jetpack-fire.png b/data/body/pidgin/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/pidgin/jetpack-fire.png differ
diff --git a/data/body/pidgin/jetpack.png b/data/body/pidgin/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/pidgin/jetpack.png differ
diff --git a/data/body/pidgin/noze.png b/data/body/pidgin/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/pidgin/noze.png differ
diff --git a/data/body/pidgin/pupil.png b/data/body/pidgin/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/pidgin/pupil.png differ
diff --git a/data/body/pidgin/sick_head.png b/data/body/pidgin/sick_head.png
new file mode 100644
index 0000000..2591004
Binary files /dev/null and b/data/body/pidgin/sick_head.png differ
diff --git a/data/body/pidgin/tail.png b/data/body/pidgin/tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/pidgin/tail.png differ
diff --git a/data/body/pidgin/yoyo.png b/data/body/pidgin/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/pidgin/yoyo.png differ
diff --git a/data/body/snort/arm1left.png b/data/body/snort/arm1left.png
new file mode 100644
index 0000000..578b537
Binary files /dev/null and b/data/body/snort/arm1left.png differ
diff --git a/data/body/snort/arm1right.png b/data/body/snort/arm1right.png
new file mode 100644
index 0000000..578b537
Binary files /dev/null and b/data/body/snort/arm1right.png differ
diff --git a/data/body/snort/arm2left.png b/data/body/snort/arm2left.png
new file mode 100644
index 0000000..40a7296
Binary files /dev/null and b/data/body/snort/arm2left.png differ
diff --git a/data/body/snort/arm2right.png b/data/body/snort/arm2right.png
new file mode 100644
index 0000000..40a7296
Binary files /dev/null and b/data/body/snort/arm2right.png differ
diff --git a/data/body/snort/arm3left.png b/data/body/snort/arm3left.png
new file mode 100644
index 0000000..27d4e28
Binary files /dev/null and b/data/body/snort/arm3left.png differ
diff --git a/data/body/snort/arm3right.png b/data/body/snort/arm3right.png
new file mode 100644
index 0000000..27d4e28
Binary files /dev/null and b/data/body/snort/arm3right.png differ
diff --git a/data/body/snort/back.png b/data/body/snort/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/snort/back.png differ
diff --git a/data/body/snort/belt.png b/data/body/snort/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/snort/belt.png differ
diff --git a/data/body/snort/black_arm1left.png b/data/body/snort/black_arm1left.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/snort/black_arm1left.png differ
diff --git a/data/body/snort/black_arm1right.png b/data/body/snort/black_arm1right.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/snort/black_arm1right.png differ
diff --git a/data/body/snort/black_arm2left.png b/data/body/snort/black_arm2left.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/snort/black_arm2left.png differ
diff --git a/data/body/snort/black_arm2right.png b/data/body/snort/black_arm2right.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/snort/black_arm2right.png differ
diff --git a/data/body/snort/black_arm3left.png b/data/body/snort/black_arm3left.png
new file mode 100644
index 0000000..e23eb67
Binary files /dev/null and b/data/body/snort/black_arm3left.png differ
diff --git a/data/body/snort/black_arm3right.png b/data/body/snort/black_arm3right.png
new file mode 100644
index 0000000..e23eb67
Binary files /dev/null and b/data/body/snort/black_arm3right.png differ
diff --git a/data/body/snort/black_back.png b/data/body/snort/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/snort/black_back.png differ
diff --git a/data/body/snort/black_body.png b/data/body/snort/black_body.png
new file mode 100644
index 0000000..1c8f7cb
Binary files /dev/null and b/data/body/snort/black_body.png differ
diff --git a/data/body/snort/black_eyelid.png b/data/body/snort/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/snort/black_eyelid.png differ
diff --git a/data/body/snort/black_eyes.png b/data/body/snort/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/snort/black_eyes.png differ
diff --git a/data/body/snort/black_footleft.png b/data/body/snort/black_footleft.png
new file mode 100644
index 0000000..daa3d8f
Binary files /dev/null and b/data/body/snort/black_footleft.png differ
diff --git a/data/body/snort/black_footright.png b/data/body/snort/black_footright.png
new file mode 100644
index 0000000..daa3d8f
Binary files /dev/null and b/data/body/snort/black_footright.png differ
diff --git a/data/body/snort/black_hair.png b/data/body/snort/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/snort/black_hair.png differ
diff --git a/data/body/snort/black_head.png b/data/body/snort/black_head.png
new file mode 100644
index 0000000..2e5dd5f
Binary files /dev/null and b/data/body/snort/black_head.png differ
diff --git a/data/body/snort/black_hornleft.png b/data/body/snort/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/snort/black_hornleft.png differ
diff --git a/data/body/snort/black_hornright.png b/data/body/snort/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/snort/black_hornright.png differ
diff --git a/data/body/snort/black_noze.png b/data/body/snort/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/snort/black_noze.png differ
diff --git a/data/body/snort/black_pupil.png b/data/body/snort/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/snort/black_pupil.png differ
diff --git a/data/body/snort/black_tail.png b/data/body/snort/black_tail.png
new file mode 100644
index 0000000..da1db20
Binary files /dev/null and b/data/body/snort/black_tail.png differ
diff --git a/data/body/snort/body.png b/data/body/snort/body.png
new file mode 100644
index 0000000..b63987f
Binary files /dev/null and b/data/body/snort/body.png differ
diff --git a/data/body/snort/c1.png b/data/body/snort/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/snort/c1.png differ
diff --git a/data/body/snort/c2.png b/data/body/snort/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/snort/c2.png differ
diff --git a/data/body/snort/config.xml b/data/body/snort/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/snort/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/snort/dead.png b/data/body/snort/dead.png
new file mode 100644
index 0000000..cea32ca
Binary files /dev/null and b/data/body/snort/dead.png differ
diff --git a/data/body/snort/eyelid.png b/data/body/snort/eyelid.png
new file mode 100644
index 0000000..547da85
Binary files /dev/null and b/data/body/snort/eyelid.png differ
diff --git a/data/body/snort/eyes.png b/data/body/snort/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/snort/eyes.png differ
diff --git a/data/body/snort/footleft.png b/data/body/snort/footleft.png
new file mode 100644
index 0000000..272072a
Binary files /dev/null and b/data/body/snort/footleft.png differ
diff --git a/data/body/snort/footright.png b/data/body/snort/footright.png
new file mode 100644
index 0000000..272072a
Binary files /dev/null and b/data/body/snort/footright.png differ
diff --git a/data/body/snort/hair.png b/data/body/snort/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/snort/hair.png differ
diff --git a/data/body/snort/hat.png b/data/body/snort/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/snort/hat.png differ
diff --git a/data/body/snort/head.png b/data/body/snort/head.png
new file mode 100644
index 0000000..0ca5cd1
Binary files /dev/null and b/data/body/snort/head.png differ
diff --git a/data/body/snort/helmet.png b/data/body/snort/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/snort/helmet.png differ
diff --git a/data/body/spipteam/hoop.png b/data/body/snort/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/spipteam/hoop.png
rename to data/body/snort/hoop.png
diff --git a/data/body/snort/hornleft.png b/data/body/snort/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/snort/hornleft.png differ
diff --git a/data/body/snort/hornright.png b/data/body/snort/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/snort/hornright.png differ
diff --git a/data/body/spipteam/hula.png b/data/body/snort/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/spipteam/hula.png
rename to data/body/snort/hula.png
diff --git a/data/body/snort/jetpack-fire.png b/data/body/snort/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/snort/jetpack-fire.png differ
diff --git a/data/body/snort/jetpack.png b/data/body/snort/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/snort/jetpack.png differ
diff --git a/data/body/snort/noze.png b/data/body/snort/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/snort/noze.png differ
diff --git a/data/body/snort/pupil.png b/data/body/snort/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/snort/pupil.png differ
diff --git a/data/body/snort/sick_head.png b/data/body/snort/sick_head.png
new file mode 100644
index 0000000..5ea3899
Binary files /dev/null and b/data/body/snort/sick_head.png differ
diff --git a/data/body/snort/tail.png b/data/body/snort/tail.png
new file mode 100644
index 0000000..c28481d
Binary files /dev/null and b/data/body/snort/tail.png differ
diff --git a/data/body/snort/yoyo.png b/data/body/snort/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/snort/yoyo.png differ
diff --git a/data/body/snortteam/arm.png b/data/body/snortteam/arm.png
deleted file mode 100644
index 4f20fc6..0000000
Binary files a/data/body/snortteam/arm.png and /dev/null differ
diff --git a/data/body/snortteam/black.png b/data/body/snortteam/black.png
deleted file mode 100644
index 6c940fd..0000000
Binary files a/data/body/snortteam/black.png and /dev/null differ
diff --git a/data/body/snortteam/body.png b/data/body/snortteam/body.png
deleted file mode 100644
index 39edbea..0000000
Binary files a/data/body/snortteam/body.png and /dev/null differ
diff --git a/data/body/snortteam/c1.png b/data/body/snortteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/snortteam/c1.png and /dev/null differ
diff --git a/data/body/snortteam/c2.png b/data/body/snortteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/snortteam/c2.png and /dev/null differ
diff --git a/data/body/snortteam/config.xml b/data/body/snortteam/config.xml
deleted file mode 100644
index 4db064a..0000000
--- a/data/body/snortteam/config.xml
+++ /dev/null
@@ -1,2037 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body">
-	<image file="body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="27"/>
-	<attached member_type="head" frame="*" dx="5" dy="7"/>
-	<attached member_type="arm-right" frame="*" dx="5" dy="17"/>
-	<attached member_type="arm-left" frame="*" dx="10" dy="16"/>
-	<attached member_type="foot-left" frame="*" dx="13" dy="30"/>
-	<attached member_type="foot-right" frame="*" dx="7" dy="31"/>
-	<attached member_type="jetpack-belt" frame="*" dx="1" dy="22"/>
-	<attached member_type="jetpack-right" frame="*" dx="12" dy="32"/>
-	<attached member_type="jetpack-left" frame="*" dx="12" dy="31"/>
-	<attached member_type="tail" frame="*" dx="3" dy="31"/>
-	<attached member_type="construct" frame="*" dx="5" dy="3"/>
-	<attached member_type="hula" frame="*" dx="14" dy="25"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Tail ###### -->
-<sprite name="tail" type="tail">
-	<image file="tail.png"/>
-	<anchor dx="8" dy="2"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="head.png"/>
-	<anchor dx="7" dy="11"/>
-	<attached member_type="eyes-normal" frame="*" dx="13" dy="9"/>
-	<attached member_type="helmet" frame="*" dx="8" dy="11"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Arms ###### -->
-<sprite name="arm-left" type="arm-left">
-	<image file="arm.png"/>
-	<anchor dx="3" dy="0"/>
-</sprite>
-
-<sprite name="arm-right" type="arm-right">
-	<image file="arm.png"/>
-	<anchor dx="3" dy="0"/>
-	<attached member_type="weapon" frame="*" dx="3" dy="10"/>
-	<attached member_type="yoyo" frame="*" dx="3" dy="8"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left">
-	<image file="arm.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right">
-	<image file="arm.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<!-- ###### Jetpack ###### -->
-<sprite name="jetpack-belt" type="jetpack-belt">
-	<image file="jetpack-belt.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-right" type="jetpack-right">
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-right" frame="*" dx="4" dy="3"/>
-</sprite>
-
-<sprite name="jetpack-left" type="jetpack-left">
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-left" frame="*" dx="4" dy="3"/>
-</sprite>
-
-<sprite name="jetpack-fire-right" type="jetpack-fire-right">
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-fire-left" type="jetpack-fire-left">
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet">
-	<image file="helmet.png"/>
-	<anchor dx="9" dy="13"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1"/>
-	</image>
-	<anchor dx="29" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body">
-	<image file="dead.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Black ###### -->
-<sprite name="body-black" type="body">
-	<image file="black.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="jetpack-right"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="jetpack-fire-left"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="jetpack-fire-right"/>
-	<c_member name="jetpack-right"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="helmet"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="hoop"/>
-</clothe>
-
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="body-black"/>
-</clothe>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="tail" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="-10"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20"/>
-		<member type="arm-right" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="-10"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30"/>
-		<member type="arm-right" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="tail" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40"/>
-		<member type="arm-right" angle="40"/>
-		<member type="foot-left" angle="40"/>
-		<member type="foot-right" angle="-40"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="tail" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30"/>
-		<member type="arm-right" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="tail" angle="10"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20"/>
-		<member type="arm-right" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="tail" angle="10"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="tail" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="-10"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="-10"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="40"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="foot-left" angle="-40"/>
-		<member type="foot-right" angle="40"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30"/>
-		<member type="arm-right" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="10"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20"/>
-		<member type="arm-right" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="tail" angle="10"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0" />
-	</frame>
-</movement>
-
-
-
-
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="arm-right" angle="-90"/>
-		<member type="yoyo" angle="90"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-		<member type="jetpack-fire" dy="-5" /> <!-- hide the fire under the jetpack -->
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="50"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="45" />
-		<member type="tail" angle="-100" dx="2" />
-		<member type="arm-left" angle="-100" dx="-1" />
-		<member type="arm-right" angle="80" dx="-3" dy="-3" />
-		<member type="foot-left" angle="50" dx="2" dy="2" />
-		<member type="foot-right" angle="50" dy="3" />
-		<member type="head" angle="-50" dx="1" />
-		<member type="jetpack-belt" dx="1" dy="1" />
-		<member type="jetpack-right" angle="-30" dx="-4" dy="-15" />
-		<member type="jetpack-left" angle="-30" dx="16" dy="-1" />
-		<member type="jetpack-fire-right" dx="0" dy="0" />
-		<member type="jetpack-fire-left" dx="0" dy="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="45" />
-		<member type="tail" angle="-100" dx="2" />
-		<member type="arm-left" angle="-100" dx="-1" />
-		<member type="arm-right" angle="80" dx="-3" dy="-3" />
-		<member type="foot-left" angle="50" dx="2" dy="2" />
-		<member type="foot-right" angle="50" dy="3" />
-		<member type="head" angle="-50" dx="1" />
-		<member type="jetpack-belt" dx="1" dy="1" />
-		<member type="jetpack-right" angle="-30" dx="-4" dy="-15" />
-		<member type="jetpack-left" angle="-30" dx="16" dy="-1" />
-		<member type="jetpack-fire-right" dx="-4" dy="5" />
-		<member type="jetpack-fire-left" dx="-4" dy="5" />
-	</frame>
-	<frame>
-		<member type="body" angle="45" />
-		<member type="tail" angle="-90" dx="2" />
-		<member type="arm-left" angle="-100" dx="-1" />
-		<member type="arm-right" angle="80" dx="-3" dy="-3" />
-		<member type="foot-left" angle="50" dx="2" dy="2" />
-		<member type="foot-right" angle="50" dy="3" />
-		<member type="head" angle="-50" dx="1" />
-		<member type="jetpack-belt" dx="1" dy="1" />
-		<member type="jetpack-right" angle="-30" dx="-4" dy="-15" />
-		<member type="jetpack-left" angle="-30" dx="16" dy="-1" />
-		<member type="jetpack-fire-right" dx="0" dy="0" />
-		<member type="jetpack-fire-left" dx="0" dy="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="45" />
-		<member type="tail" angle="-90" dx="2" />
-		<member type="arm-left" angle="-100" dx="-1" />
-		<member type="arm-right" angle="80" dx="-3" dy="-3" />
-		<member type="foot-left" angle="50" dx="2" dy="2" />
-		<member type="foot-right" angle="50" dy="3" />
-		<member type="head" angle="-50" dx="1" />
-		<member type="jetpack-belt" dx="1" dy="1" />
-		<member type="jetpack-right" angle="-30" dx="-4" dy="-15" />
-		<member type="jetpack-left" angle="-30" dx="16" dy="-1" />
-		<member type="jetpack-fire-right" dx="0" dy="0" />
-		<member type="jetpack-fire-left" dx="0" dy="0" />
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="10" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="10" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="20" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="20" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="30" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="30" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="40" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="40" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="50" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="50" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-
-</resources>
diff --git a/data/body/snortteam/dead.png b/data/body/snortteam/dead.png
deleted file mode 100644
index 0b8dfea..0000000
Binary files a/data/body/snortteam/dead.png and /dev/null differ
diff --git a/data/body/snortteam/eyelid.png b/data/body/snortteam/eyelid.png
deleted file mode 100644
index cfac2f6..0000000
Binary files a/data/body/snortteam/eyelid.png and /dev/null differ
diff --git a/data/body/snortteam/eyes.png b/data/body/snortteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/snortteam/eyes.png and /dev/null differ
diff --git a/data/body/snortteam/head.png b/data/body/snortteam/head.png
deleted file mode 100644
index 2e623d8..0000000
Binary files a/data/body/snortteam/head.png and /dev/null differ
diff --git a/data/body/snortteam/helmet.png b/data/body/snortteam/helmet.png
deleted file mode 100644
index ed9c1fc..0000000
Binary files a/data/body/snortteam/helmet.png and /dev/null differ
diff --git a/data/body/snortteam/jetpack-belt.png b/data/body/snortteam/jetpack-belt.png
deleted file mode 100644
index 5ca545b..0000000
Binary files a/data/body/snortteam/jetpack-belt.png and /dev/null differ
diff --git a/data/body/snortteam/jetpack-fire.png b/data/body/snortteam/jetpack-fire.png
deleted file mode 100644
index bbfd56c..0000000
Binary files a/data/body/snortteam/jetpack-fire.png and /dev/null differ
diff --git a/data/body/snortteam/jetpack.png b/data/body/snortteam/jetpack.png
deleted file mode 100644
index ea246b8..0000000
Binary files a/data/body/snortteam/jetpack.png and /dev/null differ
diff --git a/data/body/snortteam/pupil.png b/data/body/snortteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/snortteam/pupil.png and /dev/null differ
diff --git a/data/body/snortteam/tail.png b/data/body/snortteam/tail.png
deleted file mode 100644
index e8e5903..0000000
Binary files a/data/body/snortteam/tail.png and /dev/null differ
diff --git a/data/body/snortteam/yoyo.png b/data/body/snortteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/snortteam/yoyo.png and /dev/null differ
diff --git a/data/body/spip/arm1left.png b/data/body/spip/arm1left.png
new file mode 100644
index 0000000..73118c5
Binary files /dev/null and b/data/body/spip/arm1left.png differ
diff --git a/data/body/spip/arm1right.png b/data/body/spip/arm1right.png
new file mode 100644
index 0000000..73118c5
Binary files /dev/null and b/data/body/spip/arm1right.png differ
diff --git a/data/body/spip/arm2left.png b/data/body/spip/arm2left.png
new file mode 100644
index 0000000..b96f4c8
Binary files /dev/null and b/data/body/spip/arm2left.png differ
diff --git a/data/body/spip/arm2right.png b/data/body/spip/arm2right.png
new file mode 100644
index 0000000..b96f4c8
Binary files /dev/null and b/data/body/spip/arm2right.png differ
diff --git a/data/body/spip/arm3left.png b/data/body/spip/arm3left.png
new file mode 100644
index 0000000..2d428ed
Binary files /dev/null and b/data/body/spip/arm3left.png differ
diff --git a/data/body/spip/arm3right.png b/data/body/spip/arm3right.png
new file mode 100644
index 0000000..2d428ed
Binary files /dev/null and b/data/body/spip/arm3right.png differ
diff --git a/data/body/spip/back.png b/data/body/spip/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/spip/back.png differ
diff --git a/data/body/spip/belt.png b/data/body/spip/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/spip/belt.png differ
diff --git a/data/body/spip/black_arm1left.png b/data/body/spip/black_arm1left.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/spip/black_arm1left.png differ
diff --git a/data/body/spip/black_arm1right.png b/data/body/spip/black_arm1right.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/spip/black_arm1right.png differ
diff --git a/data/body/spip/black_arm2left.png b/data/body/spip/black_arm2left.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/spip/black_arm2left.png differ
diff --git a/data/body/spip/black_arm2right.png b/data/body/spip/black_arm2right.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/spip/black_arm2right.png differ
diff --git a/data/body/spip/black_arm3left.png b/data/body/spip/black_arm3left.png
new file mode 100644
index 0000000..efe4079
Binary files /dev/null and b/data/body/spip/black_arm3left.png differ
diff --git a/data/body/spip/black_arm3right.png b/data/body/spip/black_arm3right.png
new file mode 100644
index 0000000..efe4079
Binary files /dev/null and b/data/body/spip/black_arm3right.png differ
diff --git a/data/body/spip/black_back.png b/data/body/spip/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/spip/black_back.png differ
diff --git a/data/body/spip/black_body.png b/data/body/spip/black_body.png
new file mode 100644
index 0000000..1c8f7cb
Binary files /dev/null and b/data/body/spip/black_body.png differ
diff --git a/data/body/spip/black_eyelid.png b/data/body/spip/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/spip/black_eyelid.png differ
diff --git a/data/body/spip/black_eyes.png b/data/body/spip/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/spip/black_eyes.png differ
diff --git a/data/body/spip/black_footleft.png b/data/body/spip/black_footleft.png
new file mode 100644
index 0000000..4f24800
Binary files /dev/null and b/data/body/spip/black_footleft.png differ
diff --git a/data/body/spip/black_footright.png b/data/body/spip/black_footright.png
new file mode 100644
index 0000000..4f24800
Binary files /dev/null and b/data/body/spip/black_footright.png differ
diff --git a/data/body/spip/black_hair.png b/data/body/spip/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/spip/black_hair.png differ
diff --git a/data/body/spip/black_head.png b/data/body/spip/black_head.png
new file mode 100644
index 0000000..54b586f
Binary files /dev/null and b/data/body/spip/black_head.png differ
diff --git a/data/body/spip/black_hornleft.png b/data/body/spip/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/spip/black_hornleft.png differ
diff --git a/data/body/spip/black_hornright.png b/data/body/spip/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/spip/black_hornright.png differ
diff --git a/data/body/spip/black_noze.png b/data/body/spip/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/spip/black_noze.png differ
diff --git a/data/body/spip/black_pupil.png b/data/body/spip/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/spip/black_pupil.png differ
diff --git a/data/body/spip/black_tail.png b/data/body/spip/black_tail.png
new file mode 100644
index 0000000..ec6d41c
Binary files /dev/null and b/data/body/spip/black_tail.png differ
diff --git a/data/body/spip/body.png b/data/body/spip/body.png
new file mode 100644
index 0000000..3c0713c
Binary files /dev/null and b/data/body/spip/body.png differ
diff --git a/data/body/spip/c1.png b/data/body/spip/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/spip/c1.png differ
diff --git a/data/body/spip/c2.png b/data/body/spip/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/spip/c2.png differ
diff --git a/data/body/spip/config.xml b/data/body/spip/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/spip/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/spip/dead.png b/data/body/spip/dead.png
new file mode 100644
index 0000000..62efa11
Binary files /dev/null and b/data/body/spip/dead.png differ
diff --git a/data/body/spip/eyelid.png b/data/body/spip/eyelid.png
new file mode 100644
index 0000000..66f4eab
Binary files /dev/null and b/data/body/spip/eyelid.png differ
diff --git a/data/body/spip/eyes.png b/data/body/spip/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/spip/eyes.png differ
diff --git a/data/body/spip/footleft.png b/data/body/spip/footleft.png
new file mode 100644
index 0000000..28a9d77
Binary files /dev/null and b/data/body/spip/footleft.png differ
diff --git a/data/body/spip/footright.png b/data/body/spip/footright.png
new file mode 100644
index 0000000..28a9d77
Binary files /dev/null and b/data/body/spip/footright.png differ
diff --git a/data/body/spip/hair.png b/data/body/spip/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/spip/hair.png differ
diff --git a/data/body/spip/hat.png b/data/body/spip/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/spip/hat.png differ
diff --git a/data/body/spip/head.png b/data/body/spip/head.png
new file mode 100644
index 0000000..5536729
Binary files /dev/null and b/data/body/spip/head.png differ
diff --git a/data/body/spip/helmet.png b/data/body/spip/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/spip/helmet.png differ
diff --git a/data/body/thunderbirdteam/hoop.png b/data/body/spip/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/thunderbirdteam/hoop.png
rename to data/body/spip/hoop.png
diff --git a/data/body/spip/hornleft.png b/data/body/spip/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/spip/hornleft.png differ
diff --git a/data/body/spip/hornright.png b/data/body/spip/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/spip/hornright.png differ
diff --git a/data/body/thunderbirdteam/hula.png b/data/body/spip/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/thunderbirdteam/hula.png
rename to data/body/spip/hula.png
diff --git a/data/body/spip/jetpack-fire.png b/data/body/spip/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/spip/jetpack-fire.png differ
diff --git a/data/body/spip/jetpack.png b/data/body/spip/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/spip/jetpack.png differ
diff --git a/data/body/spip/noze.png b/data/body/spip/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/spip/noze.png differ
diff --git a/data/body/spip/pupil.png b/data/body/spip/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/spip/pupil.png differ
diff --git a/data/body/spip/sick_head.png b/data/body/spip/sick_head.png
new file mode 100644
index 0000000..f37781c
Binary files /dev/null and b/data/body/spip/sick_head.png differ
diff --git a/data/body/spip/tail.png b/data/body/spip/tail.png
new file mode 100644
index 0000000..6836379
Binary files /dev/null and b/data/body/spip/tail.png differ
diff --git a/data/body/spip/yoyo.png b/data/body/spip/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/spip/yoyo.png differ
diff --git a/data/body/spipteam/arm.png b/data/body/spipteam/arm.png
deleted file mode 100644
index d4664bf..0000000
Binary files a/data/body/spipteam/arm.png and /dev/null differ
diff --git a/data/body/spipteam/black.png b/data/body/spipteam/black.png
deleted file mode 100644
index 5e25c3b..0000000
Binary files a/data/body/spipteam/black.png and /dev/null differ
diff --git a/data/body/spipteam/body.png b/data/body/spipteam/body.png
deleted file mode 100644
index 6f0d96c..0000000
Binary files a/data/body/spipteam/body.png and /dev/null differ
diff --git a/data/body/spipteam/c1.png b/data/body/spipteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/spipteam/c1.png and /dev/null differ
diff --git a/data/body/spipteam/c2.png b/data/body/spipteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/spipteam/c2.png and /dev/null differ
diff --git a/data/body/spipteam/config.xml b/data/body/spipteam/config.xml
deleted file mode 100644
index b358b4d..0000000
--- a/data/body/spipteam/config.xml
+++ /dev/null
@@ -1,2070 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body" >
-	<image file="body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="10" dy="22"/>
-	<attached member_type="head" frame="*" dx="11" dy="6"/>
-	<attached member_type="arm-right"  frame="*" dx="6" dy="15"/>
-	<attached member_type="arm-left"  frame="*" dx="11" dy="14"/>
-	<attached member_type="foot-left"  frame="*" dx="9" dy="27"/>
-	<attached member_type="foot-right"  frame="*" dx="5" dy="29"/>
-	<attached member_type="tail"  frame="*" dx="4" dy="30"/>
-	<attached member_type="jetpack-belt"  frame="*" dx="2" dy="22"/>
-	<attached member_type="jetpack-right"  frame="*" dx="12" dy="27"/>
-	<attached member_type="jetpack-left"  frame="*" dx="17" dy="23"/>
-	<attached member_type="construct" frame="*" dx="8" dy="4"/>
-	<attached member_type="hula" frame="*" dx="10" dy="20"/>
-</sprite>
-
-<!-- ###### Tail ###### -->
-<sprite name="tail" type="tail" >
-	<image file="tail.png"/>
-	<anchor dx="15" dy="36"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="head.png"/>
-	<anchor dx="8" dy="10"/>
-	<attached member_type="eyes-normal" frame="*" dx="10" dy="6"/>
-	<attached member_type="helmet" frame="*" dx="0" dy="-1"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Arms ###### -->
-<sprite name="arm-left" type="arm-left" >
-	<image file="arm.png"/>
-	<anchor dx="3" dy="2"/>
-</sprite>
-
-<sprite name="arm-right" type="arm-right" >
-	<image file="arm.png"/>
-	<anchor dx="3" dy="2"/>
-	<attached member_type="weapon" frame="*" dx="3" dy="14"/>
-	<attached member_type="yoyo" frame="*" dx="2" dy="12"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left" >
-	<image file="foot.png"/>
-	<anchor dx="3" dy="1"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right" >
-	<image file="foot.png"/>
-	<anchor dx="3" dy="1"/>
-</sprite>
-
-<!-- ###### Jetpack ###### -->
-<sprite name="jetpack-belt" type="jetpack-belt" >
-	<image file="jetpack-belt.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-right" type="jetpack-right" >
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="4"/>
-	<attached member_type="jetpack-fire-right"  frame="*" dx="5" dy="3"/>
-</sprite>
-
-<sprite name="jetpack-left" type="jetpack-left" >
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="4"/>
-	<attached member_type="jetpack-fire-left"  frame="*" dx="5" dy="3"/>
-</sprite>
-
-<sprite name="jetpack-fire-right" type="jetpack-fire-right" >
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-fire-left" type="jetpack-fire-left" >
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet" >
-	<image file="helmet.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1" />
-	</image>
-	<anchor dx="29" dy="25"/>
-	<animation speed="150" />
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body" >
-	<image file="dead.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Black ###### -->
-<sprite name="body-black" type="body" >
-	<image file="black.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack">
-	<c_member name="tail"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="jetpack-right"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="jetpack-fire-left"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="jetpack-fire-right"/>
-	<c_member name="jetpack-right"/>
-</clothe>
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="helmet"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="c2"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="c2"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="tail"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="hoop"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="body-black"/>
-</clothe>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="tail" angle="-2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="tail" angle="-2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40" />
-		<member type="arm-right" angle="40" />
-		<member type="foot-left" angle="40" />
-		<member type="foot-right" angle="-40" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="tail" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />	
-		<member type="tail" angle="-2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="tail" angle="-2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="40" />
-		<member type="arm-right" angle="-40" />
-		<member type="foot-left" angle="-40" />
-		<member type="foot-right" angle="40" />
-		<member type="tail" angle="2" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="tail" angle="2" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="tail" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0" />
-	</frame>
-</movement>
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-right" angle="-90"/>
-		<member type="yoyo" angle="90"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="tail" dx="4"/>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body-normal" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-2" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-2" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-2" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-2" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-2" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-2" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-2" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-2" dy="9"/>
-	</frame>
-</movement>
-
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-		<member type="jetpack-fire" dy="-5" /> <!-- hide the fire under the jetpack -->
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="50"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="45" />
-		<member type="tail" angle="-100" dx="2" />
-		<member type="arm-left" angle="-100" dx="-1" />
-		<member type="arm-right" angle="80" dx="-3" dy="-3" />
-		<member type="foot-left" angle="50" dx="2" dy="2" />
-		<member type="foot-right" angle="90" dy="3" />
-		<member type="head" angle="-50" dy="-1" />
-		<member type="jetpack-belt" dx="-1" dy="-1" />
-		<member type="jetpack-right" angle="-30" dx="-6" dy="-21" />
-		<member type="jetpack-left" angle="-30" dx="12" dy="-4" />
-		<member type="jetpack-fire-right" dx="0" dy="0" />
-		<member type="jetpack-fire-left" dx="0" dy="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="45" />
-		<member type="tail" angle="-100" dx="2" />
-		<member type="arm-left" angle="-100" dx="-1" />
-		<member type="arm-right" angle="80" dx="-3" dy="-3" />
-		<member type="foot-left" angle="50" dx="2" dy="2" />
-		<member type="foot-right" angle="90" dy="3" />
-		<member type="head" angle="-50" dy="-1" />
-		<member type="jetpack-belt" dx="-1" dy="-1" />
-		<member type="jetpack-right" angle="-30" dx="-6" dy="-21" />
-		<member type="jetpack-left" angle="-30" dx="12" dy="-4" />
-		<member type="jetpack-fire-right" dx="-4" dy="5" />
-		<member type="jetpack-fire-left" dx="-4" dy="5" />
-	</frame>
-	<frame>
-		<member type="body" angle="45" />
-		<member type="tail" angle="-90" dx="2" />
-		<member type="arm-left" angle="-100" dx="-1" />
-		<member type="arm-right" angle="80" dx="-3" dy="-3" />
-		<member type="foot-left" angle="50" dx="2" dy="2" />
-		<member type="foot-right" angle="90" dy="3" />
-		<member type="head" angle="-50" dy="-1" />
-		<member type="jetpack-belt" dx="-1" dy="-1" />
-		<member type="jetpack-right" angle="-30" dx="-6" dy="-21" />
-		<member type="jetpack-left" angle="-30" dx="12" dy="-4" />
-		<member type="jetpack-fire-right" dx="0" dy="0" />
-		<member type="jetpack-fire-left" dx="0" dy="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="45" />
-		<member type="tail" angle="-90" dx="2" />
-		<member type="arm-left" angle="-100" dx="-1" />
-		<member type="arm-right" angle="80" dx="-3" dy="-3" />
-		<member type="foot-left" angle="50" dx="2" dy="2" />
-		<member type="foot-right" angle="90" dy="3" />
-		<member type="head" angle="-50" dy="-1" />
-		<member type="jetpack-belt" dx="-1" dy="-1" />
-		<member type="jetpack-right" angle="-30" dx="-6" dy="-21" />
-		<member type="jetpack-left" angle="-30" dx="12" dy="-4" />
-		<member type="jetpack-fire-right" dx="0" dy="0" />
-		<member type="jetpack-fire-left" dx="0" dy="0" />
-	</frame>
-</movement>
-
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-
-</resources>
diff --git a/data/body/spipteam/dead.png b/data/body/spipteam/dead.png
deleted file mode 100644
index 69e785d..0000000
Binary files a/data/body/spipteam/dead.png and /dev/null differ
diff --git a/data/body/spipteam/eyelid.png b/data/body/spipteam/eyelid.png
deleted file mode 100644
index a51ce9e..0000000
Binary files a/data/body/spipteam/eyelid.png and /dev/null differ
diff --git a/data/body/spipteam/eyes.png b/data/body/spipteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/spipteam/eyes.png and /dev/null differ
diff --git a/data/body/spipteam/foot.png b/data/body/spipteam/foot.png
deleted file mode 100644
index 7ead1d3..0000000
Binary files a/data/body/spipteam/foot.png and /dev/null differ
diff --git a/data/body/spipteam/head.png b/data/body/spipteam/head.png
deleted file mode 100644
index f43836d..0000000
Binary files a/data/body/spipteam/head.png and /dev/null differ
diff --git a/data/body/spipteam/helmet.png b/data/body/spipteam/helmet.png
deleted file mode 100644
index 1c03973..0000000
Binary files a/data/body/spipteam/helmet.png and /dev/null differ
diff --git a/data/body/spipteam/jetpack-belt.png b/data/body/spipteam/jetpack-belt.png
deleted file mode 100644
index 527c3c2..0000000
Binary files a/data/body/spipteam/jetpack-belt.png and /dev/null differ
diff --git a/data/body/spipteam/jetpack-fire.png b/data/body/spipteam/jetpack-fire.png
deleted file mode 100644
index cec87b2..0000000
Binary files a/data/body/spipteam/jetpack-fire.png and /dev/null differ
diff --git a/data/body/spipteam/jetpack.png b/data/body/spipteam/jetpack.png
deleted file mode 100644
index 85af164..0000000
Binary files a/data/body/spipteam/jetpack.png and /dev/null differ
diff --git a/data/body/spipteam/pupil.png b/data/body/spipteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/spipteam/pupil.png and /dev/null differ
diff --git a/data/body/spipteam/tail.png b/data/body/spipteam/tail.png
deleted file mode 100644
index dfc0866..0000000
Binary files a/data/body/spipteam/tail.png and /dev/null differ
diff --git a/data/body/spipteam/yoyo.png b/data/body/spipteam/yoyo.png
deleted file mode 100644
index 77ff9b6..0000000
Binary files a/data/body/spipteam/yoyo.png and /dev/null differ
diff --git a/data/body/suse/arm1left.png b/data/body/suse/arm1left.png
new file mode 100644
index 0000000..19995c2
Binary files /dev/null and b/data/body/suse/arm1left.png differ
diff --git a/data/body/suse/arm1right.png b/data/body/suse/arm1right.png
new file mode 100644
index 0000000..19995c2
Binary files /dev/null and b/data/body/suse/arm1right.png differ
diff --git a/data/body/suse/arm2left.png b/data/body/suse/arm2left.png
new file mode 100644
index 0000000..307f7c1
Binary files /dev/null and b/data/body/suse/arm2left.png differ
diff --git a/data/body/suse/arm2right.png b/data/body/suse/arm2right.png
new file mode 100644
index 0000000..307f7c1
Binary files /dev/null and b/data/body/suse/arm2right.png differ
diff --git a/data/body/suse/arm3left.png b/data/body/suse/arm3left.png
new file mode 100644
index 0000000..3b1b6c3
Binary files /dev/null and b/data/body/suse/arm3left.png differ
diff --git a/data/body/suse/arm3right.png b/data/body/suse/arm3right.png
new file mode 100644
index 0000000..3b1b6c3
Binary files /dev/null and b/data/body/suse/arm3right.png differ
diff --git a/data/body/suse/back.png b/data/body/suse/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/suse/back.png differ
diff --git a/data/body/suse/belt.png b/data/body/suse/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/suse/belt.png differ
diff --git a/data/body/suse/black_arm1left.png b/data/body/suse/black_arm1left.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/suse/black_arm1left.png differ
diff --git a/data/body/suse/black_arm1right.png b/data/body/suse/black_arm1right.png
new file mode 100644
index 0000000..e912c6c
Binary files /dev/null and b/data/body/suse/black_arm1right.png differ
diff --git a/data/body/suse/black_arm2left.png b/data/body/suse/black_arm2left.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/suse/black_arm2left.png differ
diff --git a/data/body/suse/black_arm2right.png b/data/body/suse/black_arm2right.png
new file mode 100644
index 0000000..be0d2c5
Binary files /dev/null and b/data/body/suse/black_arm2right.png differ
diff --git a/data/body/suse/black_arm3left.png b/data/body/suse/black_arm3left.png
new file mode 100644
index 0000000..e23eb67
Binary files /dev/null and b/data/body/suse/black_arm3left.png differ
diff --git a/data/body/suse/black_arm3right.png b/data/body/suse/black_arm3right.png
new file mode 100644
index 0000000..e23eb67
Binary files /dev/null and b/data/body/suse/black_arm3right.png differ
diff --git a/data/body/suse/black_back.png b/data/body/suse/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/suse/black_back.png differ
diff --git a/data/body/suse/black_body.png b/data/body/suse/black_body.png
new file mode 100644
index 0000000..1c8f7cb
Binary files /dev/null and b/data/body/suse/black_body.png differ
diff --git a/data/body/suse/black_eyelid.png b/data/body/suse/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/suse/black_eyelid.png differ
diff --git a/data/body/suse/black_eyes.png b/data/body/suse/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/suse/black_eyes.png differ
diff --git a/data/body/suse/black_footleft.png b/data/body/suse/black_footleft.png
new file mode 100644
index 0000000..089561b
Binary files /dev/null and b/data/body/suse/black_footleft.png differ
diff --git a/data/body/suse/black_footright.png b/data/body/suse/black_footright.png
new file mode 100644
index 0000000..089561b
Binary files /dev/null and b/data/body/suse/black_footright.png differ
diff --git a/data/body/suse/black_hair.png b/data/body/suse/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/suse/black_hair.png differ
diff --git a/data/body/suse/black_head.png b/data/body/suse/black_head.png
new file mode 100644
index 0000000..b55d2af
Binary files /dev/null and b/data/body/suse/black_head.png differ
diff --git a/data/body/suse/black_hornleft.png b/data/body/suse/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/suse/black_hornleft.png differ
diff --git a/data/body/suse/black_hornright.png b/data/body/suse/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/suse/black_hornright.png differ
diff --git a/data/body/suse/black_noze.png b/data/body/suse/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/suse/black_noze.png differ
diff --git a/data/body/suse/black_pupil.png b/data/body/suse/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/suse/black_pupil.png differ
diff --git a/data/body/suse/black_tail.png b/data/body/suse/black_tail.png
new file mode 100644
index 0000000..64efd62
Binary files /dev/null and b/data/body/suse/black_tail.png differ
diff --git a/data/body/suse/body.png b/data/body/suse/body.png
new file mode 100644
index 0000000..38d240f
Binary files /dev/null and b/data/body/suse/body.png differ
diff --git a/data/body/suse/c1.png b/data/body/suse/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/suse/c1.png differ
diff --git a/data/body/suse/c2.png b/data/body/suse/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/suse/c2.png differ
diff --git a/data/body/suse/config.xml b/data/body/suse/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/suse/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/suse/dead.png b/data/body/suse/dead.png
new file mode 100644
index 0000000..cef80dd
Binary files /dev/null and b/data/body/suse/dead.png differ
diff --git a/data/body/suse/eyelid.png b/data/body/suse/eyelid.png
new file mode 100644
index 0000000..de4008f
Binary files /dev/null and b/data/body/suse/eyelid.png differ
diff --git a/data/body/suse/eyes.png b/data/body/suse/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/suse/eyes.png differ
diff --git a/data/body/suse/footleft.png b/data/body/suse/footleft.png
new file mode 100644
index 0000000..f21bf77
Binary files /dev/null and b/data/body/suse/footleft.png differ
diff --git a/data/body/suse/footright.png b/data/body/suse/footright.png
new file mode 100644
index 0000000..f21bf77
Binary files /dev/null and b/data/body/suse/footright.png differ
diff --git a/data/body/suse/hair.png b/data/body/suse/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/suse/hair.png differ
diff --git a/data/body/suse/hat.png b/data/body/suse/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/suse/hat.png differ
diff --git a/data/body/suse/head.png b/data/body/suse/head.png
new file mode 100644
index 0000000..228844e
Binary files /dev/null and b/data/body/suse/head.png differ
diff --git a/data/body/suse/helmet.png b/data/body/suse/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/suse/helmet.png differ
diff --git a/data/body/tuxteam/hoop.png b/data/body/suse/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/tuxteam/hoop.png
rename to data/body/suse/hoop.png
diff --git a/data/body/suse/hornleft.png b/data/body/suse/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/suse/hornleft.png differ
diff --git a/data/body/suse/hornright.png b/data/body/suse/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/suse/hornright.png differ
diff --git a/data/body/tuxteam/hula.png b/data/body/suse/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/tuxteam/hula.png
rename to data/body/suse/hula.png
diff --git a/data/body/suse/jetpack-fire.png b/data/body/suse/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/suse/jetpack-fire.png differ
diff --git a/data/body/suse/jetpack.png b/data/body/suse/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/suse/jetpack.png differ
diff --git a/data/body/suse/noze.png b/data/body/suse/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/suse/noze.png differ
diff --git a/data/body/suse/pupil.png b/data/body/suse/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/suse/pupil.png differ
diff --git a/data/body/suse/sick_head.png b/data/body/suse/sick_head.png
new file mode 100644
index 0000000..b5fae56
Binary files /dev/null and b/data/body/suse/sick_head.png differ
diff --git a/data/body/suse/tail.png b/data/body/suse/tail.png
new file mode 100644
index 0000000..c6522c2
Binary files /dev/null and b/data/body/suse/tail.png differ
diff --git a/data/body/suse/yoyo.png b/data/body/suse/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/suse/yoyo.png differ
diff --git a/data/body/thunderbird/arm1left.png b/data/body/thunderbird/arm1left.png
new file mode 100644
index 0000000..3d3f3ea
Binary files /dev/null and b/data/body/thunderbird/arm1left.png differ
diff --git a/data/body/thunderbird/arm1right.png b/data/body/thunderbird/arm1right.png
new file mode 100644
index 0000000..3d3f3ea
Binary files /dev/null and b/data/body/thunderbird/arm1right.png differ
diff --git a/data/body/thunderbird/arm2left.png b/data/body/thunderbird/arm2left.png
new file mode 100644
index 0000000..b929951
Binary files /dev/null and b/data/body/thunderbird/arm2left.png differ
diff --git a/data/body/thunderbird/arm2right.png b/data/body/thunderbird/arm2right.png
new file mode 100644
index 0000000..b929951
Binary files /dev/null and b/data/body/thunderbird/arm2right.png differ
diff --git a/data/body/thunderbird/arm3left.png b/data/body/thunderbird/arm3left.png
new file mode 100644
index 0000000..47ce1f1
Binary files /dev/null and b/data/body/thunderbird/arm3left.png differ
diff --git a/data/body/thunderbird/arm3right.png b/data/body/thunderbird/arm3right.png
new file mode 100644
index 0000000..47ce1f1
Binary files /dev/null and b/data/body/thunderbird/arm3right.png differ
diff --git a/data/body/thunderbird/back.png b/data/body/thunderbird/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/thunderbird/back.png differ
diff --git a/data/body/thunderbird/belt.png b/data/body/thunderbird/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/thunderbird/belt.png differ
diff --git a/data/body/thunderbird/black_arm1left.png b/data/body/thunderbird/black_arm1left.png
new file mode 100644
index 0000000..725cad2
Binary files /dev/null and b/data/body/thunderbird/black_arm1left.png differ
diff --git a/data/body/thunderbird/black_arm1right.png b/data/body/thunderbird/black_arm1right.png
new file mode 100644
index 0000000..34d0d71
Binary files /dev/null and b/data/body/thunderbird/black_arm1right.png differ
diff --git a/data/body/thunderbird/black_arm2left.png b/data/body/thunderbird/black_arm2left.png
new file mode 100644
index 0000000..648c842
Binary files /dev/null and b/data/body/thunderbird/black_arm2left.png differ
diff --git a/data/body/thunderbird/black_arm2right.png b/data/body/thunderbird/black_arm2right.png
new file mode 100644
index 0000000..08500ce
Binary files /dev/null and b/data/body/thunderbird/black_arm2right.png differ
diff --git a/data/body/thunderbird/black_arm3left.png b/data/body/thunderbird/black_arm3left.png
new file mode 100644
index 0000000..8dca094
Binary files /dev/null and b/data/body/thunderbird/black_arm3left.png differ
diff --git a/data/body/thunderbird/black_arm3right.png b/data/body/thunderbird/black_arm3right.png
new file mode 100644
index 0000000..21a0aa2
Binary files /dev/null and b/data/body/thunderbird/black_arm3right.png differ
diff --git a/data/body/thunderbird/black_back.png b/data/body/thunderbird/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/thunderbird/black_back.png differ
diff --git a/data/body/thunderbird/black_body.png b/data/body/thunderbird/black_body.png
new file mode 100644
index 0000000..45bc6f9
Binary files /dev/null and b/data/body/thunderbird/black_body.png differ
diff --git a/data/body/thunderbird/black_eyelid.png b/data/body/thunderbird/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/thunderbird/black_eyelid.png differ
diff --git a/data/body/thunderbird/black_eyes.png b/data/body/thunderbird/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/thunderbird/black_eyes.png differ
diff --git a/data/body/thunderbird/black_footleft.png b/data/body/thunderbird/black_footleft.png
new file mode 100644
index 0000000..2d9f36f
Binary files /dev/null and b/data/body/thunderbird/black_footleft.png differ
diff --git a/data/body/thunderbird/black_footright.png b/data/body/thunderbird/black_footright.png
new file mode 100644
index 0000000..2d9f36f
Binary files /dev/null and b/data/body/thunderbird/black_footright.png differ
diff --git a/data/body/thunderbird/black_hair.png b/data/body/thunderbird/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/thunderbird/black_hair.png differ
diff --git a/data/body/thunderbird/black_head.png b/data/body/thunderbird/black_head.png
new file mode 100644
index 0000000..4ce6e1a
Binary files /dev/null and b/data/body/thunderbird/black_head.png differ
diff --git a/data/body/thunderbird/black_hornleft.png b/data/body/thunderbird/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/thunderbird/black_hornleft.png differ
diff --git a/data/body/thunderbird/black_hornright.png b/data/body/thunderbird/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/thunderbird/black_hornright.png differ
diff --git a/data/body/thunderbird/black_noze.png b/data/body/thunderbird/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/thunderbird/black_noze.png differ
diff --git a/data/body/thunderbird/black_pupil.png b/data/body/thunderbird/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/thunderbird/black_pupil.png differ
diff --git a/data/body/thunderbird/black_tail.png b/data/body/thunderbird/black_tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/thunderbird/black_tail.png differ
diff --git a/data/body/thunderbird/body.png b/data/body/thunderbird/body.png
new file mode 100644
index 0000000..b3a75fb
Binary files /dev/null and b/data/body/thunderbird/body.png differ
diff --git a/data/body/thunderbird/c1.png b/data/body/thunderbird/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/thunderbird/c1.png differ
diff --git a/data/body/thunderbird/c2.png b/data/body/thunderbird/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/thunderbird/c2.png differ
diff --git a/data/body/thunderbird/config.xml b/data/body/thunderbird/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/thunderbird/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/thunderbird/dead.png b/data/body/thunderbird/dead.png
new file mode 100644
index 0000000..f768715
Binary files /dev/null and b/data/body/thunderbird/dead.png differ
diff --git a/data/body/thunderbird/eyelid.png b/data/body/thunderbird/eyelid.png
new file mode 100644
index 0000000..27d85df
Binary files /dev/null and b/data/body/thunderbird/eyelid.png differ
diff --git a/data/body/thunderbird/eyes.png b/data/body/thunderbird/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/thunderbird/eyes.png differ
diff --git a/data/body/thunderbird/footleft.png b/data/body/thunderbird/footleft.png
new file mode 100644
index 0000000..6eca3fb
Binary files /dev/null and b/data/body/thunderbird/footleft.png differ
diff --git a/data/body/thunderbird/footright.png b/data/body/thunderbird/footright.png
new file mode 100644
index 0000000..6eca3fb
Binary files /dev/null and b/data/body/thunderbird/footright.png differ
diff --git a/data/body/thunderbird/hair.png b/data/body/thunderbird/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/thunderbird/hair.png differ
diff --git a/data/body/thunderbird/hat.png b/data/body/thunderbird/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/thunderbird/hat.png differ
diff --git a/data/body/thunderbird/head.png b/data/body/thunderbird/head.png
new file mode 100644
index 0000000..5cbef43
Binary files /dev/null and b/data/body/thunderbird/head.png differ
diff --git a/data/body/thunderbird/helmet.png b/data/body/thunderbird/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/thunderbird/helmet.png differ
diff --git a/data/body/wilberteam/hoop.png b/data/body/thunderbird/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/wilberteam/hoop.png
rename to data/body/thunderbird/hoop.png
diff --git a/data/body/thunderbird/hornleft.png b/data/body/thunderbird/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/thunderbird/hornleft.png differ
diff --git a/data/body/thunderbird/hornright.png b/data/body/thunderbird/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/thunderbird/hornright.png differ
diff --git a/data/body/wilberteam/hula.png b/data/body/thunderbird/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/wilberteam/hula.png
rename to data/body/thunderbird/hula.png
diff --git a/data/body/thunderbird/jetpack-fire.png b/data/body/thunderbird/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/thunderbird/jetpack-fire.png differ
diff --git a/data/body/thunderbird/jetpack.png b/data/body/thunderbird/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/thunderbird/jetpack.png differ
diff --git a/data/body/thunderbird/noze.png b/data/body/thunderbird/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/thunderbird/noze.png differ
diff --git a/data/body/thunderbird/pupil.png b/data/body/thunderbird/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/thunderbird/pupil.png differ
diff --git a/data/body/thunderbird/sick_head.png b/data/body/thunderbird/sick_head.png
new file mode 100644
index 0000000..0bae5ab
Binary files /dev/null and b/data/body/thunderbird/sick_head.png differ
diff --git a/data/body/thunderbird/tail.png b/data/body/thunderbird/tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/thunderbird/tail.png differ
diff --git a/data/body/thunderbird/yoyo.png b/data/body/thunderbird/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/thunderbird/yoyo.png differ
diff --git a/data/body/thunderbirdteam/black.png b/data/body/thunderbirdteam/black.png
deleted file mode 100644
index 7a62c6e..0000000
Binary files a/data/body/thunderbirdteam/black.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/body.png b/data/body/thunderbirdteam/body.png
deleted file mode 100644
index 983585d..0000000
Binary files a/data/body/thunderbirdteam/body.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/c1.png b/data/body/thunderbirdteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/thunderbirdteam/c1.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/c2.png b/data/body/thunderbirdteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/thunderbirdteam/c2.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/config.xml b/data/body/thunderbirdteam/config.xml
deleted file mode 100644
index c24ca08..0000000
--- a/data/body/thunderbirdteam/config.xml
+++ /dev/null
@@ -1,1954 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body">
-	<image file="body.png"/>
-	<anchor dx="9" dy="20"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="27"/>
-	<attached member_type="head" frame="*" dx="9" dy="6"/>
-	<attached member_type="wingright" frame="*" dx="5" dy="16"/>
-	<attached member_type="wingleft" frame="*" dx="12" dy="17"/>
-	<attached member_type="foot-left" frame="*" dx="12" dy="36"/>
-	<attached member_type="foot-right" frame="*" dx="7" dy="37"/>
-	<attached member_type="construct" frame="*" dx="6" dy="6"/>
-	<attached member_type="hula" frame="*" dx="14" dy="25"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="nozzle.png"/>
-	<anchor dx="-1" dy="1"/>
-	<attached member_type="eyes-normal" frame="*" dx="0" dy="0"/>
-	<attached member_type="hair" frame="*" dx="-3" dy="-3"/>
-	<attached member_type="helmet" frame="*" dx="-1" dy="4"/>
-</sprite>
-
-<sprite name="nozzle" type="nozzle">
-	<image file="nozzle.png"/>
-	<anchor dx="3" dy="2"/>
-</sprite>
-
-<sprite name="hair" type="hair">
-	<image file="hair.png"/>
-	<anchor dx="4" dy="4"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Wings ###### -->
-<sprite name="wingleft" type="wingleft">
-	<image file="wingleft.png"/>
-	<anchor dx="2" dy="4"/>
-</sprite>
-<sprite name="wingright" type="wingright">
-	<image file="wingright.png"/>
-	<anchor dx="9" dy="4"/>
-	<attached member_type="weapon" frame="*" dx="2" dy="22"/>
-	<attached member_type="yoyo" frame="*" dx="13" dy="25"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="1"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="1"/>
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet" >
-	<image file="helmet.png"/>
-	<anchor dx="9" dy="13"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1"/>
-	</image>
-	<anchor dx="29" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body">
-	<image file="dead.png" />
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<!-- ###### Black ###### -->
-<sprite name="body-black" type="body">
-	<image file="black.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="hair"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="hair"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="hair"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-</clothe>
-
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="hair"/>
-	<c_member name="helmet"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="hair"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Animation Tired ###### -->
-<clothe name="animation1">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="hair"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="hair"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="hoop"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="body-black"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="hair"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="hair"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" />
-		<member type="wingright" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-1" dy="1" />
-		<member type="wingright" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-2" dy="1" />
-		<member type="wingright" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-2" dy="0" />
-		<member type="wingright" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-2" dy="0" />
-		<member type="wingright" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-1" dy="1" />
-		<member type="wingright" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-10"/>
-		<member type="wingright" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-20"/>
-		<member type="wingright" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-30"/>
-		<member type="wingright" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-40"/>
-		<member type="wingright" angle="40"/>
-		<member type="foot-left" angle="40"/>
-		<member type="foot-right" angle="-40"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-30"/>
-		<member type="wingright" angle="30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-20"/>
-		<member type="wingright" angle="20"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-10"/>
-		<member type="wingright" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="20"/>
-		<member type="wingright" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="30"/>
-		<member type="wingright" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="40"/>
-		<member type="wingright" angle="-40"/>
-		<member type="foot-left" angle="-40"/>
-		<member type="foot-right" angle="40"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="30"/>
-		<member type="wingright" angle="-30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="20"/>
-		<member type="wingright" angle="-20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="wingleft" angle="90" follow_speed="false"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="wingright" angle="90" follow_speed="false"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="wingleft" angle="-90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="wingright" angle="-90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="wingleft" angle="5"/>
-		<member type="wingright" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="wingleft" angle="15"/>
-		<member type="wingright" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="wingleft" angle="5"/>
-		<member type="wingright" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="45"/>
-		<member type="wingright" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="-45"/>
-		<member type="wingright" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="45"/>
-		<member type="wingright" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="-45"/>
-		<member type="wingright" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0" />
-	</frame>
-</movement>
-
-
-
-
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wingright" scale_x="-1.0" dx="12" dy="1" angle="-90"/>
-		<member type="yoyo" angle="90" dx="-10" />
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="wingleft" angle="-47"/>
-		<member type="wingright" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="wingleft" angle="-94"/>
-		<member type="wingright" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="wingleft" angle="-141"/>
-		<member type="wingright" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="wingleft" angle="-190"/>
-		<member type="wingright" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="wingleft" angle="-190"/>
-		<member type="wingright" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="wingleft" angle="-190"/>
-		<member type="wingright" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="wingleft" angle="-141"/>
-		<member type="wingright" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="wingleft" angle="-94"/>
-		<member type="wingright" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="wingleft" angle="-47"/>
-		<member type="wingright" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-140"/>
-		<member type="wingright" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-95"/>
-		<member type="wingright" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-140"/>
-		<member type="wingright" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-95"/>
-		<member type="wingright" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-140"/>
-		<member type="wingright" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-95"/>
-		<member type="wingright" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="wingleft" angle="-10"/>
-		<member type="wingright" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="180" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-4" dy="10"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="175" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-4" dy="10"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="170" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-4" dy="10"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="175" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-4" dy="10"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="180" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-4" dy="10"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="185" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-4" dy="10"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="190" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-4" dy="10"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="185" dx="-4"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-4" dy="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wingleft" follow_speed="true"/>
-		<member type="wingright" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="150"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wingleft" angle="150" />
-		<member type="wingright" angle="150" />
-		<member type="foot-left" angle="50" />
-		<member type="foot-right" angle="50" />
-	</frame>
-	<frame>
-		<member type="wingleft" angle="20" />
-		<member type="wingright" angle="20" />
-		<member type="foot-left" angle="50" />
-		<member type="foot-right" angle="50" />
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="wingright" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="wingright" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="wingright" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="wingright" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="wingright" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="wingright" angle="40"/>
-		<member type="wingleft" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="wingright" angle="80"/>
-		<member type="wingleft" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="120"/>
-		<member type="wingleft" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="wingright" angle="120"/>
-		<member type="wingleft" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="wingright" angle="120"/>
-		<member type="wingleft" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="wingright" angle="110"/>
-		<member type="wingleft" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="wingright" angle="90"/>
-		<member type="wingleft" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="60"/>
-		<member type="wingleft" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="wingright" angle="30"/>
-		<member type="wingleft" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="wingright" angle="20"/>
-		<member type="wingleft" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="wingright" angle="10"/>
-		<member type="wingleft" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-50"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-</movement>
-
-</resources>
diff --git a/data/body/thunderbirdteam/dead.png b/data/body/thunderbirdteam/dead.png
deleted file mode 100644
index c1911ee..0000000
Binary files a/data/body/thunderbirdteam/dead.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/eyelid.png b/data/body/thunderbirdteam/eyelid.png
deleted file mode 100644
index 1a9ec6b..0000000
Binary files a/data/body/thunderbirdteam/eyelid.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/eyes.png b/data/body/thunderbirdteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/thunderbirdteam/eyes.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/foot.png b/data/body/thunderbirdteam/foot.png
deleted file mode 100644
index bac3256..0000000
Binary files a/data/body/thunderbirdteam/foot.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/hair.png b/data/body/thunderbirdteam/hair.png
deleted file mode 100644
index 0efc00b..0000000
Binary files a/data/body/thunderbirdteam/hair.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/helmet.png b/data/body/thunderbirdteam/helmet.png
deleted file mode 100644
index 37e5001..0000000
Binary files a/data/body/thunderbirdteam/helmet.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/nozzle.png b/data/body/thunderbirdteam/nozzle.png
deleted file mode 100644
index 57eaaf3..0000000
Binary files a/data/body/thunderbirdteam/nozzle.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/pupil.png b/data/body/thunderbirdteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/thunderbirdteam/pupil.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/wingleft.png b/data/body/thunderbirdteam/wingleft.png
deleted file mode 100644
index 43843c7..0000000
Binary files a/data/body/thunderbirdteam/wingleft.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/wingright.png b/data/body/thunderbirdteam/wingright.png
deleted file mode 100644
index 3646566..0000000
Binary files a/data/body/thunderbirdteam/wingright.png and /dev/null differ
diff --git a/data/body/thunderbirdteam/yoyo.png b/data/body/thunderbirdteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/thunderbirdteam/yoyo.png and /dev/null differ
diff --git a/data/body/tux/arm1left.png b/data/body/tux/arm1left.png
new file mode 100644
index 0000000..8b5a190
Binary files /dev/null and b/data/body/tux/arm1left.png differ
diff --git a/data/body/tux/arm1right.png b/data/body/tux/arm1right.png
new file mode 100644
index 0000000..8b5a190
Binary files /dev/null and b/data/body/tux/arm1right.png differ
diff --git a/data/body/tux/arm2left.png b/data/body/tux/arm2left.png
new file mode 100644
index 0000000..34e9ab6
Binary files /dev/null and b/data/body/tux/arm2left.png differ
diff --git a/data/body/tux/arm2right.png b/data/body/tux/arm2right.png
new file mode 100644
index 0000000..34e9ab6
Binary files /dev/null and b/data/body/tux/arm2right.png differ
diff --git a/data/body/tux/arm3left.png b/data/body/tux/arm3left.png
new file mode 100644
index 0000000..5a31960
Binary files /dev/null and b/data/body/tux/arm3left.png differ
diff --git a/data/body/tux/arm3right.png b/data/body/tux/arm3right.png
new file mode 100644
index 0000000..5a31960
Binary files /dev/null and b/data/body/tux/arm3right.png differ
diff --git a/data/body/tux/back.png b/data/body/tux/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/tux/back.png differ
diff --git a/data/body/tux/belt.png b/data/body/tux/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/tux/belt.png differ
diff --git a/data/body/tux/black_arm1left.png b/data/body/tux/black_arm1left.png
new file mode 100644
index 0000000..51cdee8
Binary files /dev/null and b/data/body/tux/black_arm1left.png differ
diff --git a/data/body/tux/black_arm1right.png b/data/body/tux/black_arm1right.png
new file mode 100644
index 0000000..51cdee8
Binary files /dev/null and b/data/body/tux/black_arm1right.png differ
diff --git a/data/body/tux/black_arm2left.png b/data/body/tux/black_arm2left.png
new file mode 100644
index 0000000..7511d59
Binary files /dev/null and b/data/body/tux/black_arm2left.png differ
diff --git a/data/body/tux/black_arm2right.png b/data/body/tux/black_arm2right.png
new file mode 100644
index 0000000..7511d59
Binary files /dev/null and b/data/body/tux/black_arm2right.png differ
diff --git a/data/body/tux/black_arm3left.png b/data/body/tux/black_arm3left.png
new file mode 100644
index 0000000..1a0a2f6
Binary files /dev/null and b/data/body/tux/black_arm3left.png differ
diff --git a/data/body/tux/black_arm3right.png b/data/body/tux/black_arm3right.png
new file mode 100644
index 0000000..1a0a2f6
Binary files /dev/null and b/data/body/tux/black_arm3right.png differ
diff --git a/data/body/tux/black_back.png b/data/body/tux/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/tux/black_back.png differ
diff --git a/data/body/tux/black_body.png b/data/body/tux/black_body.png
new file mode 100644
index 0000000..b3ad188
Binary files /dev/null and b/data/body/tux/black_body.png differ
diff --git a/data/body/tux/black_eyelid.png b/data/body/tux/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/tux/black_eyelid.png differ
diff --git a/data/body/tux/black_eyes.png b/data/body/tux/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/tux/black_eyes.png differ
diff --git a/data/body/tux/black_footleft.png b/data/body/tux/black_footleft.png
new file mode 100644
index 0000000..7505677
Binary files /dev/null and b/data/body/tux/black_footleft.png differ
diff --git a/data/body/tux/black_footright.png b/data/body/tux/black_footright.png
new file mode 100644
index 0000000..7505677
Binary files /dev/null and b/data/body/tux/black_footright.png differ
diff --git a/data/body/tux/black_hair.png b/data/body/tux/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/tux/black_hair.png differ
diff --git a/data/body/tux/black_head.png b/data/body/tux/black_head.png
new file mode 100644
index 0000000..668a146
Binary files /dev/null and b/data/body/tux/black_head.png differ
diff --git a/data/body/tux/black_hornleft.png b/data/body/tux/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/tux/black_hornleft.png differ
diff --git a/data/body/tux/black_hornright.png b/data/body/tux/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/tux/black_hornright.png differ
diff --git a/data/body/tux/black_noze.png b/data/body/tux/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/tux/black_noze.png differ
diff --git a/data/body/tux/black_pupil.png b/data/body/tux/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/tux/black_pupil.png differ
diff --git a/data/body/tux/black_tail.png b/data/body/tux/black_tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/tux/black_tail.png differ
diff --git a/data/body/tux/body.png b/data/body/tux/body.png
new file mode 100644
index 0000000..b2d5534
Binary files /dev/null and b/data/body/tux/body.png differ
diff --git a/data/body/tux/c1.png b/data/body/tux/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/tux/c1.png differ
diff --git a/data/body/tux/c2.png b/data/body/tux/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/tux/c2.png differ
diff --git a/data/body/tux/config.xml b/data/body/tux/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/tux/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/tux/dead.png b/data/body/tux/dead.png
new file mode 100644
index 0000000..e57374a
Binary files /dev/null and b/data/body/tux/dead.png differ
diff --git a/data/body/tux/eyelid.png b/data/body/tux/eyelid.png
new file mode 100644
index 0000000..2620d21
Binary files /dev/null and b/data/body/tux/eyelid.png differ
diff --git a/data/body/tux/eyes.png b/data/body/tux/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/tux/eyes.png differ
diff --git a/data/body/tux/footleft.png b/data/body/tux/footleft.png
new file mode 100644
index 0000000..9453654
Binary files /dev/null and b/data/body/tux/footleft.png differ
diff --git a/data/body/tux/footright.png b/data/body/tux/footright.png
new file mode 100644
index 0000000..9453654
Binary files /dev/null and b/data/body/tux/footright.png differ
diff --git a/data/body/tux/hair.png b/data/body/tux/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/tux/hair.png differ
diff --git a/data/body/tux/hat.png b/data/body/tux/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/tux/hat.png differ
diff --git a/data/body/tux/head.png b/data/body/tux/head.png
new file mode 100644
index 0000000..9e4c439
Binary files /dev/null and b/data/body/tux/head.png differ
diff --git a/data/body/tux/helmet.png b/data/body/tux/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/tux/helmet.png differ
diff --git a/data/body/workraveteam/hoop.png b/data/body/tux/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/workraveteam/hoop.png
rename to data/body/tux/hoop.png
diff --git a/data/body/tux/hornleft.png b/data/body/tux/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/tux/hornleft.png differ
diff --git a/data/body/tux/hornright.png b/data/body/tux/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/tux/hornright.png differ
diff --git a/data/body/workraveteam/hula.png b/data/body/tux/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/workraveteam/hula.png
rename to data/body/tux/hula.png
diff --git a/data/body/tux/jetpack-fire.png b/data/body/tux/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/tux/jetpack-fire.png differ
diff --git a/data/body/tux/jetpack.png b/data/body/tux/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/tux/jetpack.png differ
diff --git a/data/body/tux/noze.png b/data/body/tux/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/tux/noze.png differ
diff --git a/data/body/tux/pupil.png b/data/body/tux/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/tux/pupil.png differ
diff --git a/data/body/tux/sick_head.png b/data/body/tux/sick_head.png
new file mode 100644
index 0000000..b516868
Binary files /dev/null and b/data/body/tux/sick_head.png differ
diff --git a/data/body/tux/tail.png b/data/body/tux/tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/tux/tail.png differ
diff --git a/data/body/tux/yoyo.png b/data/body/tux/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/tux/yoyo.png differ
diff --git a/data/body/tuxteam/black.png b/data/body/tuxteam/black.png
deleted file mode 100644
index dfc4e4a..0000000
Binary files a/data/body/tuxteam/black.png and /dev/null differ
diff --git a/data/body/tuxteam/body.png b/data/body/tuxteam/body.png
deleted file mode 100644
index 6f6a14e..0000000
Binary files a/data/body/tuxteam/body.png and /dev/null differ
diff --git a/data/body/tuxteam/c1.png b/data/body/tuxteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/tuxteam/c1.png and /dev/null differ
diff --git a/data/body/tuxteam/c2.png b/data/body/tuxteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/tuxteam/c2.png and /dev/null differ
diff --git a/data/body/tuxteam/config.xml b/data/body/tuxteam/config.xml
deleted file mode 100644
index 2d4e25f..0000000
--- a/data/body/tuxteam/config.xml
+++ /dev/null
@@ -1,1939 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" /> 
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body">
-	<image file="body.png"/>
-	<anchor dx="9" dy="20"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="27"/>
-	<attached member_type="head" frame="*" dx="9" dy="9"/>
-	<attached member_type="wingright" frame="*" dx="5" dy="17"/>
-	<attached member_type="wingleft" frame="*" dx="8" dy="16"/>
-	<attached member_type="foot-left" frame="*" dx="12" dy="38"/>
-	<attached member_type="foot-right" frame="*" dx="7" dy="39"/>
-	<attached member_type="construct" frame="*" dx="6" dy="8"/>
-	<attached member_type="hula" frame="*" dx="14" dy="25"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="nozzle.png"/>
-	<anchor dx="-1" dy="1"/>
-	<attached member_type="eyes-normal" frame="*" dx="1" dy="-2"/>
-	<attached member_type="helmet" frame="*" dx="0" dy="4"/>
-</sprite>
-
-<sprite name="nozzle" type="nozzle">
-	<image file="nozzle.png"/>
-	<anchor dx="3" dy="2"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Wings ###### -->
-<sprite name="wingleft" type="wingleft">
-	<image file="wing.png"/>
-	<anchor dx="3" dy="1"/>
-</sprite>
-<sprite name="wingright" type="wingright">
-	<image file="wing.png"/>
-	<anchor dx="3" dy="1"/>
-	<attached member_type="weapon" frame="*" dx="4" dy="20"/>
-	<attached member_type="yoyo" frame="*" dx="27" dy="17"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="1"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="1"/>
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet" >
-	<image file="helmet.png"/>
-	<anchor dx="9" dy="13"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1"/>
-	</image>
-	<anchor dx="29" dy="0"/>
-	<animation speed="150"/>
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body">
-	<image file="dead.png" />
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-<!-- ###### Black ###### -->
-<sprite name="body-black" type="body">
-	<image file="black.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-</clothe>
-
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="helmet"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-	<c_member name="hoop"/>
-</clothe>
-
-<!-- ###### Animation Tired ###### -->
-<clothe name="animation1">
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="body-black"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="wingleft"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="wingright"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" />
-		<member type="wingright" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-1" dy="1" />
-		<member type="wingright" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-2" dy="1" />
-		<member type="wingright" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-2" dy="0" />
-		<member type="wingright" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-2" dy="0" />
-		<member type="wingright" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" dx="-1" dy="1" />
-		<member type="wingright" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-40"/>
-		<member type="wingright" angle="20"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-30"/>
-		<member type="wingright" angle="10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-20"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-10"/>
-		<member type="wingright" angle="-10"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="-20"/>
-		<member type="foot-left" angle="40"/>
-		<member type="foot-right" angle="-40"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="-30"/>
-		<member type="foot-left" angle="30"/>
-		<member type="foot-right" angle="-30"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="20"/>
-		<member type="wingright" angle="-40"/>
-		<member type="foot-left" angle="20"/>
-		<member type="foot-right" angle="-20"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="30"/>
-		<member type="wingright" angle="-30"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="40"/>
-		<member type="wingright" angle="-20"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="30"/>
-		<member type="wingright" angle="-10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="20"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="10"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="20"/>
-		<member type="foot-left" angle="-40"/>
-		<member type="foot-right" angle="40"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-10"/>
-		<member type="wingright" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-20"/>
-		<member type="wingright" angle="40"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingleft" angle="-30"/>
-		<member type="wingright" angle="30"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="wingleft" angle="90" follow_speed="false"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="wingright" angle="90" follow_speed="false"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="head" follow_half_crosshair="false"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="wingleft" angle="-90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="wingright" angle="-90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="wingleft" angle="5"/>
-		<member type="wingright" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="wingleft" angle="15"/>
-		<member type="wingright" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="wingleft" angle="10"/>
-		<member type="wingright" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="wingleft" angle="5"/>
-		<member type="wingright" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="45"/>
-		<member type="wingright" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="-45"/>
-		<member type="wingright" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="45"/>
-		<member type="wingright" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="-45"/>
-		<member type="wingright" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true"/> 
-		<member type="head" angle="-140"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0" />
-	</frame>
-</movement>
-
-
-
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wingright" angle="-90"/>
-		<member type="yoyo" angle="90"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="wingleft" angle="-47"/>
-		<member type="wingright" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="wingleft" angle="-94"/>
-		<member type="wingright" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="wingleft" angle="-141"/>
-		<member type="wingright" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="wingleft" angle="-190"/>
-		<member type="wingright" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="wingleft" angle="-190"/>
-		<member type="wingright" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="wingleft" angle="-190"/>
-		<member type="wingright" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="wingleft" angle="-141"/>
-		<member type="wingright" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="wingleft" angle="-94"/>
-		<member type="wingright" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="wingleft" angle="-47"/>
-		<member type="wingright" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-140"/>
-		<member type="wingright" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-95"/>
-		<member type="wingright" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-140"/>
-		<member type="wingright" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-95"/>
-		<member type="wingright" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-140"/>
-		<member type="wingright" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-130"/>
-		<member type="wingright" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-120"/>
-		<member type="wingright" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-110"/>
-		<member type="wingright" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-95"/>
-		<member type="wingright" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-100"/>
-		<member type="wingright" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="-105"/>
-		<member type="wingright" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="wingleft" angle="-10"/>
-		<member type="wingright" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-2" dy="12"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-2" dy="12"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-2" dy="12"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-2" dy="12"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-2" dy="12"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-2" dy="12"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-2" dy="12"/>
-	</frame>
-	<frame>
-		<member type="wingleft" angle="0"/>
-		<member type="wingright" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-2" dy="12"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wingleft" angle="20" />
-		<member type="wingright" angle="20" />
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="150"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2"/>
-	<frame>
-		<member type="wingleft" angle="150" />
-		<member type="wingright" angle="150" />
-		<member type="foot-left" angle="90" />
-		<member type="foot-right" angle="90" />
-	</frame>
-	<frame>
-		<member type="wingleft" angle="20" />
-		<member type="wingright" angle="20" />
-		<member type="foot-left" angle="90" />
-		<member type="foot-right" angle="90" />
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="wingright" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="wingright" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="wingright" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="wingright" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="wingright" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="wingright" angle="40"/>
-		<member type="wingleft" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="wingright" angle="80"/>
-		<member type="wingleft" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="120"/>
-		<member type="wingleft" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="wingright" angle="120"/>
-		<member type="wingleft" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="wingright" angle="120"/>
-		<member type="wingleft" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="wingright" angle="110"/>
-		<member type="wingleft" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="wingright" angle="90"/>
-		<member type="wingleft" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="wingright" angle="60"/>
-		<member type="wingleft" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="wingright" angle="30"/>
-		<member type="wingleft" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="wingright" angle="20"/>
-		<member type="wingleft" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="wingright" angle="10"/>
-		<member type="wingleft" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-3" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-4" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-5" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-6" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-100"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-7" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-7" dx="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-65"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="wingright" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-135" />
-		<member type="wingleft" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-90" />
-		<member type="wingleft" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="wingright" angle="-120" />
-		<member type="wingleft" angle="-60" />
-	</frame>
-</movement>
-
-</resources>
diff --git a/data/body/tuxteam/dead.png b/data/body/tuxteam/dead.png
deleted file mode 100644
index 211336e..0000000
Binary files a/data/body/tuxteam/dead.png and /dev/null differ
diff --git a/data/body/tuxteam/eyelid.png b/data/body/tuxteam/eyelid.png
deleted file mode 100644
index 3350e4c..0000000
Binary files a/data/body/tuxteam/eyelid.png and /dev/null differ
diff --git a/data/body/tuxteam/eyes.png b/data/body/tuxteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/tuxteam/eyes.png and /dev/null differ
diff --git a/data/body/tuxteam/foot.png b/data/body/tuxteam/foot.png
deleted file mode 100644
index eb491c9..0000000
Binary files a/data/body/tuxteam/foot.png and /dev/null differ
diff --git a/data/body/tuxteam/helmet.png b/data/body/tuxteam/helmet.png
deleted file mode 100644
index 621fd62..0000000
Binary files a/data/body/tuxteam/helmet.png and /dev/null differ
diff --git a/data/body/tuxteam/nozzle.png b/data/body/tuxteam/nozzle.png
deleted file mode 100644
index 5303bac..0000000
Binary files a/data/body/tuxteam/nozzle.png and /dev/null differ
diff --git a/data/body/tuxteam/pupil.png b/data/body/tuxteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/tuxteam/pupil.png and /dev/null differ
diff --git a/data/body/tuxteam/wing.png b/data/body/tuxteam/wing.png
deleted file mode 100644
index ef698da..0000000
Binary files a/data/body/tuxteam/wing.png and /dev/null differ
diff --git a/data/body/tuxteam/yoyo.png b/data/body/tuxteam/yoyo.png
deleted file mode 100644
index 77ff9b6..0000000
Binary files a/data/body/tuxteam/yoyo.png and /dev/null differ
diff --git a/data/body/wilber/arm1left.png b/data/body/wilber/arm1left.png
new file mode 100644
index 0000000..3ec89c8
Binary files /dev/null and b/data/body/wilber/arm1left.png differ
diff --git a/data/body/wilber/arm1right.png b/data/body/wilber/arm1right.png
new file mode 100644
index 0000000..3ec89c8
Binary files /dev/null and b/data/body/wilber/arm1right.png differ
diff --git a/data/body/wilber/arm2left.png b/data/body/wilber/arm2left.png
new file mode 100644
index 0000000..930e9dc
Binary files /dev/null and b/data/body/wilber/arm2left.png differ
diff --git a/data/body/wilber/arm2right.png b/data/body/wilber/arm2right.png
new file mode 100644
index 0000000..930e9dc
Binary files /dev/null and b/data/body/wilber/arm2right.png differ
diff --git a/data/body/wilber/arm3left.png b/data/body/wilber/arm3left.png
new file mode 100644
index 0000000..4acd1ac
Binary files /dev/null and b/data/body/wilber/arm3left.png differ
diff --git a/data/body/wilber/arm3right.png b/data/body/wilber/arm3right.png
new file mode 100644
index 0000000..4acd1ac
Binary files /dev/null and b/data/body/wilber/arm3right.png differ
diff --git a/data/body/wilber/back.png b/data/body/wilber/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/wilber/back.png differ
diff --git a/data/body/wilber/belt.png b/data/body/wilber/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/wilber/belt.png differ
diff --git a/data/body/wilber/black_arm1left.png b/data/body/wilber/black_arm1left.png
new file mode 100644
index 0000000..748c428
Binary files /dev/null and b/data/body/wilber/black_arm1left.png differ
diff --git a/data/body/wilber/black_arm1right.png b/data/body/wilber/black_arm1right.png
new file mode 100644
index 0000000..748c428
Binary files /dev/null and b/data/body/wilber/black_arm1right.png differ
diff --git a/data/body/wilber/black_arm2left.png b/data/body/wilber/black_arm2left.png
new file mode 100644
index 0000000..0c84cf2
Binary files /dev/null and b/data/body/wilber/black_arm2left.png differ
diff --git a/data/body/wilber/black_arm2right.png b/data/body/wilber/black_arm2right.png
new file mode 100644
index 0000000..0c84cf2
Binary files /dev/null and b/data/body/wilber/black_arm2right.png differ
diff --git a/data/body/wilber/black_arm3left.png b/data/body/wilber/black_arm3left.png
new file mode 100644
index 0000000..f94de15
Binary files /dev/null and b/data/body/wilber/black_arm3left.png differ
diff --git a/data/body/wilber/black_arm3right.png b/data/body/wilber/black_arm3right.png
new file mode 100644
index 0000000..f94de15
Binary files /dev/null and b/data/body/wilber/black_arm3right.png differ
diff --git a/data/body/wilber/black_back.png b/data/body/wilber/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/wilber/black_back.png differ
diff --git a/data/body/wilber/black_body.png b/data/body/wilber/black_body.png
new file mode 100644
index 0000000..f65c7ab
Binary files /dev/null and b/data/body/wilber/black_body.png differ
diff --git a/data/body/wilber/black_eyelid.png b/data/body/wilber/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/wilber/black_eyelid.png differ
diff --git a/data/body/wilber/black_eyes.png b/data/body/wilber/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/wilber/black_eyes.png differ
diff --git a/data/body/wilber/black_footleft.png b/data/body/wilber/black_footleft.png
new file mode 100644
index 0000000..698e6aa
Binary files /dev/null and b/data/body/wilber/black_footleft.png differ
diff --git a/data/body/wilber/black_footright.png b/data/body/wilber/black_footright.png
new file mode 100644
index 0000000..698e6aa
Binary files /dev/null and b/data/body/wilber/black_footright.png differ
diff --git a/data/body/wilber/black_hair.png b/data/body/wilber/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/wilber/black_hair.png differ
diff --git a/data/body/wilber/black_head.png b/data/body/wilber/black_head.png
new file mode 100644
index 0000000..8a17ba2
Binary files /dev/null and b/data/body/wilber/black_head.png differ
diff --git a/data/body/wilber/black_hornleft.png b/data/body/wilber/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/wilber/black_hornleft.png differ
diff --git a/data/body/wilber/black_hornright.png b/data/body/wilber/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/wilber/black_hornright.png differ
diff --git a/data/body/wilber/black_noze.png b/data/body/wilber/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/wilber/black_noze.png differ
diff --git a/data/body/wilber/black_pupil.png b/data/body/wilber/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/wilber/black_pupil.png differ
diff --git a/data/body/wilber/black_tail.png b/data/body/wilber/black_tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/wilber/black_tail.png differ
diff --git a/data/body/wilber/body.png b/data/body/wilber/body.png
new file mode 100644
index 0000000..95bbe1e
Binary files /dev/null and b/data/body/wilber/body.png differ
diff --git a/data/body/wilber/c1.png b/data/body/wilber/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/wilber/c1.png differ
diff --git a/data/body/wilber/c2.png b/data/body/wilber/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/wilber/c2.png differ
diff --git a/data/body/wilber/config.xml b/data/body/wilber/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/wilber/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/wilber/dead.png b/data/body/wilber/dead.png
new file mode 100644
index 0000000..bd69c2f
Binary files /dev/null and b/data/body/wilber/dead.png differ
diff --git a/data/body/wilber/eyelid.png b/data/body/wilber/eyelid.png
new file mode 100644
index 0000000..3345294
Binary files /dev/null and b/data/body/wilber/eyelid.png differ
diff --git a/data/body/wilber/eyes.png b/data/body/wilber/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/wilber/eyes.png differ
diff --git a/data/body/wilber/footleft.png b/data/body/wilber/footleft.png
new file mode 100644
index 0000000..e98d54c
Binary files /dev/null and b/data/body/wilber/footleft.png differ
diff --git a/data/body/wilber/footright.png b/data/body/wilber/footright.png
new file mode 100644
index 0000000..e98d54c
Binary files /dev/null and b/data/body/wilber/footright.png differ
diff --git a/data/body/wilber/hair.png b/data/body/wilber/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/wilber/hair.png differ
diff --git a/data/body/wilber/hat.png b/data/body/wilber/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/wilber/hat.png differ
diff --git a/data/body/wilber/head.png b/data/body/wilber/head.png
new file mode 100644
index 0000000..658626f
Binary files /dev/null and b/data/body/wilber/head.png differ
diff --git a/data/body/wilber/helmet.png b/data/body/wilber/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/wilber/helmet.png differ
diff --git a/data/body/beastieteam/hoop.png b/data/body/wilber/hoop.png
old mode 100644
new mode 100755
similarity index 100%
copy from data/body/beastieteam/hoop.png
copy to data/body/wilber/hoop.png
diff --git a/data/body/wilber/hornleft.png b/data/body/wilber/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/wilber/hornleft.png differ
diff --git a/data/body/wilber/hornright.png b/data/body/wilber/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/wilber/hornright.png differ
diff --git a/data/body/beastieteam/hula.png b/data/body/wilber/hula.png
old mode 100644
new mode 100755
similarity index 100%
copy from data/body/beastieteam/hula.png
copy to data/body/wilber/hula.png
diff --git a/data/body/wilber/jetpack-fire.png b/data/body/wilber/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/wilber/jetpack-fire.png differ
diff --git a/data/body/wilber/jetpack.png b/data/body/wilber/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/wilber/jetpack.png differ
diff --git a/data/body/wilber/noze.png b/data/body/wilber/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/wilber/noze.png differ
diff --git a/data/body/wilber/pupil.png b/data/body/wilber/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/wilber/pupil.png differ
diff --git a/data/body/wilber/sick_head.png b/data/body/wilber/sick_head.png
new file mode 100644
index 0000000..cbbfac1
Binary files /dev/null and b/data/body/wilber/sick_head.png differ
diff --git a/data/body/wilber/tail.png b/data/body/wilber/tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/wilber/tail.png differ
diff --git a/data/body/wilber/yoyo.png b/data/body/wilber/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/wilber/yoyo.png differ
diff --git a/data/body/wilberteam/arm.png b/data/body/wilberteam/arm.png
deleted file mode 100644
index 3c44704..0000000
Binary files a/data/body/wilberteam/arm.png and /dev/null differ
diff --git a/data/body/wilberteam/black.png b/data/body/wilberteam/black.png
deleted file mode 100644
index 1ffc832..0000000
Binary files a/data/body/wilberteam/black.png and /dev/null differ
diff --git a/data/body/wilberteam/body.png b/data/body/wilberteam/body.png
deleted file mode 100644
index 5e2321d..0000000
Binary files a/data/body/wilberteam/body.png and /dev/null differ
diff --git a/data/body/wilberteam/c1.png b/data/body/wilberteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/wilberteam/c1.png and /dev/null differ
diff --git a/data/body/wilberteam/c2.png b/data/body/wilberteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/wilberteam/c2.png and /dev/null differ
diff --git a/data/body/wilberteam/config.xml b/data/body/wilberteam/config.xml
deleted file mode 100644
index bbc836e..0000000
--- a/data/body/wilberteam/config.xml
+++ /dev/null
@@ -1,1956 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body" >
-	<image file="body.png"/>
-	<anchor dx="16" dy="17"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="18"/>
-	<attached member_type="head" frame="*" dx="6" dy="1"/>
-	<attached member_type="arm-right"  frame="*" dx="4" dy="8"/>
-	<attached member_type="arm-left"  frame="*" dx="8" dy="7"/>
-	<attached member_type="foot-left"  frame="*" dx="11" dy="22"/>
-	<attached member_type="foot-right"  frame="*" dx="5" dy="24"/>
-	<attached member_type="jetpack-belt"  frame="*" dx="1" dy="17"/>
-	<attached member_type="jetpack-right"  frame="*" dx="1" dy="14"/>
-	<attached member_type="jetpack-left"  frame="*" dx="9" dy="14"/>
-	<attached member_type="construct" frame="*" dx="5" dy="-2"/>
-	<attached member_type="hula" frame="*" dx="14" dy="17"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head" type="head">
-	<image file="head.png"/>
-	<anchor dx="7" dy="11"/>
-	<attached member_type="eyes-normal" frame="*" dx="7" dy="6"/>
-	<attached member_type="helmet" frame="*" dx="7" dy="9"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Arms ###### -->
-<sprite name="arm-left" type="arm-left" >
-	<image file="arm.png"/>
-	<anchor dx="3" dy="0"/>
-</sprite>
-
-<sprite name="arm-right" type="arm-right" >
-	<image file="arm.png"/>
-	<anchor dx="3" dy="0"/>
-	<attached member_type="weapon" frame="*" dx="3" dy="16"/>
-	<attached member_type="yoyo" frame="*" dx="3" dy="16"/>
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left" type="foot-left" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="foot-right" type="foot-right" >
-	<image file="foot.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<!-- ###### Jetpack ###### -->
-<sprite name="jetpack-belt" type="jetpack-belt" >
-	<image file="jetpack-belt.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-right" type="jetpack-right" >
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-right"  frame="*" dx="3" dy="13"/>
-</sprite>
-
-<sprite name="jetpack-left" type="jetpack-left" >
-	<image file="jetpack.png"/>
-	<anchor dx="4" dy="10"/>
-	<attached member_type="jetpack-fire-left"  frame="*" dx="3" dy="13"/>
-</sprite>
-
-<sprite name="jetpack-fire-right" type="jetpack-fire-right" >
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-fire-left" type="jetpack-fire-left" >
-	<image file="jetpack-fire.png"/>
-	<anchor dx="2" dy="0"/>
-
-</sprite>
-
-<!-- ###### Helmet ###### -->
-<sprite name="helmet" type="helmet" >
-	<image file="helmet.png"/>
-	<anchor dx="9" dy="13"/>
-</sprite>
-
-<!-- ###### Yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1" />
-	</image>
-	<anchor dx="29" dy="0"/>
-	<animation speed="150" />
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body" >
-	<image file="dead.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Black ###### -->
-<sprite name="body-black" type="body" >
-	<image file="black.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="jetpack-right"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="jetpack-fire-left"/>
-	<c_member name="jetpack-left"/>
-	<c_member name="jetpack-fire-right"/>
-	<c_member name="jetpack-right"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="helmet"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="yoyo"/>
-	<c_member name="arm-right"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="hoop"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Black ###### -->
-<clothe name="black">
-	<c_member name="body-black"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="arm-left"/>
-	<c_member name="foot-left"/>
-	<c_member name="body-normal"/>
-	<c_member name="head"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right"/>
-	<c_member name="arm-right"/>
-	<c_member name="weapon"/>
-</clothe>
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />		
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40" />
-		<member type="arm-right" angle="40" />
-		<member type="foot-left" angle="40" />
-		<member type="foot-right" angle="-40" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" />
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" />
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" />
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" />
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="40" />
-		<member type="arm-right" angle="-40" />
-		<member type="foot-left" angle="-40" />
-		<member type="foot-right" angle="40" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" />
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" />
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" />
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />	
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />	
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-<movement name="black" speed="1000">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0" />
-	</frame>
-</movement>
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-right" angle="-90"/>
-		<member type="yoyo" angle="90"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="8"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="8"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-1" dy="8"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="8"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="8"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="8"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-1" dy="8"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="8"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - no fire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-		<member type="jetpack-fire" dy="-5" /> <!-- hide the fire under the jetpack -->
-	</frame>
-</movement>
-
-<!-- ###### Jetpack - fire ###### -->
-<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="jetpack-fire-right" dy="0" />
-		<member type="jetpack-fire-left" dy="0" />
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="30" />
-	</frame>
-	<frame>
-		<member type="jetpack-fire-right" dy="7" />
-		<member type="jetpack-fire-left" dy="7" />
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="30" />
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-53"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-
-</resources>
diff --git a/data/body/wilberteam/dead.png b/data/body/wilberteam/dead.png
deleted file mode 100644
index 4cd5e5c..0000000
Binary files a/data/body/wilberteam/dead.png and /dev/null differ
diff --git a/data/body/wilberteam/eyelid.png b/data/body/wilberteam/eyelid.png
deleted file mode 100644
index 0b38dd4..0000000
Binary files a/data/body/wilberteam/eyelid.png and /dev/null differ
diff --git a/data/body/wilberteam/eyes.png b/data/body/wilberteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/wilberteam/eyes.png and /dev/null differ
diff --git a/data/body/wilberteam/foot.png b/data/body/wilberteam/foot.png
deleted file mode 100644
index b11984d..0000000
Binary files a/data/body/wilberteam/foot.png and /dev/null differ
diff --git a/data/body/wilberteam/head.png b/data/body/wilberteam/head.png
deleted file mode 100644
index a4e9a63..0000000
Binary files a/data/body/wilberteam/head.png and /dev/null differ
diff --git a/data/body/wilberteam/helmet.png b/data/body/wilberteam/helmet.png
deleted file mode 100644
index 6d4ba74..0000000
Binary files a/data/body/wilberteam/helmet.png and /dev/null differ
diff --git a/data/body/wilberteam/jetpack-belt.png b/data/body/wilberteam/jetpack-belt.png
deleted file mode 100644
index c58fe3f..0000000
Binary files a/data/body/wilberteam/jetpack-belt.png and /dev/null differ
diff --git a/data/body/wilberteam/jetpack-fire.png b/data/body/wilberteam/jetpack-fire.png
deleted file mode 100644
index c24e41d..0000000
Binary files a/data/body/wilberteam/jetpack-fire.png and /dev/null differ
diff --git a/data/body/wilberteam/jetpack.png b/data/body/wilberteam/jetpack.png
deleted file mode 100644
index 4a5a90e..0000000
Binary files a/data/body/wilberteam/jetpack.png and /dev/null differ
diff --git a/data/body/wilberteam/pupil.png b/data/body/wilberteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/wilberteam/pupil.png and /dev/null differ
diff --git a/data/body/wilberteam/yoyo.png b/data/body/wilberteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/wilberteam/yoyo.png and /dev/null differ
diff --git a/data/body/workrave/arm1left.png b/data/body/workrave/arm1left.png
new file mode 100644
index 0000000..aba6072
Binary files /dev/null and b/data/body/workrave/arm1left.png differ
diff --git a/data/body/workrave/arm1right.png b/data/body/workrave/arm1right.png
new file mode 100644
index 0000000..aba6072
Binary files /dev/null and b/data/body/workrave/arm1right.png differ
diff --git a/data/body/workrave/arm2left.png b/data/body/workrave/arm2left.png
new file mode 100644
index 0000000..bfb57de
Binary files /dev/null and b/data/body/workrave/arm2left.png differ
diff --git a/data/body/workrave/arm2right.png b/data/body/workrave/arm2right.png
new file mode 100644
index 0000000..bfb57de
Binary files /dev/null and b/data/body/workrave/arm2right.png differ
diff --git a/data/body/workrave/arm3left.png b/data/body/workrave/arm3left.png
new file mode 100644
index 0000000..805a101
Binary files /dev/null and b/data/body/workrave/arm3left.png differ
diff --git a/data/body/workrave/arm3right.png b/data/body/workrave/arm3right.png
new file mode 100644
index 0000000..805a101
Binary files /dev/null and b/data/body/workrave/arm3right.png differ
diff --git a/data/body/workrave/back.png b/data/body/workrave/back.png
new file mode 100644
index 0000000..0bb9bdc
Binary files /dev/null and b/data/body/workrave/back.png differ
diff --git a/data/body/workrave/belt.png b/data/body/workrave/belt.png
new file mode 100644
index 0000000..cab5ebc
Binary files /dev/null and b/data/body/workrave/belt.png differ
diff --git a/data/body/workrave/black_arm1left.png b/data/body/workrave/black_arm1left.png
new file mode 100644
index 0000000..6f4f34d
Binary files /dev/null and b/data/body/workrave/black_arm1left.png differ
diff --git a/data/body/workrave/black_arm1right.png b/data/body/workrave/black_arm1right.png
new file mode 100644
index 0000000..6f4f34d
Binary files /dev/null and b/data/body/workrave/black_arm1right.png differ
diff --git a/data/body/workrave/black_arm2left.png b/data/body/workrave/black_arm2left.png
new file mode 100644
index 0000000..575db61
Binary files /dev/null and b/data/body/workrave/black_arm2left.png differ
diff --git a/data/body/workrave/black_arm2right.png b/data/body/workrave/black_arm2right.png
new file mode 100644
index 0000000..575db61
Binary files /dev/null and b/data/body/workrave/black_arm2right.png differ
diff --git a/data/body/workrave/black_arm3left.png b/data/body/workrave/black_arm3left.png
new file mode 100644
index 0000000..0bf2b12
Binary files /dev/null and b/data/body/workrave/black_arm3left.png differ
diff --git a/data/body/workrave/black_arm3right.png b/data/body/workrave/black_arm3right.png
new file mode 100644
index 0000000..0bf2b12
Binary files /dev/null and b/data/body/workrave/black_arm3right.png differ
diff --git a/data/body/workrave/black_back.png b/data/body/workrave/black_back.png
new file mode 100644
index 0000000..c7d3c9c
Binary files /dev/null and b/data/body/workrave/black_back.png differ
diff --git a/data/body/workrave/black_body.png b/data/body/workrave/black_body.png
new file mode 100644
index 0000000..175b914
Binary files /dev/null and b/data/body/workrave/black_body.png differ
diff --git a/data/body/workrave/black_eyelid.png b/data/body/workrave/black_eyelid.png
new file mode 100644
index 0000000..88c26ba
Binary files /dev/null and b/data/body/workrave/black_eyelid.png differ
diff --git a/data/body/workrave/black_eyes.png b/data/body/workrave/black_eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/workrave/black_eyes.png differ
diff --git a/data/body/workrave/black_footleft.png b/data/body/workrave/black_footleft.png
new file mode 100644
index 0000000..0f17f4e
Binary files /dev/null and b/data/body/workrave/black_footleft.png differ
diff --git a/data/body/workrave/black_footright.png b/data/body/workrave/black_footright.png
new file mode 100644
index 0000000..3dd9283
Binary files /dev/null and b/data/body/workrave/black_footright.png differ
diff --git a/data/body/workrave/black_hair.png b/data/body/workrave/black_hair.png
new file mode 100644
index 0000000..0fe8702
Binary files /dev/null and b/data/body/workrave/black_hair.png differ
diff --git a/data/body/workrave/black_head.png b/data/body/workrave/black_head.png
new file mode 100644
index 0000000..d687400
Binary files /dev/null and b/data/body/workrave/black_head.png differ
diff --git a/data/body/workrave/black_hornleft.png b/data/body/workrave/black_hornleft.png
new file mode 100644
index 0000000..e63baff
Binary files /dev/null and b/data/body/workrave/black_hornleft.png differ
diff --git a/data/body/workrave/black_hornright.png b/data/body/workrave/black_hornright.png
new file mode 100644
index 0000000..7a166d6
Binary files /dev/null and b/data/body/workrave/black_hornright.png differ
diff --git a/data/body/workrave/black_noze.png b/data/body/workrave/black_noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/workrave/black_noze.png differ
diff --git a/data/body/workrave/black_pupil.png b/data/body/workrave/black_pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/workrave/black_pupil.png differ
diff --git a/data/body/workrave/black_tail.png b/data/body/workrave/black_tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/workrave/black_tail.png differ
diff --git a/data/body/workrave/blackfootright.png b/data/body/workrave/blackfootright.png
new file mode 100644
index 0000000..3dd9283
Binary files /dev/null and b/data/body/workrave/blackfootright.png differ
diff --git a/data/body/workrave/body.png b/data/body/workrave/body.png
new file mode 100644
index 0000000..41600d3
Binary files /dev/null and b/data/body/workrave/body.png differ
diff --git a/data/body/workrave/c1.png b/data/body/workrave/c1.png
new file mode 100644
index 0000000..6d4f91a
Binary files /dev/null and b/data/body/workrave/c1.png differ
diff --git a/data/body/workrave/c2.png b/data/body/workrave/c2.png
new file mode 100644
index 0000000..9a17ce1
Binary files /dev/null and b/data/body/workrave/c2.png differ
diff --git a/data/body/workrave/config.xml b/data/body/workrave/config.xml
new file mode 100644
index 0000000..f64f52f
--- /dev/null
+++ b/data/body/workrave/config.xml
@@ -0,0 +1,2945 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../body.dtd">
+<resources>
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    AUTHOR     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<author>
+  <name>yeKcim</name>
+  <email>yekcim AT crocobox DOT org</email>
+</author>
+
+
+
+
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############     ALIAS     ##############
+       ###############             ###############
+       ###########################################   -->
+
+<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select"/>
+<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot"/>
+<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot"/>
+<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot"/>
+<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot"/>
+<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot"/>
+<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot"/>
+<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot"/>
+<alias movement="weapon-m16-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select"/>
+<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select"/>
+<alias movement="fly-black" correspond_to="fly"/>
+<alias movement="weapon-polecatlauncher-select" correspond_to="weapon-gnulauncher-select"/>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############   SKELETON    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Body ###### -->
+<sprite name="body" type="body">
+	<image file="body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="6" dy="3"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="4" dy="7"/>
+	<attached member_type="arm-left" frame="*" dx="9" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="11" dy="24"/>
+	<attached member_type="foot-right" frame="*" dx="6" dy="25"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="tail" frame="*" dx="3" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Hoop (foreground part) ###### -->
+<sprite name="hoop" type="hoop">
+	<image file="hoop.png"/>
+	<anchor dx="18" dy="3"/>
+</sprite>
+
+<!-- ###### Hula (foreground part) ###### -->
+<sprite name="hula" type="hula">
+	<image file="hula.png"/>
+	<anchor dx="18" dy="6"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail" type="tail">
+	<image file="tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back" type="back">
+	<image file="back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head" type="head">
+	<image file="head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="14" dy="9"/>
+	<attached member_type="noze" frame="*" dx="14" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="13" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright" type="hornright">
+	<image file="hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft" type="hornleft">
+	<image file="hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze" type="noze">
+	<image file="noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair" type="hair">
+	<image file="hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes" type="eyes">
+	<image file="eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="3" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="5" dy="3"/>
+	<attached member_type="hat" frame="*" dx="1" dy="-1"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hat" type="hat">
+	<image file="hat.png"/>
+	<anchor dx="14" dy="12"/>
+</sprite>
+
+<sprite name="pupil-right" type="pupil-right">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left" type="pupil-left">
+	<image file="pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid" type="eyelid">
+	<image file="eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left" type="arm-left">
+	<image file="arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left" type="arm2-left">
+	<image file="arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-L" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-R" type="arm3-left">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right" type="arm-right">
+	<image file="arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right" type="arm2-right">
+	<image file="arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-R" type="arm3-right">
+	<image file="arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-L" type="arm3-right">
+	<image file="arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left" type="foot-left">
+	<image file="footleft.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+<sprite name="foot-right" type="foot-right">
+	<image file="footright.png"/>
+	<anchor dx="4" dy="3"/>
+</sprite>
+
+<!-- ###### Helmet ###### -->
+<sprite name="helmet" type="helmet">
+	<image file="helmet.png"/>
+	<anchor dx="15" dy="15"/>
+</sprite>
+
+<!-- ###### Yoyo ###### -->
+<sprite name="yoyo" type="yoyo" go_through_ground="true">
+	<image file="yoyo.png">
+		<grid pos="0,0" size="32,42" array="36,1"/>
+	</image>
+	<anchor dx="29" dy="25"/>
+	<animation speed="150"/>
+</sprite>
+
+<!-- ###### Dead ###### -->
+<sprite name="body-dead" type="body">
+	<image file="dead.png"/>
+	<anchor dx="12" dy="15"/>
+</sprite>
+
+<!-- ###### Black ###### -->
+<!-- ###### Body ###### -->
+<sprite name="body-black" type="body">
+	<image file="black_body.png"/>
+	<anchor dx="9" dy="16"/>
+	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
+	<attached member_type="head" frame="*" dx="4" dy="2"/>
+	<attached member_type="back" frame="*" dx="5" dy="13"/>
+	<attached member_type="arm-right" frame="*" dx="5" dy="8"/>
+	<attached member_type="arm-left" frame="*" dx="10" dy="7"/>
+	<attached member_type="foot-left" frame="*" dx="9" dy="22"/>
+	<attached member_type="foot-right" frame="*" dx="4" dy="24"/>
+	<attached member_type="belt" frame="*" dx="9" dy="20"/>
+	<attached member_type="construct" frame="*" dx="12" dy="0"/>
+	<attached member_type="tail" frame="*" dx="1" dy="21"/>
+	<attached member_type="hula" frame="*" dx="14" dy="20"/>
+</sprite>
+
+<!-- ###### Tail ###### -->
+<sprite name="tail-black" type="tail">
+	<image file="black_tail.png"/>
+	<anchor dx="19" dy="29"/>
+</sprite>
+
+<!-- ###### Back ###### -->
+<sprite name="back-black" type="back">
+	<image file="black_back.png"/>
+	<anchor dx="18" dy="15"/>
+</sprite>
+
+<!-- ###### Head ###### -->
+<sprite name="head-black" type="head">
+	<image file="black_head.png"/>
+	<anchor dx="10" dy="20"/>
+	<attached member_type="hornright" frame="*" dx="14" dy="16"/>
+	<attached member_type="hornleft" frame="*" dx="12" dy="16"/>
+	<attached member_type="hair" frame="*" dx="14" dy="15"/>
+	<attached member_type="helmet" frame="*" dx="11" dy="10"/>
+	<attached member_type="construct" frame="*" dx="13" dy="9"/>
+	<attached member_type="noze" frame="*" dx="16" dy="13"/>
+	<attached member_type="eyes" frame="*" dx="15" dy="11"/>
+</sprite>
+
+<!-- ###### Horns ###### -->
+<sprite name="hornright-black" type="hornright">
+	<image file="black_hornright.png"/>
+	<anchor dx="19" dy="17"/>
+</sprite>
+
+<sprite name="hornleft-black" type="hornleft">
+	<image file="black_hornleft.png"/>
+	<anchor dx="0" dy="17"/>
+</sprite>
+
+<!-- ###### Hair ###### -->
+<sprite name="hair-black" type="hair">
+	<image file="black_hair.png"/>
+	<anchor dx="23" dy="23"/>
+</sprite>
+
+<!-- ###### Noze ###### -->
+<sprite name="noze-black" type="noze">
+	<image file="black_noze.png"/>
+	<anchor dx="1" dy="0"/>
+</sprite>
+
+<!-- ###### eyes ###### -->
+<sprite name="eyes-black" type="eyes">
+	<image file="black_eyes.png"/>
+	<anchor dx="4" dy="3"/>
+	<attached member_type="eyelid" frame="*" dx="0" dy="1"/>
+	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
+	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
+</sprite>
+
+<sprite name="pupil-right-black" type="pupil-right">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="pupil-left-black" type="pupil-left">
+	<image file="black_pupil.png"/>
+	<anchor dx="-1" dy="0"/>
+</sprite>
+
+<sprite name="eyelid-black" type="eyelid">
+	<image file="black_eyelid.png">
+		<grid pos="0,0" size="9,7" array="7,1"/>
+	</image>
+	<anchor dx="0" dy="0"/>
+	<animation speed="200" loop_mode="pingpong" loop_wait="500" loop_wait_random="200"/>
+</sprite>
+
+<!-- ###### Arm left ###### -->
+<sprite name="arm-left-black" type="arm-left">
+	<image file="black_arm1left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-left" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-left-black" type="arm2-left">
+	<image file="black_arm2left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-left" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-left-black-L" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<sprite name="arm3-left-black-R" type="arm3-left">
+	<image file="black_arm3left.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<!-- ###### Arm right ###### -->
+<sprite name="arm-right-black" type="arm-right">
+	<image file="black_arm1right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm2-right" frame="*" dx="5" dy="7"/>
+</sprite>
+
+<sprite name="arm2-right-black" type="arm2-right">
+	<image file="black_arm2right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="arm3-right" frame="*" dx="5" dy="6"/>
+</sprite>
+
+<sprite name="arm3-right-black-L" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+</sprite>
+
+<sprite name="arm3-right-black-R" type="arm3-right">
+	<image file="black_arm3right.png"/>
+	<anchor dx="5" dy="0"/>
+	<attached member_type="weapon" frame="*" dx="5" dy="5"/>
+	<attached member_type="yoyo" frame="*" dx="-18" dy="0"/>
+</sprite>
+
+<!-- ###### Legs ###### -->
+<sprite name="foot-left-black" type="foot-left">
+	<image file="black_footleft.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+<sprite name="foot-right-black" type="foot-right">
+	<image file="black_footright.png"/>
+	<anchor dx="1" dy="1"/>
+</sprite>
+
+<!-- ###### Construct ###### -->
+<sprite name="construct" type="construct">
+	<image file="c1.png"/>
+	<anchor dx="17" dy="12"/>
+	<attached member_type="c2" frame="*" dx="17" dy="12"/>
+</sprite>
+
+<sprite name="c2" type="c2">
+	<image file="c2.png"/>
+	<anchor dx="17" dy="12"/>
+</sprite>
+
+<!-- ###### Belt ###### -->
+<sprite name="belt" type="belt">
+	<image file="belt.png"/>
+	<anchor dx="10" dy="4"/>
+	<attached member_type="jetpack-left" frame="*" dx="9" dy="-5"/>
+	<attached member_type="jetpack-right" frame="*" dx="-1" dy="-3"/>
+</sprite>
+
+<sprite name="jetpack-left" type="jetpack-left">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-left-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-left-fire" type="jetpack-left-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+<sprite name="jetpack-right" type="jetpack-right">
+	<image file="jetpack.png"/>
+	<anchor dx="5" dy="11"/>
+	<attached member_type="jetpack-right-fire" frame="*" dx="4" dy="5"/>
+</sprite>
+
+<sprite name="jetpack-right-fire" type="jetpack-right-fire">
+	<image file="jetpack-fire.png"/>
+	<anchor dx="5" dy="1"/>
+</sprite>
+
+
+
+<!--   ###########################################
+       ###############             ###############
+       ##############    CLOTHES    ##############
+       ###############             ###############
+       ###########################################   -->
+
+<!-- ###### Normal ###### -->
+<clothe name="normal">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Jetpack ###### -->
+<clothe name="jetpack">
+	<c_member name="tail"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
+	<c_member name="tail"/>
+	<c_member name="jetpack-left-fire"/>
+	<c_member name="jetpack-left"/>
+	<c_member name="jetpack-right-fire"/>
+	<c_member name="jetpack-right"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="foot-right"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Helmet ###### -->
+<clothe name="helmet">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="helmet"/>
+</clothe>
+
+<!-- ###### Animation Yoyo ###### -->
+<clothe name="animation0">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="yoyo"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### Animation Hula hoop ###### -->
+<clothe name="animation2">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="hula"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+	<c_member name="hoop"/>
+</clothe>
+
+<!-- ###### Dead ###### -->
+<clothe name="dead">
+	<c_member name="body-dead"/>
+</clothe>
+
+<!-- ###### Black ###### -->
+<clothe name="black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- ###### Fly-Black ###### -->
+<clothe name="fly-black">
+	<c_member name="arm-left-black"/>
+	<c_member name="arm2-left-black"/>
+	<c_member name="arm3-left-black-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left-black"/>
+	<c_member name="tail-black"/>
+	<c_member name="foot-right-black"/>
+	<c_member name="back-black"/>
+	<c_member name="body-black"/>
+	<c_member name="hair-black"/>
+	<c_member name="hornleft-black"/>
+	<c_member name="head-black"/>
+	<c_member name="hornright-black"/>
+	<c_member name="noze-black"/>
+	<c_member name="eyes-black"/>
+	<c_member name="pupil-right-black"/>
+	<c_member name="pupil-left-black"/>
+	<c_member name="eyelid-black"/>
+	<c_member name="arm-right-black"/>
+	<c_member name="arm2-right-black"/>
+	<c_member name="arm3-right-black-L"/>
+</clothe>
+
+<!-- # Construct/Airhammer helmet # -->
+<clothe name="weapon-construct">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<clothe name="weapon-airhammer">
+	<c_member name="c2"/>
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="construct"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!-- ###### weapon-dynamite ###### -->
+<clothe name="weapon-dynamite">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-bounce_ball ###### -->
+<clothe name="weapon-bounce_ball">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-cluster_bomb ###### -->
+<clothe name="weapon-cluster_bomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-disco_grenade ###### -->
+<clothe name="weapon-disco_grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-footbomb ###### -->
+<clothe name="weapon-footbomb">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-grenade ###### -->
+<clothe name="weapon-grenade">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-gnulauncher ###### -->
+<clothe name="weapon-gnulauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-polecatlauncher ###### -->
+<clothe name="weapon-polecatlauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-minelauncher ###### -->
+<clothe name="weapon-minelauncher">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### weapon-syringe ###### -->
+<clothe name="weapon-syringe">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="weapon"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- # Parachute # -->
+<clothe name="weapon-parachute">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-R"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="hair"/>
+	<c_member name="hornleft"/>
+	<c_member name="head"/>
+	<c_member name="hornright"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-R"/>
+</clothe>
+
+<!-- ###### Gun ###### -->
+<clothe name="weapon-gun">
+	<c_member name="arm-left"/>
+	<c_member name="arm2-left"/>
+	<c_member name="arm3-left-L"/>
+	<c_member name="weapon"/>
+	<c_member name="foot-left"/>
+	<c_member name="tail"/>
+	<c_member name="foot-right"/>
+	<c_member name="back"/>
+	<c_member name="body"/>
+	<c_member name="head"/>
+	<c_member name="noze"/>
+	<c_member name="eyes"/>
+	<c_member name="pupil-right"/>
+	<c_member name="pupil-left"/>
+	<c_member name="eyelid"/>
+	<c_member name="belt"/>
+	<c_member name="hat"/>
+	<c_member name="arm-right"/>
+	<c_member name="arm2-right"/>
+	<c_member name="arm3-right-L"/>
+</clothe>
+
+<!--   ###########################################
+       ##############               ##############
+       #############    MOVEMENTS    #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Breathe ###### -->
+<movement name="breathe" speed="190">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="1"/>
+		<member type="arm-right" dx="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="1"/>
+		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="1"/>
+		<member type="foot-right" dy="1"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="-1" dy="0"/>
+		<member type="arm-right" dx="-1" dy="0" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" dy="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" dx="0" dy="1"/>
+		<member type="arm-right" dx="0" dy="1" follow_half_crosshair="true"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Walk ###### -->
+<movement name="walk" speed="30">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>
+		<member type="tail" angle="-2"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-4"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-50"/>
+		<member type="arm-right" angle="50"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="-50"/>
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-40"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="40"/>
+		<member type="foot-right" angle="-40"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-30"/>
+		<member type="arm-right" angle="30"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="30"/>
+		<member type="foot-right" angle="-30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-20"/>
+		<member type="arm2-left" angle="-20"/>
+		<member type="arm-right" angle="20"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="20"/>
+		<member type="foot-right" angle="-20"/>	
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-10"/>
+		<member type="arm2-left" angle="-10"/>
+		<member type="arm-right" angle="10"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>	
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="arm2-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>		
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+		<member type="tail" angle="4"/>	
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-50"/>
+		<member type="arm-left" angle="50"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-50"/>
+		<member type="foot-right" angle="50"/>
+		<member type="tail" angle="1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-40"/>
+		<member type="foot-right" angle="40"/>
+		<member type="tail" angle="0"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+		<member type="tail" angle="-1"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-20"/>
+		<member type="arm2-right" angle="-20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>	
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="arm2-right" angle="-10"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm2-left" angle="0"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>	
+		<member type="tail" angle="-3"/>
+		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100"/>
+		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100"/>	
+	</frame>
+</movement>
+
+<!-- ###### Jump ###### -->
+<movement name="jump" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Fall ###### -->
+<movement name="fall" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_crosshair="true"/> <!-- follow_crosshair : the head rotates when we move the crosshair -->
+		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
+		<member type="arm-right" angle="90" follow_speed="true"/>
+		<member type="foot-left" angle="0" follow_speed="true"/>
+		<member type="foot-right" angle="0" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Hard land ###### -->
+<movement name="hard-land" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" dy="-4"/>
+		<member type="arm-left" angle="15"/>
+		<member type="arm-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" dy="-3"/>
+		<member type="arm-left" angle="10"/>
+		<member type="arm-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" dy="-2"/>
+		<member type="arm-left" angle="5"/>
+		<member type="arm-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" dy="-1"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Drowned ###### -->
+<movement name="drowned" speed="150">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="body" angle="90" follow_speed="true"/> 
+		<member type="head" angle="-140"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Fly ###### -->
+<movement name="fly" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/>  
+		<member type="arm-left" angle="45"/>
+		<member type="arm-right" angle="-135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="90"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="135"/>
+		<member type="arm-right" angle="-45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="180"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="45"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="90"/>
+		<member type="foot-left" angle="5"/>
+		<member type="foot-right" angle="-5"/>
+	</frame>
+	<frame>
+		<member type="body" follow_speed="true" angle="70"/>
+		<member type="head" angle="-30"/> 
+		<member type="arm-left" angle="-45"/>
+		<member type="arm-right" angle="135"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<!-- ###### Black ###### -->
+<movement name="black" speed="1000">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" angle="-40"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="tail" angle="-2"/>
+		<member type="pupil-right" dx="-1"/>
+		<member type="pupil-left" dx="-1"/>		
+	</frame>
+</movement>
+
+
+
+<!--   ###########################################
+       #############                ##############
+       ############    ANIMATIONS    #############
+       #############                ##############
+       ###########################################   -->
+
+<!-- ###### Yoyo ###### -->
+<movement name="animation0" speed="5400" play_mode="play_once"> <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" angle="-90"/>
+		<member type="yoyo" dx="4" angle="90"/>
+	</frame>
+</movement>
+
+<!-- ###### Tired ###### -->
+<movement name="animation1" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-10"/>
+		<member type="head" angle="-95"/>
+		<member type="arm-left" angle="-190"/>
+		<member type="arm-right" angle="-190"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-6"/>
+		<member type="head" angle="-69"/>
+		<member type="arm-left" angle="-141"/>
+		<member type="arm-right" angle="-141"/>
+		<member type="foot-left" angle="6"/>
+		<member type="foot-right" angle="6"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-4"/>
+		<member type="head" angle="-46"/>
+		<member type="arm-left" angle="-94"/>
+		<member type="arm-right" angle="-94"/>
+		<member type="foot-left" angle="4"/>
+		<member type="foot-right" angle="4"/>
+	</frame>
+	<frame>
+		<member type="body" angle="-2"/>
+		<member type="head" angle="-23"/>
+		<member type="arm-left" angle="-47"/>
+		<member type="arm-right" angle="-47"/>
+		<member type="foot-left" angle="2"/>
+		<member type="foot-right" angle="2"/>
+	</frame>
+	<frame>
+		<member type="body" angle="0"/>
+		<member type="head" angle="0"/>
+		<member type="arm-left" angle="0"/>
+		<member type="arm-right" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Hula-hoop ###### -->
+<movement name="animation2" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<!-- begining -->
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0"/>
+		<member type="hoop" angle="0" dx="-5"/>
+		<member type="hula" angle="0" dx="-5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="-4"/>
+		<member type="hula" angle="-5" dx="-4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="-2"/>
+		<member type="hula" angle="-10" dx="-2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-140"/>
+		<member type="arm-right" angle="140"/>
+		<member type="body" angle="30" dx="3"/>
+		<member type="hoop" angle="-15" dx="0"/>
+		<member type="hula" angle="-15" dx="0"/>
+		<member type="foot-left" angle="-30" dy="-3"/>
+		<member type="foot-right" angle="-30" dy="-3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-130"/>
+		<member type="arm-right" angle="130"/>
+		<member type="body" angle="20" dx="2"/>
+		<member type="hoop" angle="-10" dx="2"/>
+		<member type="hula" angle="-10" dx="2"/>
+		<member type="foot-left" angle="-20" dy="-2"/>
+		<member type="foot-right" angle="-20" dy="-2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="120"/>
+		<member type="body" angle="10" dx="1"/>
+		<member type="hoop" angle="-5" dx="4"/>
+		<member type="hula" angle="-5" dx="4"/>
+		<member type="foot-left" angle="-10" dy="-1"/>
+		<member type="foot-right" angle="-10" dy="-1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-110"/>
+		<member type="arm-right" angle="110"/>
+		<member type="body" angle="0" dx="0"/>
+		<member type="hoop" angle="0" dx="5"/>
+		<member type="hula" angle="0" dx="5"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="4"/>
+		<member type="hula" angle="5" dx="4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="2"/>
+		<member type="hula" angle="10" dx="2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-95"/>
+		<member type="arm-right" angle="95"/>
+		<member type="body" angle="-30" dx="-3"/>
+		<member type="hoop" angle="15" dx="0"/>
+		<member type="hula" angle="15" dx="0"/>
+		<member type="foot-left" angle="30" dy="3"/>
+		<member type="foot-right" angle="30" dy="3"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-100"/>
+		<member type="arm-right" angle="100"/>
+		<member type="body" angle="-20" dx="-2"/>
+		<member type="hoop" angle="10" dx="-2"/>
+		<member type="hula" angle="10" dx="-2"/>
+		<member type="foot-left" angle="20" dy="2"/>
+		<member type="foot-right" angle="20" dy="2"/>
+	</frame>
+	<frame>
+		<member type="arm-left" angle="-105"/>
+		<member type="arm-right" angle="105"/>
+		<member type="body" angle="-10" dx="-1"/>
+		<member type="hoop" angle="5" dx="-4"/>
+		<member type="hula" angle="5" dx="-4"/>
+		<member type="foot-left" angle="10" dy="1"/>
+		<member type="foot-right" angle="10" dy="1"/>
+	</frame>
+</movement>
+
+
+
+
+<!--   ###########################################
+       ##############               ##############
+       #############     WEAPONS     #############
+       ##############               ##############
+       ###########################################   -->
+
+<!-- ###### Ninja-rope ###### -->
+<movement name="ninja-rope" speed="100">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-10"/>
+		<member type="foot-left" angle="-45"/>
+		<member type="foot-right" angle="-45"/>
+	</frame>
+</movement>
+
+<!-- ###### Parachute ###### -->
+<movement name="parachute" speed="180">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="170"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="175"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="180"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="190"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-10"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="185"/>
+		<member type="foot-left" angle="45"/>
+		<member type="foot-right" angle="45"/>
+		<member type="body" angle="-5"/>
+		<member type="weapon" dx="-1" dy="7"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - no fire ###### -->
+<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_speed="true"/>
+		<member type="arm-right" follow_speed="true"/>
+		<member type="foot-left" follow_speed="true"/>
+		<member type="foot-right" follow_speed="true"/>
+	</frame>
+</movement>
+
+<!-- ###### Jetpack - fire ###### -->
+<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="0" dy="0"/>
+		<member type="jetpack-left-fire" dx="0" dy="0"/>
+	</frame>
+	<frame>
+		<member type="body" angle="45"/>
+		<member type="tail" angle="-100"/>
+		<member type="arm-left" angle="-100" dx="-1"/>
+		<member type="arm-right" angle="80" dx="-2" dy="-2"/>
+		<member type="foot-left" angle="50"/>
+		<member type="foot-right" angle="90" dy="3"/>
+		<member type="head" angle="-50"/>
+		<member type="jetpack-right-fire" dx="-12" dy="12"/>
+		<member type="jetpack-left-fire" dx="-10" dy="13"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Airhammer ###### -->
+<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="construct" angle="12" dy="-4"/>
+	</frame>
+</movement>
+
+<!-- ###### Grenade ###### -->
+<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
+		<member type="body" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+</movement>
+
+<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+		<member type="body" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
+		<member type="body" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+</movement>
+
+<!-- ###### Bounceball ###### -->
+<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-70"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="-80"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="-90"/>
+		<member type="weapon" dy="-4"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="-95"/>
+		<member type="weapon" dy="-7"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-right" angle="-80"/>
+		<member type="weapon" dy="-11" dx="-1"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-30"/>
+		<member type="arm-right" angle="-40"/>
+		<member type="weapon" dy="-17" dx="1"/>
+		<member type="body" angle="15"/>
+		<member type="foot-left" angle="-15"/>
+		<member type="foot-right" angle="15"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-20"/>
+		<member type="arm-left" angle="0"/>
+		<member type="weapon" dy="-17" dx="6"/>
+		<member type="body" angle="30"/>
+		<member type="foot-left" angle="-30"/>
+		<member type="foot-right" angle="30"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-15"/>
+		<member type="arm-right" angle="40"/>
+		<member type="arm-left" angle="40"/>
+		<member type="weapon" dy="-9" dx="10"/>
+		<member type="body" angle="25"/>
+		<member type="foot-left" angle="-25"/>
+		<member type="foot-right" angle="25"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-5"/>
+		<member type="arm-right" angle="80"/>
+		<member type="arm-left" angle="80"/>
+		<member type="weapon" dy="0" dx="12"/>
+		<member type="body" angle="20"/>
+		<member type="foot-left" angle="-20"/>
+		<member type="foot-right" angle="20"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="8" dx="12"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="weapon" dy="10" dx="14"/>
+		<member type="body" angle="0"/>
+		<member type="foot-left" angle="0"/>
+		<member type="foot-right" angle="0"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="40"/>
+		<member type="arm-right" angle="120"/>
+		<member type="arm-left" angle="120"/>
+		<member type="body" angle="-10"/>
+		<member type="foot-left" angle="10"/>
+		<member type="foot-right" angle="-10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="20"/>
+		<member type="arm-right" angle="110"/>
+		<member type="arm-left" angle="110"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="head" angle="10"/>
+		<member type="arm-right" angle="90"/>
+		<member type="arm-left" angle="90"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="head" angle="0"/>
+		<member type="arm-right" angle="60"/>
+		<member type="arm-left" angle="60"/>
+		<member type="body" angle="12"/>
+		<member type="foot-left" angle="-12"/>
+		<member type="foot-right" angle="12"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="30"/>
+		<member type="arm-left" angle="30"/>
+		<member type="body" angle="10"/>
+		<member type="foot-left" angle="-10"/>
+		<member type="foot-right" angle="10"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="20"/>
+		<member type="arm-left" angle="20"/>
+		<member type="body" angle="5"/>
+		<member type="foot-left" angle="-5"/>
+		<member type="foot-right" angle="5"/>
+	</frame>
+	<frame>
+		<member type="arm-right" angle="10"/>
+		<member type="arm-left" angle="10"/>
+	</frame>
+</movement>
+
+<!-- ###### Bazooka ###### -->
+<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-40"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-40"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-50"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-50"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-55"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-55"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+</movement>
+
+<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="foot-left" dy="-4"/>
+		<member type="foot-right" angle="90" dy="-4" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-100"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-100"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-3"/>
+		<member type="foot-right" angle="90" dy="-3" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-95"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-95"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="90" dy="-2" dx="4"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="60" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-2"/>
+		<member type="foot-right" angle="45" dy="-1" dx="3"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="30" dy="-1" dx="2"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="-1"/>
+		<member type="foot-right" angle="15"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="foot-left" dy="0"/>
+		<member type="foot-right" angle="0"/>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-0"/>
+		<member type="arm2-left" follow_half_crosshair="true" angle="-0"/>
+	</frame>
+</movement>
+
+<!-- ###### gun ###### -->
+<movement name="weapon-gun-select" speed="100" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+
+<!-- ###### Dynamite ###### -->
+<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### Mine ###### -->
+<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+</movement>
+
+<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" follow_half_crosshair="true"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+</movement>
+
+<!-- ###### SuperTux ###### -->
+<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-135"/>
+		<member type="arm-right" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-90"/>
+		<member type="arm-right" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="head" angle="-90"/>
+		<member type="arm-left" angle="-120"/>
+		<member type="arm-right" angle="-60"/>
+	</frame>
+</movement>
+
+<!-- ###### gnu ###### -->
+<movement name="weapon-gnulauncher-select" speed="40" play_mode="play_once">
+	<collision_rect left="0" right="0" top="0" bottom="2"/>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-15"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-15"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-30"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-45"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-60"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-75"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-75"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-90"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-105"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-105"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-120"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-135"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-135"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-150"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-165"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-165"/>
+	</frame>
+	<frame>
+		<member type="arm-left" follow_half_crosshair="true" angle="-180"/>
+		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
+	</frame>
+</movement>
+
+</resources>
diff --git a/data/body/workrave/dead.png b/data/body/workrave/dead.png
new file mode 100644
index 0000000..b018ff4
Binary files /dev/null and b/data/body/workrave/dead.png differ
diff --git a/data/body/workrave/eyelid.png b/data/body/workrave/eyelid.png
new file mode 100644
index 0000000..1b02c62
Binary files /dev/null and b/data/body/workrave/eyelid.png differ
diff --git a/data/body/workrave/eyes.png b/data/body/workrave/eyes.png
new file mode 100644
index 0000000..4a85946
Binary files /dev/null and b/data/body/workrave/eyes.png differ
diff --git a/data/body/workrave/footleft.png b/data/body/workrave/footleft.png
new file mode 100644
index 0000000..be15bc3
Binary files /dev/null and b/data/body/workrave/footleft.png differ
diff --git a/data/body/workrave/footright.png b/data/body/workrave/footright.png
new file mode 100644
index 0000000..be15bc3
Binary files /dev/null and b/data/body/workrave/footright.png differ
diff --git a/data/body/workrave/hair.png b/data/body/workrave/hair.png
new file mode 100644
index 0000000..a23e46f
Binary files /dev/null and b/data/body/workrave/hair.png differ
diff --git a/data/body/workrave/hat.png b/data/body/workrave/hat.png
new file mode 100644
index 0000000..bd3880a
Binary files /dev/null and b/data/body/workrave/hat.png differ
diff --git a/data/body/workrave/head.png b/data/body/workrave/head.png
new file mode 100644
index 0000000..11108ff
Binary files /dev/null and b/data/body/workrave/head.png differ
diff --git a/data/body/workrave/helmet.png b/data/body/workrave/helmet.png
new file mode 100644
index 0000000..3e427f4
Binary files /dev/null and b/data/body/workrave/helmet.png differ
diff --git a/data/body/beastieteam/hoop.png b/data/body/workrave/hoop.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/beastieteam/hoop.png
rename to data/body/workrave/hoop.png
diff --git a/data/body/workrave/hornleft.png b/data/body/workrave/hornleft.png
new file mode 100644
index 0000000..ad0c9d4
Binary files /dev/null and b/data/body/workrave/hornleft.png differ
diff --git a/data/body/workrave/hornright.png b/data/body/workrave/hornright.png
new file mode 100644
index 0000000..b617821
Binary files /dev/null and b/data/body/workrave/hornright.png differ
diff --git a/data/body/beastieteam/hula.png b/data/body/workrave/hula.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/body/beastieteam/hula.png
rename to data/body/workrave/hula.png
diff --git a/data/body/workrave/jetpack-fire.png b/data/body/workrave/jetpack-fire.png
new file mode 100644
index 0000000..d856fa9
Binary files /dev/null and b/data/body/workrave/jetpack-fire.png differ
diff --git a/data/body/workrave/jetpack.png b/data/body/workrave/jetpack.png
new file mode 100644
index 0000000..e78e22f
Binary files /dev/null and b/data/body/workrave/jetpack.png differ
diff --git a/data/body/workrave/noze.png b/data/body/workrave/noze.png
new file mode 100644
index 0000000..94b200d
Binary files /dev/null and b/data/body/workrave/noze.png differ
diff --git a/data/body/workrave/pupil.png b/data/body/workrave/pupil.png
new file mode 100644
index 0000000..11a60ff
Binary files /dev/null and b/data/body/workrave/pupil.png differ
diff --git a/data/body/workrave/sick_head.png b/data/body/workrave/sick_head.png
new file mode 100644
index 0000000..0d7eed7
Binary files /dev/null and b/data/body/workrave/sick_head.png differ
diff --git a/data/body/workrave/tail.png b/data/body/workrave/tail.png
new file mode 100644
index 0000000..2106ac6
Binary files /dev/null and b/data/body/workrave/tail.png differ
diff --git a/data/body/workrave/yoyo.png b/data/body/workrave/yoyo.png
new file mode 100644
index 0000000..6a22a92
Binary files /dev/null and b/data/body/workrave/yoyo.png differ
diff --git a/data/body/workraveteam/arm.png b/data/body/workraveteam/arm.png
deleted file mode 100644
index 0143312..0000000
Binary files a/data/body/workraveteam/arm.png and /dev/null differ
diff --git a/data/body/workraveteam/black.png b/data/body/workraveteam/black.png
deleted file mode 100644
index 3aee607..0000000
Binary files a/data/body/workraveteam/black.png and /dev/null differ
diff --git a/data/body/workraveteam/body.png b/data/body/workraveteam/body.png
deleted file mode 100644
index 715bf75..0000000
Binary files a/data/body/workraveteam/body.png and /dev/null differ
diff --git a/data/body/workraveteam/c1.png b/data/body/workraveteam/c1.png
deleted file mode 100644
index 701ef0b..0000000
Binary files a/data/body/workraveteam/c1.png and /dev/null differ
diff --git a/data/body/workraveteam/c2.png b/data/body/workraveteam/c2.png
deleted file mode 100644
index bce4c6b..0000000
Binary files a/data/body/workraveteam/c2.png and /dev/null differ
diff --git a/data/body/workraveteam/config.xml b/data/body/workraveteam/config.xml
deleted file mode 100644
index f7479d0..0000000
--- a/data/body/workraveteam/config.xml
+++ /dev/null
@@ -1,1945 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE resources SYSTEM "../body.dtd" []>
-<resources>
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    AUTHOR     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<author>
-  <name>yeKcim</name>
-  <email>yekcim AT crocobox.org</email>
-</author>
-
-
-
-
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############     ALIAS     ##############
-       ###############             ###############
-       ###########################################   -->
-
-<alias movement="weapon-riot_bomb-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-riot_bomb-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-automatic_bazooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluzooka-select" correspond_to="weapon-bazooka-select" />
-<alias movement="weapon-cluzooka-end-shoot" correspond_to="weapon-bazooka-end-shoot" />
-<alias movement="weapon-cluster_bomb-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-cluster_bomb-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-disco_grenade-begin-shoot" correspond_to="weapon-grenade-begin-shoot" />
-<alias movement="weapon-disco_grenade-end-shoot" correspond_to="weapon-grenade-end-shoot" />
-<alias movement="weapon-snipe_rifle-begin-shoot" correspond_to="weapon-uzi-begin-shoot" />
-<alias movement="weapon-snipe_rifle-end-shoot" correspond_to="weapon-uzi-end-shoot" />
-<alias movement="weapon-gnulauncher-begin-shoot" correspond_to="weapon-tux-begin-shoot" />
-<alias movement="weapon-gnulauncher-end-shoot" correspond_to="weapon-tux-end-shoot" />
-<alias movement="weapon-m16-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-shotgun-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-snipe_rifle-select" correspond_to="weapon-gun-select" />
-<alias movement="weapon-flamethrower-select" correspond_to="weapon-gun-select" />
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############   SKELETON    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Body ###### -->
-<sprite name="body-normal" type="body" >
-	<image file="body.png"/>
-	<anchor dx="12" dy="15"/>
-	<attached member_type="hoop" frame="*" dx="14" dy="22"/>
-	<attached member_type="head" frame="*" dx="10" dy="2"/>
-	<attached member_type="arm-right"  frame="*" dx="6" dy="10"/>
-	<attached member_type="arm-left"  frame="*" dx="12" dy="9"/>
-	<attached member_type="foot-right"  frame="*" dx="9" dy="27"/>
-	<attached member_type="foot-left"  frame="*" dx="18" dy="25"/>
-	<attached member_type="jetpack" frame="*" dx="3" dy="13"/>
-	<attached member_type="jetpack-belt" frame="*" dx="0" dy="18" />
-	<attached member_type="construct" frame="*" dx="8" dy="-2"/>
-	<attached member_type="hula" frame="*" dx="14" dy="20"/>
-</sprite>
-
-<!-- ###### Dead ###### -->
-<sprite name="body-dead" type="body" >
-	<image file="dead.png"/>
-	<anchor dx="12" dy="15"/>
-</sprite>
-
-<!-- ###### Hoop (foreground part) ###### -->
-<sprite name="hoop" type="hoop" >
-	<image file="hoop.png"/>
-	<anchor dx="18" dy="3"/>
-</sprite>
-
-<!-- ###### Hula (foreground part) ###### -->
-<sprite name="hula" type="hula" >
-	<image file="hula.png"/>
-	<anchor dx="18" dy="6"/>
-</sprite>
-
-<!-- ###### Eyes ###### -->
-<sprite name="eyes-normal" type="eyes-normal">
-	<image file="eyes.png"/>
-	<anchor dx="4" dy="3"/>
-	<attached member_type="eyelid" frame="*" dx="0" dy="0"/>
-	<attached member_type="pupil-right" frame="*" dx="4" dy="3"/>
-	<attached member_type="pupil-left" frame="*" dx="6" dy="3"/>
-</sprite>
-
-<sprite name="eyelid-normal" type="eyelid">
-	<image file="eyelid.png">
-		<grid pos="0,0" size="9,7" array="7,1" />
-	</image>
-	<anchor dx="0" dy="0"/>
-	<animation speed="200" loop_mode="pingpong" />
-</sprite>
-
-<sprite name="pupil-right" type="pupil-right" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<sprite name="pupil-left" type="pupil-left" >
-	<image file="pupil.png"/>
-	<anchor dx="-1" dy="0"/>
-</sprite>
-
-<!-- ###### Head ###### -->
-<sprite name="head-normal" type="head">
-	<image file="head.png"/>
-	<anchor dx="10" dy="13"/>
-	<attached member_type="eyes-normal" frame="*" dx="12" dy="9"/>
-	<attached member_type="helmet" frame="*" dx="0" dy="0" />
-</sprite>
-<sprite name="helmet" type="helmet">
-	<image file="helmet.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<!-- ###### arms ###### -->
-<sprite name="arm-left-normal" type="arm-left" >
-	<image file="arm.png"/>
-	<anchor dx="2" dy="0"/>
-</sprite>
-<sprite name="arm-right-normal" type="arm-right" >
-	<image file="arm.png"/>
-	<anchor dx="2" dy="0"/>
-	<attached member_type="weapon" frame="*" dx="3" dy="9"/>
-	<attached member_type="yoyo" frame="*" dx="-21" dy="8"/>
-</sprite>
-
-<!-- ###### yoyo ###### -->
-<sprite name="yoyo" type="yoyo" go_through_ground="true">
-	<image file="yoyo.png">
-		<grid pos="0,0" size="32,42" array="36,1" />
-	</image>
-	<anchor dx="29" dy="25"/>
-	<animation speed="150" />
-</sprite>
-
-<!-- ###### Legs ###### -->
-<sprite name="foot-left-normal" type="foot-left">
-	<image file="foot.png"/>
-	<anchor dx="5" dy="0"/>
-</sprite>
-
-<sprite name="foot-right-normal" type="foot-right">
-	<image file="foot.png"/>
-	<anchor dx="5" dy="0"/>
-</sprite>
-
-<!-- ###### Jetpack ###### -->
-<sprite name="jetpack" type="jetpack" >
-	<image file="jetpack.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="jetpack-fire" frame="*" dx="8" dy="22" />
-</sprite>
-
-<sprite name="jetpack-belt" type="jetpack-belt" >
-	<image file="jetpack-belt.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-<sprite name="jetpack-fire" type="jetpack-fire" >
-	<image file="jetpack-fire.png"/>
-	<anchor dx="7" dy="2"/>
-</sprite>
-
-<!-- ###### Construct ###### -->
-<sprite name="construct" type="construct" >
-	<image file="c1.png"/>
-	<anchor dx="7" dy="12"/>
-	<attached member_type="c2" frame="*" dx="1" dy="8" />
-</sprite>
-
-<sprite name="c2" type="c2" >
-	<image file="c2.png"/>
-	<anchor dx="0" dy="0"/>
-</sprite>
-
-
-
-<!--   ###########################################
-       ###############             ###############
-       ##############    CLOTHES    ##############
-       ###############             ###############
-       ###########################################   -->
-
-<!-- ###### Normal ###### -->
-<clothe name="normal">
-	<c_member name="arm-left-normal"/>
-	<c_member name="foot-left-normal"/>
-	<c_member name="body-normal"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="eyelid-normal"/>
-	<c_member name="foot-right-normal"/>
-	<c_member name="arm-right-normal"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Jetpack ###### -->
-<clothe name="jetpack"> <!-- When jetpack weapon is selected, during walk, jump movement... -->
-	<c_member name="arm-left-normal"/>
-	<c_member name="foot-left-normal"/>
-	<c_member name="jetpack"/>
-	<c_member name="body-normal"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right-normal"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="arm-right-normal"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="jetpack-fire"> <!-- When jetpack weapon is selected and used -->
-	<c_member name="arm-left-normal"/>
-	<c_member name="foot-left-normal"/>
-	<c_member name="jetpack-fire"/>
-	<c_member name="jetpack"/>
-	<c_member name="body-normal"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right-normal"/>
-	<c_member name="jetpack-belt"/>
-	<c_member name="arm-right-normal"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- # Construct/Airhammer helmet # -->
-<clothe name="weapon-construct">
-	<c_member name="c2"/>
-	<c_member name="arm-left-normal"/>
-	<c_member name="foot-left-normal"/>
-	<c_member name="body-normal"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right-normal"/>
-	<c_member name="arm-right-normal"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<clothe name="weapon-airhammer">
-	<c_member name="c2"/>
-	<c_member name="arm-left-normal"/>
-	<c_member name="foot-left-normal"/>
-	<c_member name="body-normal"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="construct"/>
-	<c_member name="foot-right-normal"/>
-	<c_member name="arm-right-normal"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Helmet ###### -->
-<clothe name="helmet">
-	<c_member name="arm-left-normal"/>
-	<c_member name="foot-left-normal"/>
-	<c_member name="body-normal"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="helmet"/>
-	<c_member name="foot-right-normal"/>
-	<c_member name="arm-right-normal"/>
-	<c_member name="weapon"/>
-</clothe>
-
-<!-- ###### Animation Yoyo ###### -->
-<clothe name="animation0">
-	<c_member name="arm-left-normal"/>
-	<c_member name="foot-left-normal"/>
-	<c_member name="body-normal"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right-normal"/>
-	<c_member name="arm-right-normal"/>
-	<c_member name="yoyo"/>
-</clothe>
-
-<!-- ###### Dead ###### -->
-<clothe name="dead">
-	<c_member name="body-dead"/>
-</clothe>
-
-<!-- ###### Animation Hula hoop ###### -->
-<clothe name="animation2">
-	<c_member name="hula"/>
-	<c_member name="arm-left-normal"/>
-	<c_member name="foot-left-normal"/>
-	<c_member name="body-normal"/>
-	<c_member name="head-normal"/>
-	<c_member name="eyes-normal"/>
-	<c_member name="pupil-right"/>
-	<c_member name="pupil-left"/>
-	<c_member name="foot-right-normal"/>
-	<c_member name="arm-right-normal"/>
-	<c_member name="hoop"/>
-</clothe>
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############    MOVEMENTS    #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Breathe ###### -->
-<movement name="breathe" speed="190">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" />
-		<member type="arm-right" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="1" />
-		<member type="arm-right" dx="-2" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="1" />
-		<member type="foot-right" dy="1" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-2" dy="0" />
-		<member type="arm-right" dx="-2" dy="0" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="0" />
-		<member type="foot-right" dy="0" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" dx="-1" dy="1" />
-		<member type="arm-right" dx="-1" dy="1" follow_half_crosshair="true"/>
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="foot-left" dy="-1" />
-		<member type="foot-right" dy="-1" />
-	</frame>
-</movement>
-
-
-<!-- ###### Walk ###### -->
-<movement name="walk" speed="30">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-40" />
-		<member type="arm-right" angle="40" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="40" />
-		<member type="foot-right" angle="-40" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-30" />
-		<member type="arm-right" angle="30" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="30" />
-		<member type="foot-right" angle="-30" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-20" />
-		<member type="arm-right" angle="20" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="20" />
-		<member type="foot-right" angle="-20" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="-10" />
-		<member type="arm-right" angle="10" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="10" />
-		<member type="foot-right" angle="-10" />
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="0" />
-		<member type="arm-right" angle="0" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="0" />
-		<member type="foot-right" angle="0" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="40" />
-		<member type="arm-right" angle="-40" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="-40" />
-		<member type="foot-right" angle="40" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="30" />
-		<member type="arm-right" angle="-30" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="-30" />
-		<member type="foot-right" angle="30" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="20" />
-		<member type="arm-right" angle="-20" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="-20" />
-		<member type="foot-right" angle="20" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-left" angle="10" />
-		<member type="arm-right" angle="-10" follow_half_crosshair="true"/>
-		<member type="foot-left" angle="-10" />
-		<member type="foot-right" angle="10" />		
-		<member type="pupil-right" follow_cursor="true" follow_cursor_limit="100" />
-		<member type="pupil-left" follow_cursor="true" follow_cursor_limit="100" />
-	</frame>
-</movement>
-
-<!-- ###### Jump ###### -->
-<movement name="jump" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Fall ###### -->
-<movement name="fall" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/> <!-- follow_half_crosshair : the head rotates when we move the crosshair -->
-		<member type="arm-left" angle="90" follow_speed="true"/> <!--follow_speed : rotates in the direction where the character is going -->
-		<member type="arm-right" angle="90" follow_speed="true"/>
-		<member type="foot-left" angle="0" follow_speed="true"/>
-		<member type="foot-right" angle="0" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Hard-land ###### -->
-<movement name="hard-land" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" dy="-4"/>
-		<member type="arm-left" angle="15"/>
-		<member type="arm-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" dy="-3"/>
-		<member type="arm-left" angle="10"/>
-		<member type="arm-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" dy="-2"/>
-		<member type="arm-left" angle="5"/>
-		<member type="arm-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" dy="-1"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Drowned ###### -->
-<movement name="drowned" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-<!-- ###### Fly ###### -->
-<movement name="fly" speed="150">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="45"/>
-		<member type="arm-right" angle="45"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="-45"/>
-		<member type="arm-right" angle="-45"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="-45" />
-	</frame>
-	<frame>
-		<member type="body" angle="90" follow_speed="true" /> 
-		<member type="head" angle="-140"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0" />
-	</frame>
-</movement>
-
-
-
-
-
-
-<!--   ###########################################
-       #############                ##############
-       ############    ANIMATIONS    #############
-       #############                ##############
-       ###########################################   -->
-
-<!-- ###### Yoyo ###### -->
-<movement name="animation0" speed="5400" play_mode="play_once" > <!-- 5400 = 36 (frames of yoyo animation) * 150ms (speed of the yoyos animation) -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-right" angle="-90"/>
-		<member type="yoyo" angle="90"/>
-	</frame>
-</movement>
-
-<!-- ###### Tired ###### -->
-<movement name="animation1" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-10"/>
-		<member type="head" angle="-95"/>
-		<member type="arm-left" angle="-190"/>
-		<member type="arm-right" angle="-190"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-6"/>
-		<member type="head" angle="-69"/>
-		<member type="arm-left" angle="-141"/>
-		<member type="arm-right" angle="-141"/>
-		<member type="foot-left" angle="6"/>
-		<member type="foot-right" angle="6"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-4"/>
-		<member type="head" angle="-46"/>
-		<member type="arm-left" angle="-94"/>
-		<member type="arm-right" angle="-94"/>
-		<member type="foot-left" angle="4"/>
-		<member type="foot-right" angle="4"/>
-	</frame>
-	<frame>
-		<member type="body" angle="-2"/>
-		<member type="head" angle="-23"/>
-		<member type="arm-left" angle="-47"/>
-		<member type="arm-right" angle="-47"/>
-		<member type="foot-left" angle="2"/>
-		<member type="foot-right" angle="2"/>
-	</frame>
-	<frame>
-		<member type="body" angle="0"/>
-		<member type="head" angle="0"/>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### Hula-hoop ###### -->
-<movement name="animation2" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<!-- begining -->
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0"/>
-		<member type="hoop" angle="0" dx="-5"/>
-		<member type="hula" angle="0" dx="-5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="-4"/>
-		<member type="hula" angle="-5" dx="-4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="-2"/>
-		<member type="hula" angle="-10" dx="-2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-140"/>
-		<member type="arm-right" angle="140"/>
-		<member type="body" angle="30" dx="3"/>
-		<member type="hoop" angle="-15" dx="0"/>
-		<member type="hula" angle="-15" dx="0"/>
-		<member type="foot-left" angle="-30" dy="-3"/>
-		<member type="foot-right" angle="-30" dy="-3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-130"/>
-		<member type="arm-right" angle="130"/>
-		<member type="body" angle="20" dx="2"/>
-		<member type="hoop" angle="-10" dx="2"/>
-		<member type="hula" angle="-10" dx="2"/>
-		<member type="foot-left" angle="-20" dy="-2"/>
-		<member type="foot-right" angle="-20" dy="-2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-120"/>
-		<member type="arm-right" angle="120"/>
-		<member type="body" angle="10" dx="1"/>
-		<member type="hoop" angle="-5" dx="4"/>
-		<member type="hula" angle="-5" dx="4"/>
-		<member type="foot-left" angle="-10" dy="-1"/>
-		<member type="foot-right" angle="-10" dy="-1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-110"/>
-		<member type="arm-right" angle="110"/>
-		<member type="body" angle="0" dx="0"/>
-		<member type="hoop" angle="0" dx="5"/>
-		<member type="hula" angle="0" dx="5"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="4"/>
-		<member type="hula" angle="5" dx="4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="2"/>
-		<member type="hula" angle="10" dx="2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-95"/>
-		<member type="arm-right" angle="95"/>
-		<member type="body" angle="-30" dx="-3"/>
-		<member type="hoop" angle="15" dx="0"/>
-		<member type="hula" angle="15" dx="0"/>
-		<member type="foot-left" angle="30" dy="3"/>
-		<member type="foot-right" angle="30" dy="3"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-100"/>
-		<member type="arm-right" angle="100"/>
-		<member type="body" angle="-20" dx="-2"/>
-		<member type="hoop" angle="10" dx="-2"/>
-		<member type="hula" angle="10" dx="-2"/>
-		<member type="foot-left" angle="20" dy="2"/>
-		<member type="foot-right" angle="20" dy="2"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="-105"/>
-		<member type="arm-right" angle="105"/>
-		<member type="body" angle="-10" dx="-1"/>
-		<member type="hoop" angle="5" dx="-4"/>
-		<member type="hula" angle="5" dx="-4"/>
-		<member type="foot-left" angle="10" dy="1"/>
-		<member type="foot-right" angle="10" dy="1"/>
-	</frame>
-</movement>
-
-
-
-
-
-
-<!--   ###########################################
-       ##############               ##############
-       #############     WEAPONS     #############
-       ##############               ##############
-       ###########################################   -->
-
-<!-- ###### Ninja-rope ###### -->
-<movement name="ninja-rope" speed="100">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="body" angle="-90" follow_speed="true" follow_direction="true"/>
-		<member type="arm-left" angle="-10"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="foot-left" angle="-45"/>
-		<member type="foot-right" angle="-45"/>
-	</frame>
-</movement>
-
-<!-- ###### Parachute ###### -->
-<movement name="parachute" speed="180">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="170"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="10"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="175"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="5"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="180"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="190"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-10"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-	<frame>
-		<member type="arm-left" angle="0"/>
-		<member type="arm-right" angle="185"/>
-		<member type="foot-left" angle="45"/>
-		<member type="foot-right" angle="45"/>
-		<member type="body" angle="-5"/>
-		<member type="weapon" dx="-1" dy="9"/>
-	</frame>
-</movement>
-
-<!-- ###### Jetpack-nofire ###### -->
-<movement name="jetpack-nofire" speed="100"> <!-- When jetpack is used, but no key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-		<member type="jetpack-fire" dy="-5" /> <!-- hide the fire under the jetpack -->
-	</frame>
-</movement>
-
-<!-- ###### Jetpack-fire ###### -->
-<movement name="jetpack-fire" speed="100"> <!-- When jetpack is used and a key is pressed -->
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="jetpack-fire" dy="0" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="1" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="2" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="5" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-	<frame>
-		<member type="jetpack-fire" dy="3" />
-		<member type="arm-left" follow_speed="true" />
-		<member type="arm-right" follow_speed="true"/>
-		<member type="foot-left" follow_speed="true"/>
-		<member type="foot-right" follow_speed="true"/>
-	</frame>
-</movement>
-
-<!-- ###### Airhammer ###### -->
-<movement name="weapon-airhammer-begin-shoot" speed="100" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="construct" angle="12" dy="-4"/>
-	</frame>
-</movement>
-
-<!-- ###### Grenade ###### -->
-<movement name="weapon-grenade-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-50"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-100"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-150"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-160"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-170"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-130"/>
-		<member type="body" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-</movement>
-
-<movement name="weapon-grenade-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-		<member type="body" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-45"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-10"/>
-		<member type="body" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-</movement>
-
-<!-- ###### Bounceball ###### -->
-<movement name="weapon-bounce_ball-begin-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-45"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-70"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="-80"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="-90"/>
-		<member type="weapon" dy="-4"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="-95"/>
-		<member type="weapon" dy="-7"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="-80"/>
-		<member type="weapon" dy="-11" dx="-1"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-30"/>
-		<member type="arm-right" angle="-40"/>
-		<member type="weapon" dy="-17" dx="1"/>
-		<member type="body" angle="15"/>
-		<member type="foot-left" angle="-15"/>
-		<member type="foot-right" angle="15"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-20"/>
-		<member type="arm-right" angle="0"/>
-		<member type="weapon" dy="-17" dx="6"/>
-		<member type="body" angle="30"/>
-		<member type="foot-left" angle="-30"/>
-		<member type="foot-right" angle="30"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-15"/>
-		<member type="arm-right" angle="40"/>
-		<member type="arm-left" angle="40"/>
-		<member type="weapon" dy="-9" dx="10"/>
-		<member type="body" angle="25"/>
-		<member type="foot-left" angle="-25"/>
-		<member type="foot-right" angle="25"/>
-	</frame>
-	<frame>
-		<member type="head" angle="-5"/>
-		<member type="arm-right" angle="80"/>
-		<member type="arm-left" angle="80"/>
-		<member type="weapon" dy="0" dx="12"/>
-		<member type="body" angle="20"/>
-		<member type="foot-left" angle="-20"/>
-		<member type="foot-right" angle="20"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="8" dx="12"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="weapon" dy="10" dx="14"/>
-		<member type="body" angle="0"/>
-		<member type="foot-left" angle="0"/>
-		<member type="foot-right" angle="0"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bounce_ball-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="40"/>
-		<member type="arm-right" angle="120"/>
-		<member type="arm-left" angle="120"/>
-		<member type="body" angle="-10"/>
-		<member type="foot-left" angle="10"/>
-		<member type="foot-right" angle="-10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="20"/>
-		<member type="arm-right" angle="110"/>
-		<member type="arm-left" angle="110"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="head" angle="10"/>
-		<member type="arm-right" angle="90"/>
-		<member type="arm-left" angle="90"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="head" angle="0"/>
-		<member type="arm-right" angle="60"/>
-		<member type="arm-left" angle="60"/>
-		<member type="body" angle="12"/>
-		<member type="foot-left" angle="-12"/>
-		<member type="foot-right" angle="12"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="30"/>
-		<member type="arm-left" angle="30"/>
-		<member type="body" angle="10"/>
-		<member type="foot-left" angle="-10"/>
-		<member type="foot-right" angle="10"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="20"/>
-		<member type="arm-left" angle="20"/>
-		<member type="body" angle="5"/>
-		<member type="foot-left" angle="-5"/>
-		<member type="foot-right" angle="5"/>
-	</frame>
-	<frame>
-		<member type="arm-right" angle="10"/>
-		<member type="arm-left" angle="10"/>
-	</frame>
-</movement>
-
-<!-- ###### Bazooka ###### -->
-<movement name="weapon-bazooka-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-</movement>
-
-<movement name="weapon-bazooka-end-shoot" speed="70" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="foot-left" dy="-4"/>
-		<member type="foot-right" angle="90" dy="-4" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-200"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-3"/>
-		<member type="foot-right" angle="90" dy="-3" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-190"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="90" dy="-2" dx="4"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-180"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="60" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-120"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-2"/>
-		<member type="foot-right" angle="45" dy="-1" dx="3"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="30" dy="-1" dx="2"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="-1"/>
-		<member type="foot-right" angle="15"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="foot-left" dy="0"/>
-		<member type="foot-right" angle="0"/>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-</movement>
-
-<!-- ###### gun ###### -->
-<movement name="weapon-gun-select" speed="50" play_mode="play_once">
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-20"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-40"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-80"/>
-	</frame>
-</movement>
-
-<!-- ###### Dynamite ###### -->
-<movement name="weapon-dynamite-begin-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="75"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="50"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-dynamite-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-110"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### Mine ###### -->
-<movement name="weapon-minelauncher-begin-shoot" speed="60" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="0"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-</movement>
-
-<movement name="weapon-minelauncher-end-shoot" speed="30" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-90"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-60"/>
-	</frame>
-	<frame>
-		<member type="head" follow_half_crosshair="true"/>
-		<member type="arm-right" follow_half_crosshair="true" angle="-30"/>
-	</frame>
-</movement>
-
-<!-- ###### SuperTux ###### -->
-<movement name="weapon-tux-end-shoot" speed="50" play_mode="play_once" >
-	<collision_rect left="5" right="5" top="10" bottom="2" />
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-135" />
-		<member type="arm-left" angle="-45" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-90" />
-		<member type="arm-left" angle="-90" />
-	</frame>
-	<frame>
-		<member type="head" angle="-90" />
-		<member type="arm-right" angle="-120" />
-		<member type="arm-left" angle="-60" />
-	</frame>
-</movement>
-
-</resources>
diff --git a/data/body/workraveteam/dead.png b/data/body/workraveteam/dead.png
deleted file mode 100644
index cad4ff7..0000000
Binary files a/data/body/workraveteam/dead.png and /dev/null differ
diff --git a/data/body/workraveteam/eyelid.png b/data/body/workraveteam/eyelid.png
deleted file mode 100644
index 5dc980b..0000000
Binary files a/data/body/workraveteam/eyelid.png and /dev/null differ
diff --git a/data/body/workraveteam/eyes.png b/data/body/workraveteam/eyes.png
deleted file mode 100644
index 8fd9041..0000000
Binary files a/data/body/workraveteam/eyes.png and /dev/null differ
diff --git a/data/body/workraveteam/foot.png b/data/body/workraveteam/foot.png
deleted file mode 100644
index c7af1b0..0000000
Binary files a/data/body/workraveteam/foot.png and /dev/null differ
diff --git a/data/body/workraveteam/head.png b/data/body/workraveteam/head.png
deleted file mode 100644
index dac53a0..0000000
Binary files a/data/body/workraveteam/head.png and /dev/null differ
diff --git a/data/body/workraveteam/helmet.png b/data/body/workraveteam/helmet.png
deleted file mode 100644
index ff2e962..0000000
Binary files a/data/body/workraveteam/helmet.png and /dev/null differ
diff --git a/data/body/workraveteam/jetpack-belt.png b/data/body/workraveteam/jetpack-belt.png
deleted file mode 100644
index 76bb346..0000000
Binary files a/data/body/workraveteam/jetpack-belt.png and /dev/null differ
diff --git a/data/body/workraveteam/jetpack-fire.png b/data/body/workraveteam/jetpack-fire.png
deleted file mode 100644
index 8ae896a..0000000
Binary files a/data/body/workraveteam/jetpack-fire.png and /dev/null differ
diff --git a/data/body/workraveteam/jetpack.png b/data/body/workraveteam/jetpack.png
deleted file mode 100644
index f742b77..0000000
Binary files a/data/body/workraveteam/jetpack.png and /dev/null differ
diff --git a/data/body/workraveteam/pupil.png b/data/body/workraveteam/pupil.png
deleted file mode 100644
index 99ec290..0000000
Binary files a/data/body/workraveteam/pupil.png and /dev/null differ
diff --git a/data/body/workraveteam/yoyo.png b/data/body/workraveteam/yoyo.png
deleted file mode 100644
index a5f5846..0000000
Binary files a/data/body/workraveteam/yoyo.png and /dev/null differ
diff --git a/data/game_mode/blitz.xml b/data/game_mode/blitz.xml
new file mode 100644
index 0000000..1412f59
--- /dev/null
+++ b/data/game_mode/blitz.xml
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE game_mode SYSTEM "game_mode.dtd" []>
+<game_mode>
+
+  <auto_change_character>true</auto_change_character>
+  <allow_character_selection>before_first_action_and_end_turn</allow_character_selection>
+  <!-- either 'always','never','before_first_action' -->
+
+  <duration_turn>30</duration_turn>
+  <duration_move_player>2</duration_move_player>
+  <duration_exchange_player>1</duration_exchange_player>
+  <duration_before_death_mode>600</duration_before_death_mode>
+  <damage_per_turn_during_death_mode>5</damage_per_turn_during_death_mode>
+
+  <gravity>30</gravity>
+  <safe_fall>15</safe_fall>
+  <damage_per_fall_unit>2</damage_per_fall_unit>
+
+  <max_teams>4</max_teams>
+  <nb_characters>6</nb_characters>
+
+  <character>
+    <energy initial="100" maximum="200" />
+    <jump strength="8" angle="-60" />
+    <super_jump strength="11" angle="-80" />
+    <back_jump strength="9" angle="-100" />
+    <death_explosion>
+      <damage>10</damage>
+      <explosion_range>50</explosion_range>
+      <particle_range>55</particle_range>
+      <blast_force>1500</blast_force>
+      <blast_range>50</blast_range>
+    </death_explosion>
+    <walking_pause>15</walking_pause>
+  </character>
+
+  <barrel>
+    <explosion>
+      <damage>50</damage>
+      <explosion_range>100</explosion_range>
+      <particle_range>105</particle_range>
+      <blast_force>1500</blast_force>
+      <blast_range>100</blast_range>
+    </explosion>
+  </barrel>
+
+  <bonus_box>
+    <explosion>
+      <damage>30</damage>
+      <explosion_range>50</explosion_range>
+      <particle_range>50</particle_range>
+      <blast_force>500</blast_force>
+      <blast_range>50</blast_range>
+    </explosion>
+    <probability>
+      <air_attack ammo="1">0.9</air_attack>
+      <anvil_launcher ammo="1">0.7</anvil_launcher>
+      <airhammer ammo="2">1</airhammer>
+      <automatic_bazooka ammo="2">0.8</automatic_bazooka>
+      <baseball ammo="2">1</baseball>
+      <blowtorch ammo="2">1</blowtorch>
+      <bounce_ball ammo="1">1</bounce_ball>
+      <construct ammo="3">1</construct>
+      <cluster_bomb ammo="1">1</cluster_bomb>
+      <cluzooka ammo="2">0.9</cluzooka>
+      <disco_grenade ammo="1">0.7</disco_grenade>
+      <dynamite ammo="2">0.9</dynamite>
+      <gnulauncher ammo="1">0.9</gnulauncher>
+      <flamethrower ammo="1">1</flamethrower>
+      <footbomb ammo="1">0.7</footbomb>
+      <grapple ammo="2">1</grapple>
+      <jetpack ammo="1">1</jetpack>
+      <lowgrav ammo="1">1</lowgrav>
+      <m16 ammo="1">0.9</m16>
+      <parachute ammo="2">1</parachute>
+      <polecatlauncher ammo="1">0.8</polecatlauncher>
+      <riot_bomb ammo="1">1</riot_bomb>
+      <shotgun ammo="1">1</shotgun>
+      <snipe_rifle ammo="1">1</snipe_rifle>
+      <teleportation ammo="2">1</teleportation>
+      <tux ammo="1">0.8</tux>
+
+      <bazooka ammo="1">0.0</bazooka>
+      <gun ammo="1">0.0</gun>
+      <grenade ammo="1">0.0</grenade>
+      <minelauncher ammo="1">0.0</minelauncher>
+      <slap ammo="1">0.0</slap>
+      <suicide ammo="1">0.0</suicide>
+      <skip_turn ammo="1">0.0</skip_turn>
+      <syringe ammo="1">0.0</syringe>
+    </probability>
+    <life_points>20</life_points>
+  </bonus_box>
+
+  <medkit>
+    <life_points>20</life_points>
+    <energy_boost>25</energy_boost>
+  </medkit>
+
+  <weapons>
+    <air_attack>
+      <nb_ammo>1</nb_ammo>
+      <nbr_obus>3</nbr_obus>
+      <damage>30</damage>
+      <mass>300</mass>
+      <speed>10</speed>
+      <explosion_range>80</explosion_range>
+      <particle_range>80</particle_range>
+      <blast_range>75</blast_range>
+      <blast_force>2500</blast_force>
+    </air_attack>
+
+    <anvil_launcher>
+      <available_after_turn>5</available_after_turn>
+      <nb_ammo>1</nb_ammo>
+      <damage>200</damage>
+      <mass>1000</mass>
+      <speed>0</speed>
+    </anvil_launcher>
+
+    <airhammer>
+      <min_angle>0</min_angle>
+      <max_angle>0</max_angle>
+      <nb_ammo>3</nb_ammo>
+      <unit_per_ammo>20</unit_per_ammo>
+      <damage>2</damage>
+      <range>30</range>
+    </airhammer>
+
+    <automatic_bazooka>
+      <max_strength>55</max_strength>
+      <nb_ammo>1</nb_ammo>
+      <damage>50</damage>
+      <min_angle>-60</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>80</explosion_range>
+      <particle_range>80</particle_range>
+      <blast_range>75</blast_range>
+      <blast_force>2500</blast_force>
+      <timeout>3</timeout>
+      <uncontrolled_turn_speed>25</uncontrolled_turn_speed>
+      <max_controlled_turn_speed>10</max_controlled_turn_speed>
+      <fuel_time>10</fuel_time>
+      <rocket_force>2500</rocket_force>
+      <allow_change_timeout>1</allow_change_timeout>
+    </automatic_bazooka>
+
+    <baseball>
+      <min_angle>-30</min_angle>
+      <max_angle>75</max_angle>
+      <nb_ammo>2</nb_ammo>
+      <damage>25</damage>
+      <strength>2500</strength>
+      <range>45</range>
+      <display_crosshair>0</display_crosshair>
+    </baseball>
+
+    <bazooka>
+      <max_strength>75</max_strength>
+      <nb_ammo>-1</nb_ammo>
+      <damage>50</damage>
+      <min_angle>-60</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>80</explosion_range>
+      <particle_range>80</particle_range>
+      <blast_range>75</blast_range>
+      <blast_force>2500</blast_force>
+    </bazooka>
+
+    <cluzooka>
+      <max_strength>55</max_strength>
+      <nb_ammo>3</nb_ammo>
+      <damage>25</damage>
+      <min_angle>-60</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>30</explosion_range>
+      <particle_range>20</particle_range>
+      <blast_range>50</blast_range>
+      <blast_force>4500</blast_force>
+      <timeout>3</timeout>
+      <allow_change_timeout>1</allow_change_timeout>
+      <nb_fragments>5</nb_fragments>
+      <nb_angle_dispersion>75</nb_angle_dispersion>
+    </cluzooka>
+
+    <blowtorch>
+      <nb_ammo>3</nb_ammo>
+      <min_angle>-45</min_angle>
+      <max_angle>45</max_angle>
+      <unit_per_ammo>20</unit_per_ammo>
+      <range>2</range>
+    </blowtorch>
+
+    <bounce_ball>
+      <max_strength>0</max_strength>
+      <nb_ammo>1</nb_ammo>
+      <damage>50</damage>
+      <min_angle>45</min_angle>
+      <max_angle>45</max_angle>
+      <explosion_range>50</explosion_range>
+      <particle_range>55</particle_range>
+      <blast_range>4</blast_range>
+      <blast_force>8</blast_force>
+      <timeout>10</timeout>
+      <allow_change_timeout>1</allow_change_timeout>
+    </bounce_ball>
+
+    <construct>
+      <nb_ammo>3</nb_ammo>
+    </construct>
+
+    <cluster_bomb>
+      <max_strength>55</max_strength>
+      <nb_ammo>3</nb_ammo>
+      <damage>20</damage>
+      <min_angle>-89</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>50</explosion_range>
+      <particle_range>55</particle_range>
+      <blast_range>50</blast_range>
+      <blast_force>250</blast_force>
+      <timeout>3</timeout>
+      <nb_fragments>5</nb_fragments>
+      <allow_change_timeout>1</allow_change_timeout>
+    </cluster_bomb>
+
+    <disco_grenade>
+      <available_after_turn>3</available_after_turn>
+      <nb_ammo>1</nb_ammo>
+      <max_strength>40</max_strength>
+      <damage>80</damage>
+      <min_angle>-89</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>125</explosion_range>
+      <particle_range>125</particle_range>
+      <blast_range>150</blast_range>
+      <blast_force>1500</blast_force>
+      <timeout>5</timeout>
+      <allow_change_timeout>1</allow_change_timeout>
+    </disco_grenade>
+
+    <footbomb>
+      <max_strength>100</max_strength>
+      <nb_ammo>1</nb_ammo>
+      <damage>60</damage>
+      <min_angle>-89</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>100</explosion_range>
+      <particle_range>100</particle_range>
+      <blast_range>100</blast_range>
+      <blast_force>1000</blast_force>
+      <timeout>5</timeout>
+      <nb_fragments>2</nb_fragments>
+      <nb_recursions>2</nb_recursions>
+      <nb_angle_dispersion>45</nb_angle_dispersion>
+      <nb_min_speed>15</nb_min_speed>
+      <nb_max_speed>35</nb_max_speed>
+      <allow_change_timeout>1</allow_change_timeout>
+    </footbomb>
+
+    <dynamite>
+      <nb_ammo>2</nb_ammo>
+      <damage>75</damage>
+      <explosion_range>100</explosion_range>
+      <particle_range>110</particle_range>
+      <blast_force>3000</blast_force>
+      <blast_range>100</blast_range>
+      <timeout>3</timeout>
+      <allow_change_timeout>1</allow_change_timeout>
+    </dynamite>
+
+    <flamethrower>
+      <min_angle>-90</min_angle>
+      <max_angle>90</max_angle>
+      <nb_ammo>2</nb_ammo>
+      <unit_per_ammo>25</unit_per_ammo>
+      <damage>2</damage>
+      <explosion_range>3</explosion_range>
+      <particle_range>16</particle_range>
+    </flamethrower>
+
+    <gnulauncher>
+      <max_strength>25</max_strength>
+      <nb_ammo>1</nb_ammo>
+      <damage>80</damage>
+      <min_angle>-89</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>100</explosion_range>
+      <particle_range>110</particle_range>
+      <blast_force>3000</blast_force>
+      <blast_range>100</blast_range>
+      <timeout>6</timeout>
+      <allow_change_timeout>1</allow_change_timeout>
+      <display_crosshair>0</display_crosshair>
+    </gnulauncher>
+
+    <grapple>
+      <nb_ammo>7</nb_ammo>
+      <change_weapon>1</change_weapon>
+      <min_angle>-45</min_angle>
+      <max_angle>89</max_angle>
+      <max_rope_length>500</max_rope_length>
+      <automatic_growing_speed>12</automatic_growing_speed>
+      <push_force>15</push_force>
+    </grapple>
+
+    <grenade>
+      <max_strength>55</max_strength>
+      <nb_ammo>-1</nb_ammo>
+      <damage>50</damage>
+      <min_angle>-89</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>75</explosion_range>
+      <particle_range>80</particle_range>
+      <blast_range>75</blast_range>
+      <blast_force>1000</blast_force>
+      <timeout>3</timeout>
+      <allow_change_timeout>1</allow_change_timeout>
+    </grenade>
+
+    <gun>
+      <min_angle>-89</min_angle>
+      <max_angle>90</max_angle>
+      <nb_ammo>-1</nb_ammo>
+      <unit_per_ammo>2</unit_per_ammo>
+      <damage>25</damage>
+      <explosion_range>5</explosion_range>
+      <particle_range>5</particle_range>
+      <blast_range>2</blast_range>
+      <blast_force>5</blast_force>
+    </gun>
+
+    <jetpack>
+      <nb_ammo>3</nb_ammo>
+      <unit_per_ammo>30</unit_per_ammo>
+      <change_weapon>1</change_weapon>
+    </jetpack>
+
+    <lowgrav>
+      <nb_ammo>3</nb_ammo>
+      <change_weapon>1</change_weapon>
+    </lowgrav>
+
+    <m16> <!-- Aka submachine gun -->
+      <min_angle>-40</min_angle>
+      <max_angle>89</max_angle>
+      <nb_ammo>2</nb_ammo>
+      <unit_per_ammo>10</unit_per_ammo>
+      <damage>5</damage>
+      <explosion_range>15</explosion_range>
+      <particle_range>16</particle_range>
+    </m16>
+
+    <minelauncher>
+      <nb_ammo>-1</nb_ammo>
+      <damage>50</damage>
+      <explosion_range>55</explosion_range>
+      <particle_range>55</particle_range>
+      <blast_range>55</blast_range>
+      <blast_force>250</blast_force>
+      <detection_range>1</detection_range>
+      <speed_detection>2</speed_detection>
+      <timeout>1</timeout>
+      <escape_time>2</escape_time>
+    </minelauncher>
+
+    <parachute>
+      <nb_ammo>2</nb_ammo>
+      <change_weapon>1</change_weapon>
+      <wind_factor>400.0</wind_factor>
+      <air_resist_factor>40.0</air_resist_factor>
+      <force_side_displacement>2000.0</force_side_displacement>
+    </parachute>
+
+    <polecatlauncher>
+      <max_strength>25</max_strength>
+      <nb_ammo>1</nb_ammo>
+      <damage>10</damage>
+      <min_angle>-89</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>100</explosion_range>
+      <particle_range>110</particle_range>
+      <blast_force>3000</blast_force>
+      <blast_range>100</blast_range>
+      <timeout>6</timeout>
+      <allow_change_timeout>1</allow_change_timeout>
+      <display_crosshair>0</display_crosshair>
+    </polecatlauncher>
+
+    <riot_bomb>
+      <max_strength>50</max_strength>
+      <nb_ammo>3</nb_ammo>
+      <damage>0</damage>
+      <min_angle>-60</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>125</explosion_range>
+      <particle_range>25</particle_range>
+      <blast_range>0</blast_range>
+      <blast_force>0</blast_force>
+    </riot_bomb>
+
+    <shotgun> <!-- shotgun blues -->
+      <min_angle>-40</min_angle>
+      <max_angle>89</max_angle>
+      <nb_ammo>2</nb_ammo>
+      <unit_per_ammo>2</unit_per_ammo>
+      <damage>10</damage> <!-- per bullet! -->
+    </shotgun>
+
+    <skip_turn>
+      <nb_ammo>-1</nb_ammo>
+    </skip_turn>
+
+    <slap>
+      <min_angle>-45</min_angle>
+      <max_angle>45</max_angle>
+      <nb_ammo>-1</nb_ammo>
+      <damage>5</damage>
+      <range>25</range>
+      <strength>300</strength>
+      <display_crosshair>0</display_crosshair>
+      <speed_on_hit>1000</speed_on_hit>
+    </slap>
+
+    <snipe_rifle>
+      <min_angle>-30</min_angle>
+      <max_angle>45</max_angle>
+      <nb_ammo>2</nb_ammo>
+      <unit_per_ammo>2</unit_per_ammo>
+      <damage>25</damage>
+      <explosion_range>15</explosion_range>
+      <particle_range>16</particle_range>
+      <display_crosshair>0</display_crosshair>
+    </snipe_rifle>
+
+    <suicide>
+      <nb_ammo>-1</nb_ammo>
+      <damage>20</damage>
+      <explosion_range>100</explosion_range>
+      <particle_range>110</particle_range>
+      <blast_force>3000</blast_force>
+      <blast_range>100</blast_range>
+    </suicide>
+
+    <syringe>
+      <min_angle>-50</min_angle>
+      <max_angle>85</max_angle>
+      <nb_ammo>-1</nb_ammo>
+      <damage>10</damage>
+      <turns>10</turns>
+      <range>45</range>
+      <display_crosshair>0</display_crosshair>
+    </syringe>
+
+    <teleportation>
+      <nb_ammo>2</nb_ammo>
+    </teleportation>
+
+    <tux>
+      <available_after_turn>7</available_after_turn>
+      <nb_ammo>1</nb_ammo>
+      <damage>50</damage>
+      <min_angle>-89</min_angle>
+      <max_angle>89</max_angle>
+      <explosion_range>75</explosion_range>
+      <particle_range>80</particle_range>
+      <blast_range>75</blast_range>
+      <blast_force>1000</blast_force>
+      <speed>600</speed>
+      <timeout>20</timeout>
+      <display_crosshair>0</display_crosshair>
+    </tux>
+
+  </weapons>
+
+</game_mode>
diff --git a/data/game_mode/blitz_objects.xml b/data/game_mode/blitz_objects.xml
new file mode 100644
index 0000000..1e1a694
--- /dev/null
+++ b/data/game_mode/blitz_objects.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE objects_physics SYSTEM "objects.dtd" []>
+<objects_physics>
+
+  <!-- Various objects configs -->
+
+  <character>
+    <mass>100.0</mass>
+    <wind_factor>0.0</wind_factor>
+    <air_resist_factor>0.1</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>true</rebounding>
+    <rebound_factor>0.25</rebound_factor>
+  </character>
+
+  <bonus_box>
+    <mass>100.0</mass>
+    <wind_factor>13.0</wind_factor>
+    <air_resist_factor>16.0</air_resist_factor>
+    <gravity_factor>1.2</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </bonus_box>
+
+  <medkit>
+    <mass>100.0</mass>
+    <wind_factor>13.0</wind_factor>
+    <air_resist_factor>16.0</air_resist_factor>
+    <gravity_factor>1.2</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </medkit>
+
+  <barrel>
+    <mass>1000.0</mass>
+    <wind_factor>0.3</wind_factor>
+    <air_resist_factor>20.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </barrel>
+
+  <anvil>
+    <mass>10000.0</mass>
+    <wind_factor>0.3</wind_factor>
+    <air_resist_factor>20.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </anvil>
+
+  <!-- Dummy value, will be overwritten by the value contained in each
+       map config file  -->
+  <wind_particle>
+    <mass>50.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>1.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </wind_particle>
+
+  <!-- Particles Configs -->
+  <smoke_particle>  <!-- Unused particle -->
+    <mass>0.5</mass>
+    <wind_factor>0.8</wind_factor>
+    <air_resist_factor>0.2</air_resist_factor>
+    <gravity_factor>-1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </smoke_particle>
+
+  <polecat_fart_particle>  <!-- Polecat Fart -->
+    <mass>0.5</mass>
+    <wind_factor>1.5</wind_factor>
+    <air_resist_factor>0.1</air_resist_factor>
+    <gravity_factor>-0.2</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </polecat_fart_particle>
+
+  <fire_particle>  <!-- Particle used during explosions -->
+    <mass>100.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.2</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </fire_particle>
+
+  <explosion_smoke_particle> <!-- Particle used during explosions -->
+    <mass>0.5</mass>
+    <wind_factor>10.0</wind_factor>
+    <air_resist_factor>0.2</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>  <!-- Randomly set in the code -->
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </explosion_smoke_particle>
+
+  <dark_smoke>  <!-- Particle bazooka and auto-bazooka... -->
+    <mass>0.5</mass>
+    <wind_factor>0.2</wind_factor>
+    <air_resist_factor>0.5</air_resist_factor>
+    <gravity_factor>0.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </dark_smoke>
+
+  <star_particle>  <!-- Particle for tux weapon -->
+    <mass>0.5</mass>
+    <wind_factor>0.2</wind_factor>
+    <air_resist_factor>0.2</air_resist_factor>
+    <gravity_factor>0.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </star_particle>
+
+  <magic_star_particle> <!-- Particle for the disco grenade -->
+    <mass>0.5</mass>
+    <wind_factor>0.2</wind_factor>
+    <air_resist_factor>0.2</air_resist_factor>
+    <gravity_factor>0.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </magic_star_particle>
+
+  <bullet_particle> <!-- the gun and M16 -->
+    <mass>2.0</mass>
+    <wind_factor>0.01</wind_factor>
+    <air_resist_factor>0.01</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>true</rebounding>
+    <rebound_factor>0.7</rebound_factor>
+  </bullet_particle>
+
+  <ground_particle> <!-- with airhammer -->
+      <mass>100.0</mass>
+      <wind_factor>0.01</wind_factor>
+      <air_resist_factor>0.01</air_resist_factor>
+      <gravity_factor>1.0</gravity_factor>
+      <rebounding>false</rebounding>
+      <rebound_factor>0.7</rebound_factor>
+  </ground_particle>
+
+  <body_member_particle> <!-- during suicide -->
+    <mass>100.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>1.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>true</rebounding>
+    <rebound_factor>0.7</rebound_factor>
+  </body_member_particle>
+
+  <teleport_member_particle> <!-- during teleportation -->
+    <mass>1.0</mass>
+    <wind_factor>0.0</wind_factor>
+    <air_resist_factor>1.0</air_resist_factor>
+    <gravity_factor>0.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.7</rebound_factor>
+  </teleport_member_particle>
+
+  <water_particle>  <!-- when falling into water -->
+    <mass>2.0</mass>
+    <wind_factor>0.0</wind_factor>
+    <air_resist_factor>0.2</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.0</rebound_factor>
+  </water_particle>
+
+  <!-- Weapons Configs -->
+  <!-- Weapons bullets -->
+  <gun_bullet>
+    <mass>2.0</mass>
+    <wind_factor>0.8</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>0.1</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </gun_bullet>
+
+  <buckshot> <!-- shotgun ammo -->
+    <mass>1.0</mass>
+    <wind_factor>0.8</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>0.1</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </buckshot>
+
+  <m16_bullet>
+    <mass>2.0</mass>
+    <wind_factor>0.8</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>0.1</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </m16_bullet>
+
+  <snipe_rifle_bullet>
+    <mass>2.0</mass>
+    <wind_factor>0.8</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>0.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </snipe_rifle_bullet>
+
+  <flamethrower_bullet>
+    <mass>5.0</mass>
+    <wind_factor>0.8</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>0.2</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </flamethrower_bullet>
+
+  <!-- Weapons projectiles -->
+  <!-- Bazooka and automatic bazookas rockets -->
+  <rocket>
+    <mass>20.0</mass>
+    <wind_factor>75.0</wind_factor>
+    <air_resist_factor>0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </rocket>
+
+  <cluz_rocket>
+    <mass>15.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.9</rebound_factor>
+  </cluz_rocket>
+
+  <cluz_cluster>
+    <mass>5.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.9</rebound_factor>
+  </cluz_cluster>
+
+  <riot_rocket>
+    <mass>50.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.8</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </riot_rocket>
+
+  <grenade>
+    <mass>30.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>true</rebounding>
+    <rebound_factor>0.7</rebound_factor>
+  </grenade>
+
+  <disco_grenade>
+    <mass>2.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>true</rebounding>
+    <rebound_factor>0.4</rebound_factor>
+  </disco_grenade>
+
+  <cluster_bomb>
+    <mass>30.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.3</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>true</rebounding>
+    <rebound_factor>0.7</rebound_factor>
+  </cluster_bomb>
+
+  <cluster>
+    <mass>30.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </cluster>
+
+  <footbomb>
+    <mass>50.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.3</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>true</rebounding>
+    <rebound_factor>0.9</rebound_factor>
+  </footbomb>
+
+  <dynamite_bullet>
+    <mass>100.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>1.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </dynamite_bullet>
+
+  <air_attack_plane>
+    <mass>1.0</mass>
+    <wind_factor>0.0</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>0.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </air_attack_plane>
+
+  <air_attack_projectile>
+    <mass>200.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.5</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </air_attack_projectile>
+
+  <supertux>
+    <mass>20.0</mass>
+    <wind_factor>0.0</wind_factor>
+    <air_resist_factor>1.0</air_resist_factor>
+    <gravity_factor>0.0</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </supertux>
+
+  <gnu>
+    <mass>40.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>   <!-- bouncing handled in the code  -->
+    <rebound_factor>0.01</rebound_factor>
+  </gnu>
+
+  <polecat>
+    <mass>5.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>false</rebounding>   <!-- bouncing handled in the code  -->
+    <rebound_factor>0.01</rebound_factor>
+  </polecat>
+
+  <bounce_ball>
+    <mass>2.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>0.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>true</rebounding>
+    <rebound_factor>1.1</rebound_factor>
+  </bounce_ball>
+
+  <mine>
+    <mass>500.0</mass>
+    <wind_factor>1.0</wind_factor>
+    <air_resist_factor>1.0</air_resist_factor>
+    <gravity_factor>1.0</gravity_factor>
+    <rebounding>true</rebounding>
+    <rebound_factor>0.01</rebound_factor>
+  </mine>
+
+</objects_physics>
diff --git a/data/game_mode/classic.xml b/data/game_mode/classic.xml
index 1fec511..628b5ee 100644
--- a/data/game_mode/classic.xml
+++ b/data/game_mode/classic.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE game_mode SYSTEM "game_mode.dtd" []>
 <game_mode>
 
-
-  <allow_character_selection>before_first_action_and_end_turn</allow_character_selection>
-  <!-- either 'always','never','before_first_action','change_on_end_turn','before_first_action_and_end_turn'-->
+  <auto_change_character>true</auto_change_character>
+  <allow_character_selection>before_first_action</allow_character_selection>
+  <!-- either 'always','never','before_first_action' -->
 
   <duration_turn>60</duration_turn>
   <duration_move_player>2</duration_move_player>
@@ -79,6 +79,15 @@
       <snipe_rifle ammo="1">1</snipe_rifle>
       <teleportation ammo="2">1</teleportation>
       <tux ammo="1">0.8</tux>
+
+      <bazooka ammo="1">0.0</bazooka>
+      <gun ammo="1">0.0</gun>
+      <grenade ammo="1">0.0</grenade>
+      <minelauncher ammo="1">0.0</minelauncher>
+      <slap ammo="1">0.0</slap>
+      <suicide ammo="1">0.0</suicide>
+      <skip_turn ammo="1">0.0</skip_turn>
+      <syringe ammo="1">0.0</syringe>
     </probability>
     <life_points>20</life_points>
   </bonus_box>
@@ -91,18 +100,19 @@
   <weapons>
     <air_attack>
       <nb_ammo>1</nb_ammo>
-      <nbr_obus>3</nbr_obus>
+      <nbr_obus>4</nbr_obus>
       <damage>30</damage>
       <mass>300</mass>
       <speed>10</speed>
       <explosion_range>80</explosion_range>
       <particle_range>80</particle_range>
-      <blast_range>75</blast_range>
-      <blast_force>2500</blast_force>
+      <blast_range>85</blast_range>
+      <blast_force>1500</blast_force>
     </air_attack>
 
     <anvil_launcher>
-      <nb_ammo>0</nb_ammo>
+      <available_after_turn>5</available_after_turn>
+      <nb_ammo>1</nb_ammo>
       <damage>200</damage>
       <mass>1000</mass>
       <speed>0</speed>
@@ -118,7 +128,7 @@
     </airhammer>
 
     <automatic_bazooka>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>1</nb_ammo>
       <damage>50</damage>
       <min_angle>-60</min_angle>
@@ -146,7 +156,7 @@
     </baseball>
 
     <bazooka>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>-1</nb_ammo>
       <damage>50</damage>
       <min_angle>-60</min_angle>
@@ -158,7 +168,7 @@
     </bazooka>
 
     <cluzooka>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>3</nb_ammo>
       <damage>25</damage>
       <min_angle>-60</min_angle>
@@ -200,7 +210,7 @@
     </construct>
 
     <cluster_bomb>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>3</nb_ammo>
       <damage>20</damage>
       <min_angle>-89</min_angle>
@@ -215,8 +225,9 @@
     </cluster_bomb>
 
     <disco_grenade>
+      <available_after_turn>3</available_after_turn>
+      <nb_ammo>1</nb_ammo>
       <max_strength>40</max_strength>
-      <nb_ammo>0</nb_ammo>
       <damage>80</damage>
       <min_angle>-89</min_angle>
       <max_angle>89</max_angle>
@@ -294,7 +305,7 @@
     </grapple>
 
     <grenade>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>-1</nb_ammo>
       <damage>50</damage>
       <min_angle>-89</min_angle>
@@ -364,7 +375,7 @@
     <polecatlauncher>
       <max_strength>25</max_strength>
       <nb_ammo>1</nb_ammo>
-      <damage>80</damage>
+      <damage>10</damage>
       <min_angle>-89</min_angle>
       <max_angle>89</max_angle>
       <explosion_range>100</explosion_range>
@@ -400,6 +411,17 @@
       <nb_ammo>-1</nb_ammo>
     </skip_turn>
 
+    <slap>
+      <min_angle>-45</min_angle>
+      <max_angle>45</max_angle>
+      <nb_ammo>-1</nb_ammo>
+      <damage>5</damage>
+      <range>25</range>
+      <strength>300</strength>
+      <display_crosshair>0</display_crosshair>
+      <speed_on_hit>1000</speed_on_hit>
+    </slap>
+
     <snipe_rifle>
       <min_angle>-30</min_angle>
       <max_angle>45</max_angle>
@@ -435,7 +457,8 @@
     </teleportation>
 
     <tux>
-      <nb_ammo>0</nb_ammo>
+      <available_after_turn>7</available_after_turn>
+      <nb_ammo>1</nb_ammo>
       <damage>50</damage>
       <min_angle>-89</min_angle>
       <max_angle>89</max_angle>
diff --git a/data/game_mode/classic_objects.xml b/data/game_mode/classic_objects.xml
index 288adfa..1e1a694 100644
--- a/data/game_mode/classic_objects.xml
+++ b/data/game_mode/classic_objects.xml
@@ -72,9 +72,9 @@
 
   <polecat_fart_particle>  <!-- Polecat Fart -->
     <mass>0.5</mass>
-    <wind_factor>0.8</wind_factor>
-    <air_resist_factor>0.2</air_resist_factor>
-    <gravity_factor>0.0</gravity_factor>
+    <wind_factor>1.5</wind_factor>
+    <air_resist_factor>0.1</air_resist_factor>
+    <gravity_factor>-0.2</gravity_factor>
     <rebounding>false</rebounding>
     <rebound_factor>0.01</rebound_factor>
   </polecat_fart_particle>
diff --git a/data/game_mode/unlimited.xml b/data/game_mode/unlimited.xml
index da6fdc6..019ff8c 100644
--- a/data/game_mode/unlimited.xml
+++ b/data/game_mode/unlimited.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE game_mode SYSTEM "game_mode.dtd" []>
 <game_mode>
 
-
-  <allow_character_selection>before_first_action_and_end_turn</allow_character_selection>
-  <!-- either 'always','never','before_first_action','change_on_end_turn','before_first_action_and_end_turn'-->
+  <auto_change_character>true</auto_change_character>
+  <allow_character_selection>before_first_action</allow_character_selection>
+  <!-- either 'always','never','before_first_action' -->
 
   <duration_turn>60</duration_turn>
   <duration_move_player>2</duration_move_player>
@@ -79,6 +79,15 @@
       <snipe_rifle ammo="1">1</snipe_rifle>
       <teleportation ammo="2">1</teleportation>
       <tux ammo="1">0.8</tux>
+
+      <bazooka ammo="1">0.0</bazooka>
+      <gun ammo="1">0.0</gun>
+      <grenade ammo="1">0.0</grenade>
+      <minelauncher ammo="1">0.0</minelauncher>
+      <slap ammo="1">0.0</slap>
+      <suicide ammo="1">0.0</suicide>
+      <skip_turn ammo="1">0.0</skip_turn>
+      <syringe ammo="1">0.0</syringe>
     </probability>
     <life_points>20</life_points>
   </bonus_box>
@@ -118,7 +127,7 @@
     </airhammer>
 
     <automatic_bazooka>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>-1</nb_ammo>
       <damage>50</damage>
       <min_angle>-60</min_angle>
@@ -146,7 +155,7 @@
     </baseball>
 
     <bazooka>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>-1</nb_ammo>
       <damage>50</damage>
       <min_angle>-60</min_angle>
@@ -158,7 +167,7 @@
     </bazooka>
 
     <cluzooka>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>-1</nb_ammo>
       <damage>25</damage>
       <min_angle>-60</min_angle>
@@ -200,7 +209,7 @@
     </construct>
 
     <cluster_bomb>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>-1</nb_ammo>
       <damage>20</damage>
       <min_angle>-89</min_angle>
@@ -294,7 +303,7 @@
     </grapple>
 
     <grenade>
-      <max_strength>75</max_strength>
+      <max_strength>55</max_strength>
       <nb_ammo>-1</nb_ammo>
       <damage>50</damage>
       <min_angle>-89</min_angle>
@@ -364,7 +373,7 @@
     <polecatlauncher>
       <max_strength>25</max_strength>
       <nb_ammo>-1</nb_ammo>
-      <damage>80</damage>
+      <damage>10</damage>
       <min_angle>-89</min_angle>
       <max_angle>89</max_angle>
       <explosion_range>100</explosion_range>
@@ -400,6 +409,17 @@
       <nb_ammo>-1</nb_ammo>
     </skip_turn>
 
+    <slap>
+      <min_angle>-45</min_angle>
+      <max_angle>45</max_angle>
+      <nb_ammo>-1</nb_ammo>
+      <damage>5</damage>
+      <range>25</range>
+      <strength>300</strength>
+      <display_crosshair>0</display_crosshair>
+      <speed_on_hit>1000</speed_on_hit>
+    </slap>
+
     <snipe_rifle>
       <min_angle>-30</min_angle>
       <max_angle>45</max_angle>
diff --git a/data/game_mode/unlimited_objects.xml b/data/game_mode/unlimited_objects.xml
index 288adfa..aa5668e 100644
--- a/data/game_mode/unlimited_objects.xml
+++ b/data/game_mode/unlimited_objects.xml
@@ -72,9 +72,9 @@
 
   <polecat_fart_particle>  <!-- Polecat Fart -->
     <mass>0.5</mass>
-    <wind_factor>0.8</wind_factor>
-    <air_resist_factor>0.2</air_resist_factor>
-    <gravity_factor>0.0</gravity_factor>
+    <wind_factor>1.5</wind_factor>
+    <air_resist_factor>0.1</air_resist_factor>
+    <gravity_factor>-0.01</gravity_factor>
     <rebounding>false</rebounding>
     <rebound_factor>0.01</rebound_factor>
   </polecat_fart_particle>
diff --git a/data/gfx/arrow.png b/data/gfx/arrow.png
index ac26a0a..bb82df1 100644
Binary files a/data/gfx/arrow.png and b/data/gfx/arrow.png differ
diff --git a/data/gfx/pointer.png b/data/gfx/pointer.png
index 4dd61b0..e59c24e 100644
Binary files a/data/gfx/pointer.png and b/data/gfx/pointer.png differ
diff --git a/data/gfx/water/dirtywater.png b/data/gfx/water/dirtywater.png
new file mode 100644
index 0000000..eb4cb29
Binary files /dev/null and b/data/gfx/water/dirtywater.png differ
diff --git a/data/gfx/water/dirtywater_bottom.png b/data/gfx/water/dirtywater_bottom.png
new file mode 100644
index 0000000..7993acb
Binary files /dev/null and b/data/gfx/water/dirtywater_bottom.png differ
diff --git a/data/gfx/water/dirtywater_part.png b/data/gfx/water/dirtywater_part.png
new file mode 100644
index 0000000..9143b34
Binary files /dev/null and b/data/gfx/water/dirtywater_part.png differ
diff --git a/data/gfx/water/lava.png b/data/gfx/water/lava.png
index 6e76653..6d5419a 100644
Binary files a/data/gfx/water/lava.png and b/data/gfx/water/lava.png differ
diff --git a/data/gfx/water/lava_bottom.png b/data/gfx/water/lava_bottom.png
index dc358b1..acb9480 100644
Binary files a/data/gfx/water/lava_bottom.png and b/data/gfx/water/lava_bottom.png differ
diff --git a/data/gfx/water/radioactive.png b/data/gfx/water/radioactive.png
new file mode 100644
index 0000000..524fd82
Binary files /dev/null and b/data/gfx/water/radioactive.png differ
diff --git a/data/gfx/water/radioactive_bottom.png b/data/gfx/water/radioactive_bottom.png
new file mode 100644
index 0000000..fc5ad3b
Binary files /dev/null and b/data/gfx/water/radioactive_bottom.png differ
diff --git a/data/gfx/water/radioactive_drop.png b/data/gfx/water/radioactive_drop.png
new file mode 100644
index 0000000..6ac3e4d
Binary files /dev/null and b/data/gfx/water/radioactive_drop.png differ
diff --git a/data/gfx/water/water.png b/data/gfx/water/water.png
index 0ee8b2a..77a3248 100644
Binary files a/data/gfx/water/water.png and b/data/gfx/water/water.png differ
diff --git a/data/gfx/water/water_bottom.png b/data/gfx/water/water_bottom.png
index e230da0..4e144b1 100644
Binary files a/data/gfx/water/water_bottom.png and b/data/gfx/water/water_bottom.png differ
diff --git a/data/gfx/water/water_drop.png b/data/gfx/water/water_drop.png
index b7db841..9787cae 100644
Binary files a/data/gfx/water/water_drop.png and b/data/gfx/water/water_drop.png differ
diff --git a/data/graphism.xml b/data/graphism.xml
index eec54dc..0772d11 100644
--- a/data/graphism.xml
+++ b/data/graphism.xml
@@ -35,14 +35,6 @@
 
   <surface name="ico_update" file="menu/i_update.png" />
 
-  <surface name="video_label" file="menu/video_label.png" />
-  <surface name="config_label" file="menu/config_label.png" />
-  <surface name="audio_label" file="menu/audio_label.png" />
-  <surface name="teams_label" file="menu/teams_label.png" />
-  <surface name="map_label" file="menu/map_label.png" />
-  <surface name="mode_label" file="menu/mode_label.png" />
-
-
   <surface name="enabled" file="menu/enabled.png" />
   <surface name="disabled_front" file="menu/disabled_front.png" />
   <surface name="disabled_back" file="menu/disabled_back.png" />
@@ -59,6 +51,7 @@
   <surface name="sound_frequency" file="menu/sound_frequency.png" />
   <surface name="music_enable" file="menu/music_enable.png" />
   <surface name="sound_effects_enable" file="menu/sound_effects_enable.png" />
+  <surface name="warn_on_new_player" file="menu/bip.png" />
 
   <!-- Display options -->
 
@@ -72,9 +65,16 @@
 
   <!-- Game mode options -->
 
+  <surface name="game_mode" file="menu/game_mode.png" />
   <surface name="timing_turn" file="menu/timing_turn.png" />
   <surface name="timing_end_of_turn" file="menu/timing_end_turn.png" />
+  <surface name="timing_death" file="menu/timing_death.png" />
   <surface name="energy" file="menu/display_energy.png" />
+  <surface name="death_energy" file="menu/death_energy.png" />
+  <surface name="init_energy" file="menu/init_energy.png" />
+  <surface name="max_energy" file="menu/max_energy.png" />
+  <surface name="character_selection" file="menu/timing_switch.png" />
+  <surface name="gravity" file="menu/gravity.png" />
 
   <!-- For results menu -->
   <surface name="podium" file="menu/podium.png" />
@@ -82,6 +82,16 @@
   <!-- Random map -->
   <surface name="random_map" file="map/random_map.jpg" />
 
+  <!-- For nework menu  -->
+  <surface name="password_lock" file="menu/padlock.png" />
+
+  <!-- For team editor menu -->
+
+ <surface name="add_custom_team" file="menu/add_custom_team.png" />
+ <surface name="del_custom_team" file="menu/del_custom_team.png" />
+
+
+
   <!-- Buttons -->
 
   <sprite name="send_txt">
@@ -158,20 +168,19 @@
 
 <section name="help">
   <surface name="background" file="menu/background_help.png" />
-  <surface name="help_shortkeys_en" file="help/en/shortkeys.png" />
-  <surface name="help_shortkeys_es" file="help/es/shortkeys.png" />
+  <surface name="shortkeys" file="menu/help_shortkeys.png" />
 </section>
 
 <section name="object">
   <sprite name="bonus_box">
     <image file="object/bonus_box.png">
-      <grid pos="0,0" size="84,88" array="4,1" />
+      <grid pos="0,0" size="65,102" array="4,1" />
     </image>
     <animation loop_mode="false"/>
   </sprite>
   <sprite name="medkit">
     <image file="object/medkit.png">
-      <grid pos="0,0" size="84,88" array="4,1" />
+      <grid pos="0,0" size="65,102" array="4,1" />
     </image>
     <animation loop_mode="false"/>
   </sprite>
@@ -220,6 +229,13 @@
   <color name="energy_color_100_percent" r="21" g="100" b="136" a="255" />
 </section>
 
+<section name="water_colors">
+  <color name="water" r="0" g="109" b="193" a="127" />
+  <color name="lava" r="255" g="148" b="0" a="224" />
+  <color name="radioactive" r="255" g="212" b="212" a="224" />
+  <color name="dirtywater" r="67" g="107" b="21" a="64" />
+</section>
+
 <section name="gfx">
   <surface name="pointeur1" file="gfx/pointer.png" />
 
@@ -233,6 +249,12 @@
   <surface name="lava" file="gfx/water/lava.png" />
   <surface name="lava_bottom" file="gfx/water/lava_bottom.png" />
 
+  <surface name="radioactive" file="gfx/water/radioactive.png" />
+  <surface name="radioactive_bottom" file="gfx/water/radioactive_bottom.png" />
+
+  <surface name="dirtywater" file="gfx/water/dirtywater.png" />
+  <surface name="dirtywater_bottom" file="gfx/water/dirtywater_bottom.png" />
+
 </section>
 
 </resources>
diff --git a/data/help/ca/shortkeys.png b/data/help/ca/shortkeys.png
index 78c7154..8cd2854 100644
Binary files a/data/help/ca/shortkeys.png and b/data/help/ca/shortkeys.png differ
diff --git a/data/help/en/shortkeys.png b/data/help/en/shortkeys.png
index f13b9b7..4644437 100644
Binary files a/data/help/en/shortkeys.png and b/data/help/en/shortkeys.png differ
diff --git a/data/help/es/shortkeys.png b/data/help/es/shortkeys.png
index fc0d476..1e7c491 100644
Binary files a/data/help/es/shortkeys.png and b/data/help/es/shortkeys.png differ
diff --git a/data/interface/background_interface.png b/data/interface/background_interface.png
index 619c410..28826c7 100644
Binary files a/data/interface/background_interface.png and b/data/interface/background_interface.png differ
diff --git a/data/interface/clock.png b/data/interface/clock.png
index 0491a06..fd09e1d 100644
Binary files a/data/interface/clock.png and b/data/interface/clock.png differ
diff --git a/data/interface/clock_background.png b/data/interface/clock_background.png
index d1a650b..5835f49 100644
Binary files a/data/interface/clock_background.png and b/data/interface/clock_background.png differ
diff --git a/data/interface/cross.png b/data/interface/cross.png
index c12ae32..98734c2 100644
Binary files a/data/interface/cross.png and b/data/interface/cross.png differ
diff --git a/data/interface/cursors/arrow-down.left.png b/data/interface/cursors/arrow-down.left.png
index 1b3247f..8040215 100644
Binary files a/data/interface/cursors/arrow-down.left.png and b/data/interface/cursors/arrow-down.left.png differ
diff --git a/data/interface/cursors/arrow-down.png b/data/interface/cursors/arrow-down.png
index 8201820..25f4cdf 100644
Binary files a/data/interface/cursors/arrow-down.png and b/data/interface/cursors/arrow-down.png differ
diff --git a/data/interface/cursors/arrow-down.right.png b/data/interface/cursors/arrow-down.right.png
index 0a46ca0..311fa83 100644
Binary files a/data/interface/cursors/arrow-down.right.png and b/data/interface/cursors/arrow-down.right.png differ
diff --git a/data/interface/cursors/arrow-left.png b/data/interface/cursors/arrow-left.png
index 70496a5..f704fea 100644
Binary files a/data/interface/cursors/arrow-left.png and b/data/interface/cursors/arrow-left.png differ
diff --git a/data/interface/cursors/arrow-right.png b/data/interface/cursors/arrow-right.png
index a66f5c6..210adce 100644
Binary files a/data/interface/cursors/arrow-right.png and b/data/interface/cursors/arrow-right.png differ
diff --git a/data/interface/cursors/arrow-top.left.png b/data/interface/cursors/arrow-top.left.png
index f1b84e7..4137240 100644
Binary files a/data/interface/cursors/arrow-top.left.png and b/data/interface/cursors/arrow-top.left.png differ
diff --git a/data/interface/cursors/arrow-top.png b/data/interface/cursors/arrow-top.png
index 8287ffe..c54858d 100644
Binary files a/data/interface/cursors/arrow-top.png and b/data/interface/cursors/arrow-top.png differ
diff --git a/data/interface/cursors/arrow-top.right.png b/data/interface/cursors/arrow-top.right.png
index f6f009e..fdf7f20 100644
Binary files a/data/interface/cursors/arrow-top.right.png and b/data/interface/cursors/arrow-top.right.png differ
diff --git a/data/interface/cursors/hand-cursor.png b/data/interface/cursors/hand-cursor.png
index 3206935..d6cf382 100644
Binary files a/data/interface/cursors/hand-cursor.png and b/data/interface/cursors/hand-cursor.png differ
diff --git a/data/interface/cursors/hand-fire.left.png b/data/interface/cursors/hand-fire.left.png
index 5f23f70..c34b3c6 100644
Binary files a/data/interface/cursors/hand-fire.left.png and b/data/interface/cursors/hand-fire.left.png differ
diff --git a/data/interface/cursors/hand-fire.png b/data/interface/cursors/hand-fire.png
index a067475..97abe15 100644
Binary files a/data/interface/cursors/hand-fire.png and b/data/interface/cursors/hand-fire.png differ
diff --git a/data/interface/cursors/hand-fire.right.png b/data/interface/cursors/hand-fire.right.png
index aa67b20..97abe15 100644
Binary files a/data/interface/cursors/hand-fire.right.png and b/data/interface/cursors/hand-fire.right.png differ
diff --git a/data/interface/cursors/hand-move.png b/data/interface/cursors/hand-move.png
index 67a7f93..09c5b4f 100644
Binary files a/data/interface/cursors/hand-move.png and b/data/interface/cursors/hand-move.png differ
diff --git a/data/interface/quit.png b/data/interface/quit.png
index 5203512..296c4df 100644
Binary files a/data/interface/quit.png and b/data/interface/quit.png differ
diff --git a/data/interface/small_background_interface.png b/data/interface/small_background_interface.png
index c56a0a3..ba8f4e6 100644
Binary files a/data/interface/small_background_interface.png and b/data/interface/small_background_interface.png differ
diff --git a/data/interface/warning.png b/data/interface/warning.png
index 825aa1d..61f1e02 100644
Binary files a/data/interface/warning.png and b/data/interface/warning.png differ
diff --git a/data/interface/wind.png b/data/interface/wind.png
index 81ac95b..3418813 100644
Binary files a/data/interface/wind.png and b/data/interface/wind.png differ
diff --git a/data/interface/wind_indicator.png b/data/interface/wind_indicator.png
index 4fd932e..ab89fb6 100644
Binary files a/data/interface/wind_indicator.png and b/data/interface/wind_indicator.png differ
diff --git a/data/map/aquarium/background.png b/data/map/aquarium/background.png
index f9da7e4..8dc0454 100644
Binary files a/data/map/aquarium/background.png and b/data/map/aquarium/background.png differ
diff --git a/data/map/arbre/arbre.png b/data/map/arbre/arbre.png
index 6fb6e86..281c603 100644
Binary files a/data/map/arbre/arbre.png and b/data/map/arbre/arbre.png differ
diff --git a/data/map/arbre/gland-anim.png b/data/map/arbre/gland-anim.png
index 5147ebc..3cb9515 100644
Binary files a/data/map/arbre/gland-anim.png and b/data/map/arbre/gland-anim.png differ
diff --git a/data/map/bankiz/bankiz.png b/data/map/bankiz/bankiz.png
index f697281..708dd1a 100644
Binary files a/data/map/bankiz/bankiz.png and b/data/map/bankiz/bankiz.png differ
diff --git a/data/map/banquise/banquise.png b/data/map/banquise/banquise.png
index a14bb63..d57dfb3 100644
Binary files a/data/map/banquise/banquise.png and b/data/map/banquise/banquise.png differ
diff --git a/data/map/battlenight/battlenight-fg.png b/data/map/battlenight/battlenight-fg.png
index 548189a..21926a5 100644
Binary files a/data/map/battlenight/battlenight-fg.png and b/data/map/battlenight/battlenight-fg.png differ
diff --git a/data/map/catacombes/background1.png b/data/map/catacombes/background1.png
index 9080a12..34c0345 100644
Binary files a/data/map/catacombes/background1.png and b/data/map/catacombes/background1.png differ
diff --git a/data/map/champignon/background.png b/data/map/champignon/background.png
index 73717e7..ec95b98 100644
Binary files a/data/map/champignon/background.png and b/data/map/champignon/background.png differ
diff --git a/data/map/cheese/emmental.png b/data/map/cheese/emmental.png
index 925e2bc..d5c78d0 100644
Binary files a/data/map/cheese/emmental.png and b/data/map/cheese/emmental.png differ
diff --git a/data/map/cheese/minicheese.png b/data/map/cheese/minicheese.png
index 44907ae..4c91463 100644
Binary files a/data/map/cheese/minicheese.png and b/data/map/cheese/minicheese.png differ
diff --git a/data/map/christmas/map.png b/data/map/christmas/map.png
index dce5780..8914f8e 100644
Binary files a/data/map/christmas/map.png and b/data/map/christmas/map.png differ
diff --git a/data/map/country/map.png b/data/map/country/map.png
index d8b1617..9687c59 100755
Binary files a/data/map/country/map.png and b/data/map/country/map.png differ
diff --git a/data/map/cowland/map.png b/data/map/cowland/map.png
index 42df17b..f277de2 100644
Binary files a/data/map/cowland/map.png and b/data/map/cowland/map.png differ
diff --git a/data/map/cowland/nuage.png b/data/map/cowland/nuage.png
index 8da3784..2b9d260 100644
Binary files a/data/map/cowland/nuage.png and b/data/map/cowland/nuage.png differ
diff --git a/data/map/crystal/config.xml b/data/map/crystal/config.xml
index 13df01f..55005d5 100755
--- a/data/map/crystal/config.xml
+++ b/data/map/crystal/config.xml
@@ -13,7 +13,7 @@
   <surface name="preview" file="preview.jpg" />
 
   <name>Crystal</name>
-  <water>1</water>
+  <water>3</water>
   <nb_mine>3</nb_mine>
   <is_open>1</is_open>
   <!-- pad is given in pixel count. -->
diff --git a/data/map/crystal/crystal.png b/data/map/crystal/crystal.png
index 0c56ebb..91f738e 100755
Binary files a/data/map/crystal/crystal.png and b/data/map/crystal/crystal.png differ
diff --git a/data/map/desert/desert.png b/data/map/desert/desert.png
index a2154c9..b7eab46 100644
Binary files a/data/map/desert/desert.png and b/data/map/desert/desert.png differ
diff --git a/data/map/easterisland/map.png b/data/map/easterisland/map.png
index 7bd7a1d..5ab0d37 100644
Binary files a/data/map/easterisland/map.png and b/data/map/easterisland/map.png differ
diff --git a/data/map/electronik/background.png b/data/map/electronik/background.png
index dda93d8..2cca0c4 100755
Binary files a/data/map/electronik/background.png and b/data/map/electronik/background.png differ
diff --git a/data/map/funkyIsland/clouds.png b/data/map/funkyIsland/clouds.png
index 3f2a5e7..668f3b8 100644
Binary files a/data/map/funkyIsland/clouds.png and b/data/map/funkyIsland/clouds.png differ
diff --git a/data/map/funkyIsland/island.png b/data/map/funkyIsland/island.png
index 78704bf..4d0a0ce 100644
Binary files a/data/map/funkyIsland/island.png and b/data/map/funkyIsland/island.png differ
diff --git a/data/map/goodandevil/goodandevil.png b/data/map/goodandevil/goodandevil.png
index d4f08cf..66cfe8f 100644
Binary files a/data/map/goodandevil/goodandevil.png and b/data/map/goodandevil/goodandevil.png differ
diff --git a/data/map/greehills/greenhills.png b/data/map/greehills/greenhills.png
index 81b87b0..d707db6 100644
Binary files a/data/map/greehills/greenhills.png and b/data/map/greehills/greenhills.png differ
diff --git a/data/map/greehills/star.png b/data/map/greehills/star.png
index 616da13..50428ac 100644
Binary files a/data/map/greehills/star.png and b/data/map/greehills/star.png differ
diff --git a/data/map/grenouilles/grenouilles.png b/data/map/grenouilles/grenouilles.png
index 0899d50..750e14e 100644
Binary files a/data/map/grenouilles/grenouilles.png and b/data/map/grenouilles/grenouilles.png differ
diff --git a/data/map/grenouilles/nuage.png b/data/map/grenouilles/nuage.png
index 993dfd1..a9e9f2a 100644
Binary files a/data/map/grenouilles/nuage.png and b/data/map/grenouilles/nuage.png differ
diff --git a/data/map/halloween/map.png b/data/map/halloween/map.png
index 672ff12..9e82e97 100755
Binary files a/data/map/halloween/map.png and b/data/map/halloween/map.png differ
diff --git a/data/map/halloween/wp.png b/data/map/halloween/wp.png
index 0cc1357..0ba8e69 100644
Binary files a/data/map/halloween/wp.png and b/data/map/halloween/wp.png differ
diff --git a/data/map/hell/bones.png b/data/map/hell/bones.png
index 56c1a0c..44d4e93 100644
Binary files a/data/map/hell/bones.png and b/data/map/hell/bones.png differ
diff --git a/data/map/hell/config.xml b/data/map/hell/config.xml
index a5f3c43..e30f5ff 100644
--- a/data/map/hell/config.xml
+++ b/data/map/hell/config.xml
@@ -25,7 +25,7 @@
 		<image file="bones.png">
 			<grid pos="0,0" size="64,64" array="8,1"/>
 		</image>
-		<animation speed="50"/>
+		<animation speed="100"/>
 	</sprite>
 	<wind>
 		<nbr_sprite>10</nbr_sprite>
diff --git a/data/map/hell/hell.png b/data/map/hell/hell.png
index 0f1c54a..6bb0043 100644
Binary files a/data/map/hell/hell.png and b/data/map/hell/hell.png differ
diff --git a/data/map/hive/FG.png b/data/map/hive/FG.png
index 2e0a8f6..6409a5e 100755
Binary files a/data/map/hive/FG.png and b/data/map/hive/FG.png differ
diff --git a/data/map/hive/part_effect_strip.png b/data/map/hive/part_effect_strip.png
index 9c04047..2fe0c9f 100755
Binary files a/data/map/hive/part_effect_strip.png and b/data/map/hive/part_effect_strip.png differ
diff --git a/data/map/icebergs/map.png b/data/map/icebergs/map.png
index ffc9fab..836b6af 100644
Binary files a/data/map/icebergs/map.png and b/data/map/icebergs/map.png differ
diff --git a/data/map/island/island.png b/data/map/island/island.png
index 5e3aaa9..5c7e29c 100644
Binary files a/data/map/island/island.png and b/data/map/island/island.png differ
diff --git a/data/map/island/preview.jpg b/data/map/island/preview.jpg
index 3a47f2e..a44ae7d 100644
Binary files a/data/map/island/preview.jpg and b/data/map/island/preview.jpg differ
diff --git a/data/map/leafs/birds.png b/data/map/leafs/birds.png
index b94ac5c..9af1172 100644
Binary files a/data/map/leafs/birds.png and b/data/map/leafs/birds.png differ
diff --git a/data/map/leafs/front.png b/data/map/leafs/front.png
index 20773c1..7065282 100644
Binary files a/data/map/leafs/front.png and b/data/map/leafs/front.png differ
diff --git a/data/map/lonely_island/map.png b/data/map/lonely_island/map.png
index 555208c..f48e67d 100644
Binary files a/data/map/lonely_island/map.png and b/data/map/lonely_island/map.png differ
diff --git a/data/map/lonely_island/preview.jpg b/data/map/lonely_island/preview.jpg
index 61acdc7..5bec935 100644
Binary files a/data/map/lonely_island/preview.jpg and b/data/map/lonely_island/preview.jpg differ
diff --git a/data/map/lonely_island/wind_particules.png b/data/map/lonely_island/wind_particules.png
index 8ea89fe..b9879a8 100644
Binary files a/data/map/lonely_island/wind_particules.png and b/data/map/lonely_island/wind_particules.png differ
diff --git a/data/map/monkeybubbleworld/config.xml b/data/map/monkeybubbleworld/config.xml
index 9b4f5d1..86d1174 100644
--- a/data/map/monkeybubbleworld/config.xml
+++ b/data/map/monkeybubbleworld/config.xml
@@ -13,7 +13,7 @@
   <surface name="preview" file="preview.jpg" />
 
   <name>Monkey-Bubble World</name>
-  <water>1</water>
+  <water>dirtywater</water>
   <nb_mine>5</nb_mine>
   <is_open>1</is_open>
   <!-- pad is given in pixel count. -->
diff --git a/data/map/monkeybubbleworld/feuille.png b/data/map/monkeybubbleworld/feuille.png
index 44d8c5b..8cb7881 100644
Binary files a/data/map/monkeybubbleworld/feuille.png and b/data/map/monkeybubbleworld/feuille.png differ
diff --git a/data/map/monkeybubbleworld/monkeybubbleworld.png b/data/map/monkeybubbleworld/monkeybubbleworld.png
index 88995d9..050efc3 100644
Binary files a/data/map/monkeybubbleworld/monkeybubbleworld.png and b/data/map/monkeybubbleworld/monkeybubbleworld.png differ
diff --git a/data/map/moon-4m/map.png b/data/map/moon-4m/map.png
index ec59215..f9a30cd 100644
Binary files a/data/map/moon-4m/map.png and b/data/map/moon-4m/map.png differ
diff --git a/data/map/oktopus/bulle.png b/data/map/oktopus/bulle.png
new file mode 100644
index 0000000..4b1f882
Binary files /dev/null and b/data/map/oktopus/bulle.png differ
diff --git a/data/map/oktopus/config.xml b/data/map/oktopus/config.xml
new file mode 100644
index 0000000..db6e9cd
--- /dev/null
+++ b/data/map/oktopus/config.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE resources SYSTEM "../map.dtd" []>
+<resources>
+  <author>
+    <name>Anthony CARRÉ</name>
+    <nickname>yeKcim</nickname>
+    <email>yeknan AT yahoo DOT fr</email>
+    <country>France</country>
+  </author>
+
+  <surface name="sky" file="sky.jpg" />
+  <surface name="map" file="map.png" />
+  <surface name="preview" file="preview.jpg" />
+
+  <name>Oktopus</name>
+  <water>1</water>
+  <nb_mine>5</nb_mine>
+  <is_open>1</is_open>
+
+  <!-- pad is given in pixel count. -->
+  <add_pad>1</add_pad>
+  <point name="upper_left_pad" x="500" y="500" />
+  <point name="lower_right_pad" x="500" y="0" />
+
+  <sprite name="wind_particle">
+    <image file="bulle.png">
+      <grid pos="0,0" size="50,50" array="1,1"/>
+    </image>
+  </sprite>
+  <wind>
+    <nbr_sprite>60</nbr_sprite>
+    <mass>1</mass>
+    <wind_factor>2</wind_factor>
+    <air_resist_factor>0.5</air_resist_factor>
+    <gravity_factor>-1</gravity_factor>
+    <rebounding>false</rebounding>
+    <rebound_factor>1.3</rebound_factor>
+  </wind>
+
+  <music_playlist>sea</music_playlist>
+
+</resources>
diff --git a/data/map/oktopus/map.png b/data/map/oktopus/map.png
new file mode 100644
index 0000000..361a125
Binary files /dev/null and b/data/map/oktopus/map.png differ
diff --git a/data/map/oktopus/preview.jpg b/data/map/oktopus/preview.jpg
new file mode 100644
index 0000000..9456291
Binary files /dev/null and b/data/map/oktopus/preview.jpg differ
diff --git a/data/map/oktopus/sky.jpg b/data/map/oktopus/sky.jpg
new file mode 100644
index 0000000..b07e515
Binary files /dev/null and b/data/map/oktopus/sky.jpg differ
diff --git a/data/map/paradis/decor_paradis.png b/data/map/paradis/decor_paradis.png
index 276a10f..71d621c 100644
Binary files a/data/map/paradis/decor_paradis.png and b/data/map/paradis/decor_paradis.png differ
diff --git a/data/map/pillars/FG.png b/data/map/pillars/FG.png
index 3293338..d81395d 100755
Binary files a/data/map/pillars/FG.png and b/data/map/pillars/FG.png differ
diff --git a/data/map/pirates/pirates.png b/data/map/pirates/pirates.png
index f387170..5a20f9c 100644
Binary files a/data/map/pirates/pirates.png and b/data/map/pirates/pirates.png differ
diff --git a/data/map/prehistorik/prehistorik.png b/data/map/prehistorik/prehistorik.png
index a7930f6..083140d 100644
Binary files a/data/map/prehistorik/prehistorik.png and b/data/map/prehistorik/prehistorik.png differ
diff --git a/data/map/pumpkins/feuille.png b/data/map/pumpkins/feuille.png
index 35ea220..c94980f 100644
Binary files a/data/map/pumpkins/feuille.png and b/data/map/pumpkins/feuille.png differ
diff --git a/data/map/pumpkins/map.png b/data/map/pumpkins/map.png
index 713f79e..9fa239d 100644
Binary files a/data/map/pumpkins/map.png and b/data/map/pumpkins/map.png differ
diff --git a/data/map/qingqong/qingqong.png b/data/map/qingqong/qingqong.png
index 0a92411..166c425 100644
Binary files a/data/map/qingqong/qingqong.png and b/data/map/qingqong/qingqong.png differ
diff --git a/data/map/random/config.xml b/data/map/random/config.xml
deleted file mode 100644
index a78504a..0000000
--- a/data/map/random/config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- <!DOCTYPE resources SYSTEM "../random.dtd" []> -->
-<resources>
-  <random>1</random>
-  <author>
-    <name>Yannig Perré</name>
-    <nickname>drayan</nickname>
-    <email>yannig DOT perre AT gmail.com</email>
-    <country>France</country>
-  </author>
-
-  <surface name="sky" file="sky.jpg" />
-  <surface name="map" file="background.png" />
-  <surface name="preview" file="preview.jpg" />
-  <surface name="texture" file="texture.png" />
-  <color name="border_color" r="234" g="219" b="106" a="255" />
-  <nb_element>3</nb_element>
-  <surface name="element_1" file="palm-tree.png" />
-  <surface name="element_2" file="tresor1.png" />
-  <surface name="element_3" file="tresor2.png" />
-  <name>Random Island</name>
-  <water>1</water>
-  <nb_mine>10</nb_mine>
-  <is_open>1</is_open>
-
-  <!-- pad is given in pixel count. -->
-  <add_pad>1</add_pad>
-  <point name="upper_left_pad" x="500" y="250" />
-  <point name="lower_right_pad" x="500" y="0" />
-
-</resources>
diff --git a/data/map/random/palm-tree.png b/data/map/random/palm-tree.png
deleted file mode 100644
index 9b4aebd..0000000
Binary files a/data/map/random/palm-tree.png and /dev/null differ
diff --git a/data/map/random/texture.png b/data/map/random/texture.png
deleted file mode 100644
index 2d1d281..0000000
Binary files a/data/map/random/texture.png and /dev/null differ
diff --git a/data/map/random/tresor1.png b/data/map/random/tresor1.png
deleted file mode 100644
index cfbfb23..0000000
Binary files a/data/map/random/tresor1.png and /dev/null differ
diff --git a/data/map/random/tresor2.png b/data/map/random/tresor2.png
deleted file mode 100644
index 3d9938e..0000000
Binary files a/data/map/random/tresor2.png and /dev/null differ
diff --git a/data/map/randomamoebas/config.xml b/data/map/randomamoebas/config.xml
index 2144d58..83624dd 100644
--- a/data/map/randomamoebas/config.xml
+++ b/data/map/randomamoebas/config.xml
@@ -2,6 +2,7 @@
 <!-- <!DOCTYPE resources SYSTEM "../random.dtd" []> -->
 <resources>
   <random>1</random>
+  <generator>2</generator>
   <author>
     <name>Pasi Kallinen</name>
     <nickname>paxed</nickname>
diff --git a/data/map/randomamoebas/texture.png b/data/map/randomamoebas/texture.png
index 21c906f..83d1756 100644
Binary files a/data/map/randomamoebas/texture.png and b/data/map/randomamoebas/texture.png differ
diff --git a/data/map/randomisland/config.xml b/data/map/randomisland/config.xml
new file mode 100644
index 0000000..b776596
--- /dev/null
+++ b/data/map/randomisland/config.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- <!DOCTYPE resources SYSTEM "../random.dtd" []> -->
+<resources>
+  <random>1</random>
+  <generator>1</generator>
+  <author>
+    <name>Yannig Perré</name>
+    <nickname>drayan</nickname>
+    <email>yannig DOT perre AT gmail.com</email>
+    <country>France</country>
+  </author>
+
+  <surface name="sky" file="sky.jpg" />
+  <surface name="map" file="background.png" />
+  <surface name="preview" file="preview.jpg" />
+  <surface name="texture" file="texture.png" />
+  <color name="border_color" r="234" g="219" b="106" a="255" />
+  <nb_element>3</nb_element>
+  <surface name="element_1" file="palm-tree.png" />
+  <surface name="element_2" file="tresor1.png" />
+  <surface name="element_3" file="tresor2.png" />
+  <name>Random Island</name>
+  <water>1</water>
+  <nb_mine>10</nb_mine>
+  <is_open>1</is_open>
+
+  <!-- pad is given in pixel count. -->
+  <add_pad>1</add_pad>
+  <point name="upper_left_pad" x="500" y="250" />
+  <point name="lower_right_pad" x="500" y="0" />
+
+</resources>
diff --git a/data/map/randomisland/palm-tree.png b/data/map/randomisland/palm-tree.png
new file mode 100644
index 0000000..3799aff
Binary files /dev/null and b/data/map/randomisland/palm-tree.png differ
diff --git a/data/map/random/preview.jpg b/data/map/randomisland/preview.jpg
similarity index 100%
rename from data/map/random/preview.jpg
rename to data/map/randomisland/preview.jpg
diff --git a/data/map/random/sky.jpg b/data/map/randomisland/sky.jpg
similarity index 100%
rename from data/map/random/sky.jpg
rename to data/map/randomisland/sky.jpg
diff --git a/data/map/randomisland/texture.png b/data/map/randomisland/texture.png
new file mode 100644
index 0000000..c8e3cdd
Binary files /dev/null and b/data/map/randomisland/texture.png differ
diff --git a/data/map/randomisland/tresor1.png b/data/map/randomisland/tresor1.png
new file mode 100644
index 0000000..31f8ce6
Binary files /dev/null and b/data/map/randomisland/tresor1.png differ
diff --git a/data/map/randomisland/tresor2.png b/data/map/randomisland/tresor2.png
new file mode 100644
index 0000000..21f6161
Binary files /dev/null and b/data/map/randomisland/tresor2.png differ
diff --git a/data/map/space2/map.png b/data/map/space2/map.png
index 8948365..4c78346 100644
Binary files a/data/map/space2/map.png and b/data/map/space2/map.png differ
diff --git a/data/map/tic-tac-toe/FG.png b/data/map/tic-tac-toe/FG.png
index b203699..0eebd7a 100755
Binary files a/data/map/tic-tac-toe/FG.png and b/data/map/tic-tac-toe/FG.png differ
diff --git a/data/map/tic-tac-toe/part_effect_strip.png b/data/map/tic-tac-toe/part_effect_strip.png
index d4da827..7dfa456 100755
Binary files a/data/map/tic-tac-toe/part_effect_strip.png and b/data/map/tic-tac-toe/part_effect_strip.png differ
diff --git a/data/map/towers/map.png b/data/map/towers/map.png
index 6c54d54..34f1370 100644
Binary files a/data/map/towers/map.png and b/data/map/towers/map.png differ
diff --git a/data/map/vulcano/background.png b/data/map/vulcano/background.png
index 96cae6f..1e79bf0 100755
Binary files a/data/map/vulcano/background.png and b/data/map/vulcano/background.png differ
diff --git a/data/map/wildwestdv/map.png b/data/map/wildwestdv/map.png
index e29c1be..936f377 100644
Binary files a/data/map/wildwestdv/map.png and b/data/map/wildwestdv/map.png differ
diff --git a/data/menu/add_custom_team.png b/data/menu/add_custom_team.png
new file mode 100644
index 0000000..7e95070
Binary files /dev/null and b/data/menu/add_custom_team.png differ
diff --git a/data/menu/annulus_background.png b/data/menu/annulus_background.png
index 5daa0b9..34e12d3 100644
Binary files a/data/menu/annulus_background.png and b/data/menu/annulus_background.png differ
diff --git a/data/menu/annulus_foreground.png b/data/menu/annulus_foreground.png
index fd89bc6..5027e2f 100644
Binary files a/data/menu/annulus_foreground.png and b/data/menu/annulus_foreground.png differ
diff --git a/data/menu/audio_label.png b/data/menu/audio_label.png
deleted file mode 100644
index f133f34..0000000
Binary files a/data/menu/audio_label.png and /dev/null differ
diff --git a/data/menu/background.png b/data/menu/background.png
index c62c956..da99538 100644
Binary files a/data/menu/background.png and b/data/menu/background.png differ
diff --git a/data/menu/background_credits.png b/data/menu/background_credits.png
index 2cbf073..1a4d279 100755
Binary files a/data/menu/background_credits.png and b/data/menu/background_credits.png differ
diff --git a/data/menu/background_help.png b/data/menu/background_help.png
index 2cbf073..67c9fee 100755
Binary files a/data/menu/background_help.png and b/data/menu/background_help.png differ
diff --git a/data/menu/background_network.png b/data/menu/background_network.png
index 8484949..d72cafe 100644
Binary files a/data/menu/background_network.png and b/data/menu/background_network.png differ
diff --git a/data/menu/background_options.png b/data/menu/background_options.png
index 5785fdd..861b1c8 100644
Binary files a/data/menu/background_options.png and b/data/menu/background_options.png differ
diff --git a/data/menu/background_play.png b/data/menu/background_play.png
index d22541d..02d7966 100644
Binary files a/data/menu/background_play.png and b/data/menu/background_play.png differ
diff --git a/data/menu/big_left.png b/data/menu/big_left.png
index 6cc01af..a95f6f4 100644
Binary files a/data/menu/big_left.png and b/data/menu/big_left.png differ
diff --git a/data/menu/big_right.png b/data/menu/big_right.png
index 51cd166..0d0f37c 100644
Binary files a/data/menu/big_right.png and b/data/menu/big_right.png differ
diff --git a/data/menu/bip.png b/data/menu/bip.png
new file mode 100644
index 0000000..dec1ca7
Binary files /dev/null and b/data/menu/bip.png differ
diff --git a/data/menu/button.png b/data/menu/button.png
index a3206e6..3da7f24 100644
Binary files a/data/menu/button.png and b/data/menu/button.png differ
diff --git a/data/menu/cancel.png b/data/menu/cancel.png
index a6aeb25..0d1f723 100644
Binary files a/data/menu/cancel.png and b/data/menu/cancel.png differ
diff --git a/data/menu/check.png b/data/menu/check.png
index 1c1f04a..81f4b82 100644
Binary files a/data/menu/check.png and b/data/menu/check.png differ
diff --git a/data/menu/config_label.png b/data/menu/config_label.png
deleted file mode 100644
index 191bc18..0000000
Binary files a/data/menu/config_label.png and /dev/null differ
diff --git a/data/menu/death_energy.png b/data/menu/death_energy.png
new file mode 100644
index 0000000..83cd7d2
Binary files /dev/null and b/data/menu/death_energy.png differ
diff --git a/data/menu/del_custom_team.png b/data/menu/del_custom_team.png
new file mode 100644
index 0000000..843a17b
Binary files /dev/null and b/data/menu/del_custom_team.png differ
diff --git a/data/menu/disabled_back.png b/data/menu/disabled_back.png
index 99b2df3..2993f3a 100644
Binary files a/data/menu/disabled_back.png and b/data/menu/disabled_back.png differ
diff --git a/data/menu/disabled_front.png b/data/menu/disabled_front.png
index a713198..66d623f 100644
Binary files a/data/menu/disabled_front.png and b/data/menu/disabled_front.png differ
diff --git a/data/menu/display_name.png b/data/menu/display_name.png
index a69d44a..b9591a5 100644
Binary files a/data/menu/display_name.png and b/data/menu/display_name.png differ
diff --git a/data/menu/display_wind_particles.png b/data/menu/display_wind_particles.png
index 92bd7e5..6a7767a 100644
Binary files a/data/menu/display_wind_particles.png and b/data/menu/display_wind_particles.png differ
diff --git a/data/menu/down.png b/data/menu/down.png
index 3194919..f3636c8 100644
Binary files a/data/menu/down.png and b/data/menu/down.png differ
diff --git a/data/menu/enabled.png b/data/menu/enabled.png
index 5d4de74..b8b53d5 100644
Binary files a/data/menu/enabled.png and b/data/menu/enabled.png differ
diff --git a/data/menu/fps.png b/data/menu/fps.png
index 910b4ad..f50e043 100644
Binary files a/data/menu/fps.png and b/data/menu/fps.png differ
diff --git a/data/menu/fullscreen.png b/data/menu/fullscreen.png
index 06d69a0..13ca00b 100644
Binary files a/data/menu/fullscreen.png and b/data/menu/fullscreen.png differ
diff --git a/data/menu/game_mode.png b/data/menu/game_mode.png
new file mode 100644
index 0000000..0a0833f
Binary files /dev/null and b/data/menu/game_mode.png differ
diff --git a/data/menu/gravity.png b/data/menu/gravity.png
new file mode 100644
index 0000000..6cdd15c
Binary files /dev/null and b/data/menu/gravity.png differ
diff --git a/data/menu/help_shortkeys.png b/data/menu/help_shortkeys.png
new file mode 100644
index 0000000..b22d290
Binary files /dev/null and b/data/menu/help_shortkeys.png differ
diff --git a/data/menu/i_backtobattle.png b/data/menu/i_backtobattle.png
index 29b899e..8b80476 100644
Binary files a/data/menu/i_backtobattle.png and b/data/menu/i_backtobattle.png differ
diff --git a/data/menu/i_credits.png b/data/menu/i_credits.png
index cbaf450..6cfc0d5 100644
Binary files a/data/menu/i_credits.png and b/data/menu/i_credits.png differ
diff --git a/data/menu/i_help.png b/data/menu/i_help.png
index b90195d..d190d61 100644
Binary files a/data/menu/i_help.png and b/data/menu/i_help.png differ
diff --git a/data/menu/i_network.png b/data/menu/i_network.png
index 7d136fa..5d496f3 100644
Binary files a/data/menu/i_network.png and b/data/menu/i_network.png differ
diff --git a/data/menu/i_options.png b/data/menu/i_options.png
index a527c5d..a8529f1 100644
Binary files a/data/menu/i_options.png and b/data/menu/i_options.png differ
diff --git a/data/menu/i_play.png b/data/menu/i_play.png
index 2abb241..442a173 100644
Binary files a/data/menu/i_play.png and b/data/menu/i_play.png differ
diff --git a/data/menu/i_quit.png b/data/menu/i_quit.png
index bf5a322..55467af 100644
Binary files a/data/menu/i_quit.png and b/data/menu/i_quit.png differ
diff --git a/data/menu/i_update.png b/data/menu/i_update.png
index ef95528..b13cbc7 100644
Binary files a/data/menu/i_update.png and b/data/menu/i_update.png differ
diff --git a/data/menu/ico_maps.png b/data/menu/ico_maps.png
index 1722bbe..d30a446 100644
Binary files a/data/menu/ico_maps.png and b/data/menu/ico_maps.png differ
diff --git a/data/menu/ico_skins.png b/data/menu/ico_skins.png
index 2120a64..7fd4033 100644
Binary files a/data/menu/ico_skins.png and b/data/menu/ico_skins.png differ
diff --git a/data/menu/ico_sounds.png b/data/menu/ico_sounds.png
index 3d3234d..8528904 100644
Binary files a/data/menu/ico_sounds.png and b/data/menu/ico_sounds.png differ
diff --git a/data/menu/ico_weapons.png b/data/menu/ico_weapons.png
index cc15527..938c098 100644
Binary files a/data/menu/ico_weapons.png and b/data/menu/ico_weapons.png differ
diff --git a/data/menu/init_energy.png b/data/menu/init_energy.png
new file mode 100644
index 0000000..8761b2c
Binary files /dev/null and b/data/menu/init_energy.png differ
diff --git a/data/menu/left.png b/data/menu/left.png
index b35a69d..4f5ca1e 100644
Binary files a/data/menu/left.png and b/data/menu/left.png differ
diff --git a/data/menu/loading.png b/data/menu/loading.png
index c5e8f3c..786d2e2 100644
Binary files a/data/menu/loading.png and b/data/menu/loading.png differ
diff --git a/data/menu/map_label.png b/data/menu/map_label.png
deleted file mode 100644
index 0a374c3..0000000
Binary files a/data/menu/map_label.png and /dev/null differ
diff --git a/data/menu/max_energy.png b/data/menu/max_energy.png
new file mode 100644
index 0000000..4fced49
Binary files /dev/null and b/data/menu/max_energy.png differ
diff --git a/data/menu/minus.png b/data/menu/minus.png
index 1f5a613..a5151a5 100644
Binary files a/data/menu/minus.png and b/data/menu/minus.png differ
diff --git a/data/menu/mode_label.png b/data/menu/mode_label.png
deleted file mode 100644
index 2bb19e4..0000000
Binary files a/data/menu/mode_label.png and /dev/null differ
diff --git a/data/menu/music_enable.png b/data/menu/music_enable.png
index 8905165..3ac46c2 100644
Binary files a/data/menu/music_enable.png and b/data/menu/music_enable.png differ
diff --git a/data/menu/padlock.png b/data/menu/padlock.png
new file mode 100644
index 0000000..f688167
Binary files /dev/null and b/data/menu/padlock.png differ
diff --git a/data/menu/plus.png b/data/menu/plus.png
index 2846c61..1bf6826 100644
Binary files a/data/menu/plus.png and b/data/menu/plus.png differ
diff --git a/data/menu/podium.png b/data/menu/podium.png
index 7006a77..a43226b 100644
Binary files a/data/menu/podium.png and b/data/menu/podium.png differ
diff --git a/data/menu/refresh.png b/data/menu/refresh.png
index 7d307ff..f7a5b7d 100644
Binary files a/data/menu/refresh.png and b/data/menu/refresh.png differ
diff --git a/data/menu/resolution.png b/data/menu/resolution.png
index 9516f18..a0af42e 100644
Binary files a/data/menu/resolution.png and b/data/menu/resolution.png differ
diff --git a/data/menu/right.png b/data/menu/right.png
index 0621068..7d59e10 100644
Binary files a/data/menu/right.png and b/data/menu/right.png differ
diff --git a/data/menu/scroll_on_border.png b/data/menu/scroll_on_border.png
index a35ce16..9c8d7ce 100644
Binary files a/data/menu/scroll_on_border.png and b/data/menu/scroll_on_border.png differ
diff --git a/data/menu/send_txt.png b/data/menu/send_txt.png
index 4c84e61..008fd5f 100644
Binary files a/data/menu/send_txt.png and b/data/menu/send_txt.png differ
diff --git a/data/menu/sound_effects_enable.png b/data/menu/sound_effects_enable.png
index 8f68d36..023bfab 100644
Binary files a/data/menu/sound_effects_enable.png and b/data/menu/sound_effects_enable.png differ
diff --git a/data/menu/sound_frequency.png b/data/menu/sound_frequency.png
index 3b6ece6..e90f277 100644
Binary files a/data/menu/sound_frequency.png and b/data/menu/sound_frequency.png differ
diff --git a/data/menu/team_number.png b/data/menu/team_number.png
index c62c92d..601909e 100644
Binary files a/data/menu/team_number.png and b/data/menu/team_number.png differ
diff --git a/data/menu/teams_label.png b/data/menu/teams_label.png
deleted file mode 100644
index 53932b1..0000000
Binary files a/data/menu/teams_label.png and /dev/null differ
diff --git a/data/menu/timing_death.png b/data/menu/timing_death.png
new file mode 100644
index 0000000..e2b681b
Binary files /dev/null and b/data/menu/timing_death.png differ
diff --git a/data/menu/timing_end_turn.png b/data/menu/timing_end_turn.png
index 63a8098..5890d72 100644
Binary files a/data/menu/timing_end_turn.png and b/data/menu/timing_end_turn.png differ
diff --git a/data/menu/timing_switch.png b/data/menu/timing_switch.png
new file mode 100644
index 0000000..287ccc0
Binary files /dev/null and b/data/menu/timing_switch.png differ
diff --git a/data/menu/timing_turn.png b/data/menu/timing_turn.png
index 279b208..72160da 100644
Binary files a/data/menu/timing_turn.png and b/data/menu/timing_turn.png differ
diff --git a/data/menu/up.png b/data/menu/up.png
index 9675179..f1eae30 100644
Binary files a/data/menu/up.png and b/data/menu/up.png differ
diff --git a/data/menu/validate.png b/data/menu/validate.png
index 65a4844..012968d 100644
Binary files a/data/menu/validate.png and b/data/menu/validate.png differ
diff --git a/data/menu/video_label.png b/data/menu/video_label.png
deleted file mode 100644
index 1051d7f..0000000
Binary files a/data/menu/video_label.png and /dev/null differ
diff --git a/data/object/barrel.png b/data/object/barrel.png
index de683e7..86a4fbe 100644
Binary files a/data/object/barrel.png and b/data/object/barrel.png differ
diff --git a/data/object/blue_star.png b/data/object/blue_star.png
index 75d8e1f..466f830 100644
Binary files a/data/object/blue_star.png and b/data/object/blue_star.png differ
diff --git a/data/object/bonus_box.png b/data/object/bonus_box.png
index 8074156..e7c80c8 100644
Binary files a/data/object/bonus_box.png and b/data/object/bonus_box.png differ
diff --git a/data/object/dark_smoke.png b/data/object/dark_smoke.png
index 268de1b..a63ecf0 100644
Binary files a/data/object/dark_smoke.png and b/data/object/dark_smoke.png differ
diff --git a/data/object/fire.png b/data/object/fire.png
index d574b6b..9248ae3 100644
Binary files a/data/object/fire.png and b/data/object/fire.png differ
diff --git a/data/object/ill_bubble.png b/data/object/ill_bubble.png
index 927196b..caf1b1c 100644
Binary files a/data/object/ill_bubble.png and b/data/object/ill_bubble.png differ
diff --git a/data/object/medkit.png b/data/object/medkit.png
index 5a35a65..3f49528 100644
Binary files a/data/object/medkit.png and b/data/object/medkit.png differ
diff --git a/data/object/pink_star.png b/data/object/pink_star.png
index 1d0ab25..e07db82 100644
Binary files a/data/object/pink_star.png and b/data/object/pink_star.png differ
diff --git a/data/object/smoke.png b/data/object/smoke.png
index 13d5bb3..5933ad6 100644
Binary files a/data/object/smoke.png and b/data/object/smoke.png differ
diff --git a/data/object/smoke2.png b/data/object/smoke2.png
index 0265343..4b11f31 100644
Binary files a/data/object/smoke2.png and b/data/object/smoke2.png differ
diff --git a/data/object/smoke3.png b/data/object/smoke3.png
index c7ded85..d5740ae 100644
Binary files a/data/object/smoke3.png and b/data/object/smoke3.png differ
diff --git a/data/object/star.png b/data/object/star.png
index 998a92b..06df37c 100644
Binary files a/data/object/star.png and b/data/object/star.png differ
diff --git a/data/sound/default/cuss_01.ogg b/data/sound/default/cuss_01.ogg
deleted file mode 100644
index 42f3f4c..0000000
Binary files a/data/sound/default/cuss_01.ogg and /dev/null differ
diff --git a/data/sound/default/cuss_02.ogg b/data/sound/default/cuss_02.ogg
deleted file mode 100644
index 41a4753..0000000
Binary files a/data/sound/default/cuss_02.ogg and /dev/null differ
diff --git a/data/sound/default/cuss_03.ogg b/data/sound/default/cuss_03.ogg
deleted file mode 100644
index a3548fc..0000000
Binary files a/data/sound/default/cuss_03.ogg and /dev/null differ
diff --git a/data/sound/default/cuss_04.ogg b/data/sound/default/cuss_04.ogg
deleted file mode 100644
index ae71dd9..0000000
Binary files a/data/sound/default/cuss_04.ogg and /dev/null differ
diff --git a/data/sound/default/hehe.ogg b/data/sound/default/hehe.ogg
deleted file mode 100644
index dbef229..0000000
Binary files a/data/sound/default/hehe.ogg and /dev/null differ
diff --git a/data/sound/default/profile.xml b/data/sound/default/profile.xml
index b6007da..81f0d76 100644
--- a/data/sound/default/profile.xml
+++ b/data/sound/default/profile.xml
@@ -30,12 +30,6 @@
   <sound sample="friendly_fire" file="crazy_04.ogg" />
   <sound sample="friendly_fire" file="crazy_05.ogg" />
 
-  <sound sample="cuss" file="cuss_01.ogg" />
-  <sound sample="cuss" file="cuss_02.ogg" />
-  <sound sample="cuss" file="cuss_03.ogg" />
-  <sound sample="cuss" file="cuss_04.ogg" />
-
-  <sound sample="laugh" file="hehe.ogg" />
   <sound sample="skip_turn" file="skip_turn.ogg" />
 
   <sound sample="weapon/jetpack" file="../share/weapon/jetpack.ogg" />
diff --git a/data/sound/share/countdown-endturn.ogg b/data/sound/share/countdown-endturn.ogg
new file mode 100644
index 0000000..4743f92
Binary files /dev/null and b/data/sound/share/countdown-endturn.ogg differ
diff --git a/data/sound/share/profile.xml b/data/sound/share/profile.xml
index be42948..88fee6e 100644
--- a/data/sound/share/profile.xml
+++ b/data/sound/share/profile.xml
@@ -8,7 +8,9 @@
   <sound sample="change_weapon" file="menu/weapon_menu_toggled.ogg" />
   <sound sample="character/change_in_same_team" file="character_change.ogg" />
 
+  <sound sample="countdown-end_turn" file="countdown-endturn.ogg" />
   <sound sample="end_turn" file="end_turn.ogg" />
+  <sound sample="start_turn" file="start_turn.ogg" />
 
   <sound sample="menu/cancel" file="menu/cancel.ogg" />
   <sound sample="menu/clic" file="menu/clic.ogg" />
@@ -16,10 +18,10 @@
   <sound sample="menu/ok" file="menu/ok.ogg" />
   <sound sample="menu/weapon_menu_hide" file="menu/weapon_menu_toggled.ogg" />
   <sound sample="menu/weapon_menu_show" file="menu/weapon_menu_toggled.ogg" />
+  <sound sample="menu/newcomer" file="weapon/teleport_start.ogg" />
 
   <sound sample="music/grenouilles" file="frog_music.ogg" />
   <sound sample="sink" file="../default/sink.ogg" />
-  <sound sample="time/bip" file="time_bip.ogg" />
 
   <sound sample="victory" file="victory.ogg" />
 
@@ -39,7 +41,7 @@
   <sound sample="weapon/flamethrower" file="weapon/flame.ogg" />
   <sound sample="weapon/gnu_bounce" file="weapon/gnu_bounce.ogg" />
   <sound sample="weapon/grapple_attaching" file="weapon/grapple_attaching.ogg" />
-  <sound sample="weapon/grapple_balancing" file="weapon/grapple_balancing.ogg" />
+  <sound sample="weapon/grapple_cable" file="weapon/grapple_cable.ogg" />
   <sound sample="weapon/grapple_detaching" file="weapon/grapple_detaching.ogg" />
   <sound sample="weapon/grenade_bounce"  file="weapon/grenade_bounce.ogg" />
   <sound sample="weapon/footbomb_bounce"  file="weapon/footbomb_bounce.ogg" />
@@ -55,6 +57,7 @@
   <sound sample="weapon/rocket_flying" file="weapon/supertux_flying.ogg" />
   <sound sample="weapon/shotgun" file="weapon/shotgun.ogg" />
   <sound sample="weapon/suicide" file="weapon/commit_suicide.ogg" />
+  <sound sample="weapon/slap" file="weapon/slap.ogg" />
   <sound sample="weapon/supertux_flying" file="weapon/supertux_flying.ogg" />
   <sound sample="weapon/supertux_swimming" file="weapon/supertux_swimming.ogg" />
   <sound sample="weapon/teleport_end" file="weapon/teleport_land.ogg" />
diff --git a/data/sound/share/start_turn.ogg b/data/sound/share/start_turn.ogg
new file mode 100644
index 0000000..d25b9ee
Binary files /dev/null and b/data/sound/share/start_turn.ogg differ
diff --git a/data/sound/share/weapon/grapple_cable.ogg b/data/sound/share/weapon/grapple_cable.ogg
new file mode 100644
index 0000000..a0475b0
Binary files /dev/null and b/data/sound/share/weapon/grapple_cable.ogg differ
diff --git a/data/sound/share/weapon/gun.ogg b/data/sound/share/weapon/gun.ogg
index 58fdd3c..29d9b0a 100644
Binary files a/data/sound/share/weapon/gun.ogg and b/data/sound/share/weapon/gun.ogg differ
diff --git a/data/sound/share/weapon/slap.ogg b/data/sound/share/weapon/slap.ogg
new file mode 100644
index 0000000..bf7e611
Binary files /dev/null and b/data/sound/share/weapon/slap.ogg differ
diff --git a/data/team/beastie/dead.png b/data/team/beastie/dead.png
new file mode 100644
index 0000000..78bca44
Binary files /dev/null and b/data/team/beastie/dead.png differ
diff --git a/data/team/beastie/flag.png b/data/team/beastie/flag.png
new file mode 100644
index 0000000..f3e5503
Binary files /dev/null and b/data/team/beastie/flag.png differ
diff --git a/data/team/beastie/flag64.png b/data/team/beastie/flag64.png
new file mode 100644
index 0000000..5e96fec
Binary files /dev/null and b/data/team/beastie/flag64.png differ
diff --git a/data/team/beastie/team.xml b/data/team/beastie/team.xml
new file mode 100644
index 0000000..a1553e1
--- /dev/null
+++ b/data/team/beastie/team.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Beastie</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="Beastie" body="beastie" />
+    <character name="FreeBSD" body="beastie" />
+
+    <character name="DragonFlyBSD" body="beastie" />
+    <character name="OpenBSD" body="beastie" />
+    <character name="NetBSD" body="beastie" />
+    <character name="PC-BSD" body="beastie" />
+    <character name="DesktopBSD" body="beastie" />
+    <character name="MirBSD" body="beastie" />
+    <character name="kFreeBSD" body="beastie" />
+    <character name="MidnightBSD" body="beastie" />
+    <character name="666" body="beastie" />
+  </team>
+</resources>
diff --git a/data/team/beastieteam/dead.png b/data/team/beastieteam/dead.png
deleted file mode 100644
index 30232a1..0000000
Binary files a/data/team/beastieteam/dead.png and /dev/null differ
diff --git a/data/team/beastieteam/flag.png b/data/team/beastieteam/flag.png
deleted file mode 100644
index 9d0b2e2..0000000
Binary files a/data/team/beastieteam/flag.png and /dev/null differ
diff --git a/data/team/beastieteam/flag64.png b/data/team/beastieteam/flag64.png
deleted file mode 100644
index 5b12c76..0000000
Binary files a/data/team/beastieteam/flag64.png and /dev/null differ
diff --git a/data/team/beastieteam/team.xml b/data/team/beastieteam/team.xml
deleted file mode 100644
index 8b2a9ff..0000000
--- a/data/team/beastieteam/team.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Beastie</name>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="Beastie" body="beastieteam" />
-    <character name="FreeBSD" body="beastieteam" />
-
-    <character name="DragonFlyBSD" body="beastieteam" />
-    <character name="OpenBSD" body="beastieteam" />
-    <character name="NetBSD" body="beastieteam" />
-    <character name="PC-BSD" body="beastieteam" />
-    <character name="DesktopBSD" body="beastieteam" />
-    <character name="MirBSD" body="beastieteam" />
-    <character name="kFreeBSD" body="beastieteam" />
-    <character name="MidnightBSD" body="beastieteam" />
-    <character name="666" body="beastieteam" />
-  </team>
-</resources>
diff --git a/data/team/firefox/dead.png b/data/team/firefox/dead.png
new file mode 100644
index 0000000..cc71403
Binary files /dev/null and b/data/team/firefox/dead.png differ
diff --git a/data/team/firefox/flag.png b/data/team/firefox/flag.png
new file mode 100644
index 0000000..010192c
Binary files /dev/null and b/data/team/firefox/flag.png differ
diff --git a/data/team/firefox/flag64.png b/data/team/firefox/flag64.png
new file mode 100644
index 0000000..0dca359
Binary files /dev/null and b/data/team/firefox/flag64.png differ
diff --git a/data/team/firefox/team.xml b/data/team/firefox/team.xml
new file mode 100755
index 0000000..f52260c
--- /dev/null
+++ b/data/team/firefox/team.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Firefox</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="Mozilla browser" body="firefox" />
+    <character name="Phoenix" body="firefox" />
+    <character name="Firebird" body="firefox" />
+    <character name="Deer Park" body="firefox" />
+    <character name="Burning Edge" body="firefox" />
+    <character name="Firemonger" body="firefox" />
+    <character name="Funnyfox" body="firefox" />    
+    <character name="Red Panda" body="firefox" />
+    <character name="Red Fox" body="firefox" />
+    <character name="Malaguti" body="firefox" />
+    <character name="Alopex" body="firefox" />
+  </team>
+</resources>
diff --git a/data/team/firefoxteam/dead.png b/data/team/firefoxteam/dead.png
deleted file mode 100644
index c5ffd99..0000000
Binary files a/data/team/firefoxteam/dead.png and /dev/null differ
diff --git a/data/team/firefoxteam/flag.png b/data/team/firefoxteam/flag.png
deleted file mode 100644
index 4dde1fc..0000000
Binary files a/data/team/firefoxteam/flag.png and /dev/null differ
diff --git a/data/team/firefoxteam/flag64.png b/data/team/firefoxteam/flag64.png
deleted file mode 100644
index 1c946b3..0000000
Binary files a/data/team/firefoxteam/flag64.png and /dev/null differ
diff --git a/data/team/firefoxteam/team.xml b/data/team/firefoxteam/team.xml
deleted file mode 100755
index 0b37389..0000000
--- a/data/team/firefoxteam/team.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Firefox</name>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="Mozilla browser" body="firefoxteam" />
-    <character name="Phoenix" body="firefoxteam" />
-    <character name="Firebird" body="firefoxteam" />
-    <character name="Deer Park" body="firefoxteam" />
-    <character name="Burning Edge" body="firefoxteam" />
-    <character name="Firemonger" body="firefoxteam" />
-    <character name="Funnyfox" body="firefoxteam" />    
-    <character name="Red Panda" body="firefoxteam" />
-    <character name="Red Fox" body="firefoxteam" />
-    <character name="Malaguti" body="firefoxteam" />
-    <character name="Alopex" body="firefoxteam" />
-  </team>
-</resources>
diff --git a/data/team/gnu/dead.png b/data/team/gnu/dead.png
new file mode 100644
index 0000000..1de9dfd
Binary files /dev/null and b/data/team/gnu/dead.png differ
diff --git a/data/team/gnu/flag.png b/data/team/gnu/flag.png
new file mode 100644
index 0000000..509900f
Binary files /dev/null and b/data/team/gnu/flag.png differ
diff --git a/data/team/gnu/flag64.png b/data/team/gnu/flag64.png
new file mode 100644
index 0000000..f3ccc1c
Binary files /dev/null and b/data/team/gnu/flag64.png differ
diff --git a/data/team/gnu/team.xml b/data/team/gnu/team.xml
new file mode 100755
index 0000000..c58ffdc
--- /dev/null
+++ b/data/team/gnu/team.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Gnu</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="Connochaetes Taurinus" body="gnu" />
+    <character name="Connochaetes gnu" body="gnu" />
+    <character name="Not UNIX" body="gnu" />
+    <character name="Linux" body="gnu" />
+    <character name="Hurd" body="gnu" />
+    <character name="Emacs" body="gnu" />
+    <character name="Compiler Collection" body="gnu" />
+    <character name="Arch" body="gnu" />
+    <character name="Debugger" body="gnu" />
+    <character name="Savannah" body="gnu" />
+  </team>
+</resources>
diff --git a/data/team/gnuteam/dead.png b/data/team/gnuteam/dead.png
deleted file mode 100644
index 518a8ad..0000000
Binary files a/data/team/gnuteam/dead.png and /dev/null differ
diff --git a/data/team/gnuteam/flag.png b/data/team/gnuteam/flag.png
deleted file mode 100644
index 56b3437..0000000
Binary files a/data/team/gnuteam/flag.png and /dev/null differ
diff --git a/data/team/gnuteam/flag64.png b/data/team/gnuteam/flag64.png
deleted file mode 100644
index 9d86c52..0000000
Binary files a/data/team/gnuteam/flag64.png and /dev/null differ
diff --git a/data/team/gnuteam/team.xml b/data/team/gnuteam/team.xml
deleted file mode 100755
index a2c1a39..0000000
--- a/data/team/gnuteam/team.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Gnu</name>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="Connochaetes Taurinus" body="gnuteam" />
-    <character name="Connochaetes gnu" body="gnuteam" />
-    <character name="Not UNIX" body="gnuteam" />
-    <character name="Linux" body="gnuteam" />
-    <character name="Hurd" body="gnuteam" />
-    <character name="Emacs" body="gnuteam" />
-    <character name="Compiler Collection" body="gnuteam" />
-    <character name="Arch" body="gnuteam" />
-    <character name="Debugger" body="gnuteam" />
-    <character name="Savannah" body="gnuteam" />
-  </team>
-</resources>
diff --git a/data/team/konqi/dead.png b/data/team/konqi/dead.png
new file mode 100644
index 0000000..84093fd
Binary files /dev/null and b/data/team/konqi/dead.png differ
diff --git a/data/team/konqi/flag.png b/data/team/konqi/flag.png
new file mode 100644
index 0000000..0504784
Binary files /dev/null and b/data/team/konqi/flag.png differ
diff --git a/data/team/konqi/flag64.png b/data/team/konqi/flag64.png
new file mode 100644
index 0000000..6608d0d
Binary files /dev/null and b/data/team/konqi/flag64.png differ
diff --git a/data/team/konqi/team.xml b/data/team/konqi/team.xml
new file mode 100755
index 0000000..f92fefe
--- /dev/null
+++ b/data/team/konqi/team.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Konqi</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="Konqui" body="konqi" />
+    <character name="Kopete" body="konqi" />
+    <character name="KDevelop" body="konqi" />
+    <character name="KMail" body="konqi" />
+    <character name="Kate" body="konqi" />
+    <character name="K3B" body="konqi" />
+    <character name="KFormula" body="konqi" />
+    <character name="KOffice" body="konqi" />
+    <character name="Kontact" body="konqi" />
+    <character name="Krita" body="konqi" />
+    <character name="digiKam" body="konqi" />
+    <character name="Kicker" body="konqi" />
+    <character name="okular" body="konqi" />
+    <character name="KPDF" body="konqi" />
+  </team>
+</resources>
diff --git a/data/team/konqiteam/dead.png b/data/team/konqiteam/dead.png
deleted file mode 100644
index 5f43956..0000000
Binary files a/data/team/konqiteam/dead.png and /dev/null differ
diff --git a/data/team/konqiteam/flag.png b/data/team/konqiteam/flag.png
deleted file mode 100644
index 3160857..0000000
Binary files a/data/team/konqiteam/flag.png and /dev/null differ
diff --git a/data/team/konqiteam/flag64.png b/data/team/konqiteam/flag64.png
deleted file mode 100644
index ed1ef6a..0000000
Binary files a/data/team/konqiteam/flag64.png and /dev/null differ
diff --git a/data/team/konqiteam/team.xml b/data/team/konqiteam/team.xml
deleted file mode 100644
index 2990b28..0000000
--- a/data/team/konqiteam/team.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Konqi</name> 
-  <sound_profile>flying</sound_profile>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="Konqui" body="konqiteam" />
-    <character name="Kopete" body="konqiteam" />
-    <character name="KDevelop" body="konqiteam" />
-    <character name="KMail" body="konqiteam" />
-    <character name="Kate" body="konqiteam" />
-    <character name="K3B" body="konqiteam" />
-    <character name="KFormula" body="konqiteam" />
-    <character name="KOffice" body="konqiteam" />
-    <character name="Kontact" body="konqiteam" />
-    <character name="Krita" body="konqiteam" />
-    <character name="digiKam" body="konqiteam" />
-    <character name="Kicker" body="konqiteam" />
-    <character name="okular" body="konqiteam" />
-    <character name="KPDF" body="konqiteam" />
-  </team>
-</resources>
diff --git a/data/team/nupik/dead.png b/data/team/nupik/dead.png
new file mode 100644
index 0000000..048d7b2
Binary files /dev/null and b/data/team/nupik/dead.png differ
diff --git a/data/team/nupik/flag.png b/data/team/nupik/flag.png
new file mode 100644
index 0000000..a99bfd0
Binary files /dev/null and b/data/team/nupik/flag.png differ
diff --git a/data/team/nupik/flag64.png b/data/team/nupik/flag64.png
new file mode 100644
index 0000000..bd18858
Binary files /dev/null and b/data/team/nupik/flag64.png differ
diff --git a/data/team/nupik/team.xml b/data/team/nupik/team.xml
new file mode 100644
index 0000000..5828384
--- /dev/null
+++ b/data/team/nupik/team.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Nupik</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="NuFW" body="nupik" />
+    <character name="Sonic" body="nupik" />
+    <character name="Genus Atelerix" body="nupik" />
+    <character name="Genus Erinaceus" body="nupik" />
+    <character name="Genus Hemiechinus" body="nupik" />
+    <character name="Genus Mesechinus" body="nupik" />
+    <character name="Blonde hedgehogs" body="nupik" />
+    <character name="WIPFW" body="nupik" />
+    <character name="Winsock" body="nupik" />
+    <character name="TDI FireWall" body="nupik" />
+    <character name="CodeSeeker" body="nupik" />
+    <character name="Ipfwadm" body="nupik" />
+    <character name="Shorewall" body="nupik" />
+    <character name="Zorp" body="nupik" /> 
+  </team>
+</resources>
diff --git a/data/team/nupikteam/dead.png b/data/team/nupikteam/dead.png
deleted file mode 100644
index e5700ba..0000000
Binary files a/data/team/nupikteam/dead.png and /dev/null differ
diff --git a/data/team/nupikteam/flag.png b/data/team/nupikteam/flag.png
deleted file mode 100644
index b75be72..0000000
Binary files a/data/team/nupikteam/flag.png and /dev/null differ
diff --git a/data/team/nupikteam/flag64.png b/data/team/nupikteam/flag64.png
deleted file mode 100644
index a9c7f0b..0000000
Binary files a/data/team/nupikteam/flag64.png and /dev/null differ
diff --git a/data/team/nupikteam/team.xml b/data/team/nupikteam/team.xml
deleted file mode 100755
index 4ba57dd..0000000
--- a/data/team/nupikteam/team.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Nupik</name>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="NuFW" body="nupikteam" />
-    <character name="Sonic" body="nupikteam" />
-    <character name="Genus Atelerix" body="nupikteam" />
-    <character name="Genus Erinaceus" body="nupikteam" />
-    <character name="Genus Hemiechinus" body="nupikteam" />
-    <character name="Genus Mesechinus" body="nupikteam" />
-    <character name="Blonde hedgehogs" body="nupikteam" />
-    <character name="WIPFW" body="nupikteam" />
-    <character name="Winsock" body="nupikteam" />
-    <character name="TDI FireWall" body="nupikteam" />
-    <character name="CodeSeeker" body="nupikteam" />
-    <character name="Ipfwadm" body="nupikteam" />
-    <character name="Shorewall" body="nupikteam" />
-    <character name="Zorp" body="nupikteam" />    
-  </team>
-</resources>
diff --git a/data/team/ooo/dead.png b/data/team/ooo/dead.png
new file mode 100644
index 0000000..8c74612
Binary files /dev/null and b/data/team/ooo/dead.png differ
diff --git a/data/team/ooo/flag.png b/data/team/ooo/flag.png
new file mode 100644
index 0000000..9f2f2f2
Binary files /dev/null and b/data/team/ooo/flag.png differ
diff --git a/data/team/ooo/flag64.png b/data/team/ooo/flag64.png
new file mode 100644
index 0000000..72e08d9
Binary files /dev/null and b/data/team/ooo/flag64.png differ
diff --git a/data/team/ooo/team.xml b/data/team/ooo/team.xml
new file mode 100755
index 0000000..15f3b44
--- /dev/null
+++ b/data/team/ooo/team.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>OOo</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="OOo" body="ooo"/>
+    <character name="Writer" body="ooo"/>
+    <character name="Calc" body="ooo"/>
+    <character name="Impress" body="ooo"/>
+    <character name="Base" body="ooo"/>
+    <character name="Draw" body="ooo"/>
+    <character name="Math" body="ooo"/>
+    <character name="Quickstarter" body="ooo"/>
+    <character name="OpenDocument" body="ooo"/>
+    <character name="OOoConv" body="ooo"/>
+    <character name="PortableOOo" body="ooo"/>
+    <character name="OOo HG" body="ooo"/>
+    <character name="Cart'OOo" body="ooo"/>
+    <character name="Hist'OOo" body="ooo"/>
+    <character name="Gé'OOo" body="ooo"/> 
+  </team>
+</resources>
diff --git a/data/team/oooteam/dead.png b/data/team/oooteam/dead.png
deleted file mode 100644
index 055097b..0000000
Binary files a/data/team/oooteam/dead.png and /dev/null differ
diff --git a/data/team/oooteam/flag.png b/data/team/oooteam/flag.png
deleted file mode 100644
index 2d7fb29..0000000
Binary files a/data/team/oooteam/flag.png and /dev/null differ
diff --git a/data/team/oooteam/flag64.png b/data/team/oooteam/flag64.png
deleted file mode 100644
index 40025bb..0000000
Binary files a/data/team/oooteam/flag64.png and /dev/null differ
diff --git a/data/team/oooteam/team.xml b/data/team/oooteam/team.xml
deleted file mode 100755
index 59ebe8d..0000000
--- a/data/team/oooteam/team.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>OOo</name>
-  <sound_profile>flying</sound_profile>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="OOo" body="oooteam" />
-    <character name="Writer" body="oooteam" />
-    <character name="Calc" body="oooteam" />
-    <character name="Impress" body="oooteam" />
-    <character name="Base" body="oooteam" />
-    <character name="Draw" body="oooteam" />
-    <character name="Math" body="oooteam" />
-    <character name="Quickstarter" body="oooteam" />    
-    <character name="OpenDocument" body="oooteam" />
-    <character name="OOoConv" body="oooteam" />
-    <character name="PortableOOo" body="oooteam" />
-    <character name="OOo HG" body="oooteam" />
-    <character name="Cart'OOo" body="oooteam" />
-    <character name="Hist'OOo" body="oooteam" />
-    <character name="Gé'OOo" body="oooteam" />
-  </team>
-</resources>
diff --git a/data/team/php/dead.png b/data/team/php/dead.png
new file mode 100644
index 0000000..bf96606
Binary files /dev/null and b/data/team/php/dead.png differ
diff --git a/data/team/php/flag.png b/data/team/php/flag.png
new file mode 100644
index 0000000..9e7d3b9
Binary files /dev/null and b/data/team/php/flag.png differ
diff --git a/data/team/php/flag64.png b/data/team/php/flag64.png
new file mode 100644
index 0000000..d63f367
Binary files /dev/null and b/data/team/php/flag64.png differ
diff --git a/data/team/php/team.xml b/data/team/php/team.xml
new file mode 100644
index 0000000..ea0b119
--- /dev/null
+++ b/data/team/php/team.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>PHP</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="PHP" body="php" />
+    <character name="Jumbo" body="php" />
+    <character name="Dumbo" body="php" />
+    <character name="Babar" body="php" />
+    <character name="Joseph Merrick" body="php" />
+    <character name="Ganesh" body="php" />
+    <character name="Gus Van Sant" body="php" />
+    <character name="The White Stripes" body="php" />
+    <character name="Loxodonta cyclotis" body="php" />
+    <character name="Loxodonta africana" body="php" />
+    <character name="Elephas maximus" body="php" />
+    <character name="Elephas recki" body="php" />
+    <character name="Stegodon" body="php" />
+    <character name="Mammuthus" body="php" />
+
+  </team>
+</resources>
+
+
diff --git a/data/team/phpteam/dead.png b/data/team/phpteam/dead.png
deleted file mode 100644
index 238fcc9..0000000
Binary files a/data/team/phpteam/dead.png and /dev/null differ
diff --git a/data/team/phpteam/flag.png b/data/team/phpteam/flag.png
deleted file mode 100644
index df66725..0000000
Binary files a/data/team/phpteam/flag.png and /dev/null differ
diff --git a/data/team/phpteam/flag64.png b/data/team/phpteam/flag64.png
deleted file mode 100644
index 08a52ed..0000000
Binary files a/data/team/phpteam/flag64.png and /dev/null differ
diff --git a/data/team/phpteam/team.xml b/data/team/phpteam/team.xml
deleted file mode 100755
index 58f4152..0000000
--- a/data/team/phpteam/team.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>PHP</name>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="PHP" body="phpteam" />
-    <character name="Jumbo" body="phpteam" />
-    <character name="Dumbo" body="phpteam" />
-    <character name="Babar" body="phpteam" />
-    <character name="Joseph Merrick" body="phpteam" />
-    <character name="Ganesh" body="phpteam" />
-    <character name="Gus Van Sant" body="phpteam" />
-    <character name="The White Stripes" body="phpteam" />
-    <character name="Loxodonta cyclotis" body="phpteam" />
-    <character name="Loxodonta africana" body="phpteam" />
-    <character name="Elephas maximus" body="phpteam" />
-    <character name="Elephas recki" body="phpteam" />
-    <character name="Stegodon" body="phpteam" />
-    <character name="Mammuthus" body="phpteam" />
-  </team>
-</resources>
diff --git a/data/team/pidgin/dead.png b/data/team/pidgin/dead.png
new file mode 100644
index 0000000..34cb86a
Binary files /dev/null and b/data/team/pidgin/dead.png differ
diff --git a/data/team/pidgin/flag.png b/data/team/pidgin/flag.png
new file mode 100644
index 0000000..c3681cd
Binary files /dev/null and b/data/team/pidgin/flag.png differ
diff --git a/data/team/pidgin/flag64.png b/data/team/pidgin/flag64.png
new file mode 100644
index 0000000..50b478e
Binary files /dev/null and b/data/team/pidgin/flag64.png differ
diff --git a/data/team/pidgin/team.xml b/data/team/pidgin/team.xml
new file mode 100755
index 0000000..0a57f52
--- /dev/null
+++ b/data/team/pidgin/team.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Pidgin</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="AIM" body="pidgin"/>
+    <character name="Bonjour" body="pidgin"/>
+    <character name="Gadu-Gadu" body="pidgin"/>
+    <character name="Google Talk" body="pidgin"/>
+    <character name="Groupwise" body="pidgin"/>
+    <character name="ICQ" body="pidgin"/>
+    <character name="IRC" body="pidgin"/>
+    <character name="MSN" body="pidgin"/>
+    <character name="MySpaceIM" body="pidgin"/>
+    <character name="QQ" body="pidgin"/>
+    <character name="SILC" body="pidgin"/>
+    <character name="SIMPLE" body="pidgin"/>
+    <character name="Sametime" body="pidgin"/>
+    <character name="XMPP" body="pidgin"/>
+    <character name="Yahoo!" body="pidgin"/>
+    <character name="Zephyr" body="pidgin"/>
+  </team>
+</resources>
+
+
+
+
diff --git a/data/team/snort/dead.png b/data/team/snort/dead.png
new file mode 100644
index 0000000..9c6b613
Binary files /dev/null and b/data/team/snort/dead.png differ
diff --git a/data/team/snort/flag.png b/data/team/snort/flag.png
new file mode 100644
index 0000000..52b3e6d
Binary files /dev/null and b/data/team/snort/flag.png differ
diff --git a/data/team/snort/flag64.png b/data/team/snort/flag64.png
new file mode 100644
index 0000000..14a1eeb
Binary files /dev/null and b/data/team/snort/flag64.png differ
diff --git a/data/team/snort/team.xml b/data/team/snort/team.xml
new file mode 100644
index 0000000..1cd916e
--- /dev/null
+++ b/data/team/snort/team.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Snort</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="Snort" body="snort" />
+    <character name="SnortSnarf" body="snort" />
+    <character name="ACID" body="snort" />
+    <character name="Sguil" body="snort" />
+    <character name="BASE" body="snort" />
+    <character name="Bearded Pig" body="snort" />
+    <character name="Vietnamese Warty Pig" body="snort" />
+    <character name="Visayas Warty Pig" body="snort" />
+    <character name="Celebes Warty Pig" body="snort" />
+    <character name="Poulter Warty Pig" body="snort" />
+    <character name="Flores Warty Pig" body="snort" />
+    <character name="Philippine Warty Pig" body="snort" />
+    <character name="Pigmy Hog" body="snort" />
+    <character name="Timor Warty Pig" body="snort" />
+  </team>
+</resources>
diff --git a/data/team/snortteam/dead.png b/data/team/snortteam/dead.png
deleted file mode 100644
index 0b8dfea..0000000
Binary files a/data/team/snortteam/dead.png and /dev/null differ
diff --git a/data/team/snortteam/flag.png b/data/team/snortteam/flag.png
deleted file mode 100644
index 4fa6b1d..0000000
Binary files a/data/team/snortteam/flag.png and /dev/null differ
diff --git a/data/team/snortteam/flag64.png b/data/team/snortteam/flag64.png
deleted file mode 100644
index eeb72e9..0000000
Binary files a/data/team/snortteam/flag64.png and /dev/null differ
diff --git a/data/team/snortteam/team.xml b/data/team/snortteam/team.xml
deleted file mode 100644
index 736eba2..0000000
--- a/data/team/snortteam/team.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Snort</name>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="Snort" body="snortteam" />
-    <character name="SnortSnarf" body="snortteam" />
-    <character name="ACID" body="snortteam" />
-    <character name="Sguil" body="snortteam" />
-    <character name="BASE" body="snortteam" />
-    <character name="Bearded Pig" body="snortteam" />
-    <character name="Vietnamese Warty Pig" body="snortteam" />
-    <character name="Visayas Warty Pig" body="snortteam" />
-    <character name="Celebes Warty Pig" body="snortteam" />
-    <character name="Poulter Warty Pig" body="snortteam" />
-    <character name="Flores Warty Pig" body="snortteam" />
-    <character name="Philippine Warty Pig" body="snortteam" />
-    <character name="Pigmy Hog" body="snortteam" />
-    <character name="Timor Warty Pig" body="snortteam" />
-  </team>
-</resources>
diff --git a/data/team/spip/dead.png b/data/team/spip/dead.png
new file mode 100644
index 0000000..e9ffab7
Binary files /dev/null and b/data/team/spip/dead.png differ
diff --git a/data/team/spip/flag.png b/data/team/spip/flag.png
new file mode 100644
index 0000000..4758e8e
Binary files /dev/null and b/data/team/spip/flag.png differ
diff --git a/data/team/spip/flag64.png b/data/team/spip/flag64.png
new file mode 100644
index 0000000..809f7bc
Binary files /dev/null and b/data/team/spip/flag64.png differ
diff --git a/data/team/spip/team.xml b/data/team/spip/team.xml
new file mode 100644
index 0000000..f78f3ee
--- /dev/null
+++ b/data/team/spip/team.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Spip</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+	<character name="ARNO*" body="spip"/>
+	<character name="Pit'" body="spip"/>
+	<character name="Fil" body="spip"/>
+	<character name="ESJ" body="spip"/>
+	<character name="Kliké" body="spip"/>
+	<character name="Cerdic" body="spip"/>	
+	<character name="Têtue" body="spip"/>
+	<character name="Renââto" body="spip"/>
+	<character name="Piif" body="spip"/>
+	<character name="bennybi" body="spip"/>
+	<character name="BoOz" body="spip"/>
+	<character name="Mortimer" body="spip"/>
+	<character name="toggg" body="spip"/>
+	<character name="Atchoum" body="spip"/>	
+	<character name="Alexandra Maison" body="spip"/>
+	<character name="izo" body="spip"/>
+  </team>
+</resources>
diff --git a/data/team/spipteam/dead.png b/data/team/spipteam/dead.png
deleted file mode 100644
index 69e785d..0000000
Binary files a/data/team/spipteam/dead.png and /dev/null differ
diff --git a/data/team/spipteam/flag.png b/data/team/spipteam/flag.png
deleted file mode 100644
index 615e775..0000000
Binary files a/data/team/spipteam/flag.png and /dev/null differ
diff --git a/data/team/spipteam/flag.svg b/data/team/spipteam/flag.svg
deleted file mode 100755
index e565561..0000000
--- a/data/team/spipteam/flag.svg
+++ /dev/null
@@ -1,7641 +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://web.resource.org/cc/"
-   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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="38"
-   height="38"
-   id="svg1"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="/home/yekcim/Desktop/spipteam/team"
-   sodipodi:docname="spip.svg"
-   inkscape:export-filename="C:\all.png"
-   inkscape:export-xdpi="211.75999"
-   inkscape:export-ydpi="211.75999"
-   version="1.0">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient11076">
-      <stop
-         style="stop-color:#1e1709;stop-opacity:1;"
-         offset="0"
-         id="stop11078" />
-      <stop
-         style="stop-color:#5e481f;stop-opacity:1;"
-         offset="1"
-         id="stop11080" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15088">
-      <stop
-         style="stop-color:#4e3a0c;stop-opacity:1;"
-         offset="0"
-         id="stop15090" />
-      <stop
-         style="stop-color:#4e3a0c;stop-opacity:0;"
-         offset="1"
-         id="stop15092" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14127">
-      <stop
-         style="stop-color:#2f261b;stop-opacity:1;"
-         offset="0"
-         id="stop14129" />
-      <stop
-         style="stop-color:#624f38;stop-opacity:1;"
-         offset="1"
-         id="stop14131" />
-    </linearGradient>
-    <defs
-       id="defs1062">
-      <linearGradient
-         inkscape:collect="always"
-         id="linearGradient10630">
-        <stop
-           style="stop-color:#616161;stop-opacity:1;"
-           offset="0"
-           id="stop10631" />
-        <stop
-           style="stop-color:#616161;stop-opacity:0;"
-           offset="1"
-           id="stop10632" />
-      </linearGradient>
-      <linearGradient
-         inkscape:collect="always"
-         id="linearGradient10560">
-        <stop
-           style="stop-color:#000000;stop-opacity:1;"
-           offset="0"
-           id="stop10561" />
-        <stop
-           style="stop-color:#000000;stop-opacity:0;"
-           offset="1"
-           id="stop10562" />
-      </linearGradient>
-      <linearGradient
-         id="linearGradient13777">
-        <stop
-           offset="0.0000000"
-           style="stop-color:#d17d00;stop-opacity:1.0000000;"
-           id="stop13779" />
-        <stop
-           offset="1.0000000"
-           style="stop-color:#a7b135;stop-opacity:0.0000000;"
-           id="stop13778" />
-      </linearGradient>
-      <linearGradient
-         id="linearGradient11847">
-        <stop
-           offset="0.0000000"
-           style="stop-color:#000000;stop-opacity:1.0000000;"
-           id="stop11849" />
-        <stop
-           offset="1.0000000"
-           style="stop-color:#000000;stop-opacity:0.0000000;"
-           id="stop11848" />
-      </linearGradient>
-      <linearGradient
-         id="linearGradient6187">
-        <stop
-           style="stop-color:#2e1b0b;stop-opacity:1.0000000;"
-           offset="0.0000000"
-           id="stop6188" />
-        <stop
-           style="stop-color:#431e00;stop-opacity:0;"
-           offset="1"
-           id="stop6189" />
-      </linearGradient>
-      <linearGradient
-         inkscape:collect="always"
-         id="linearGradient4909">
-        <stop
-           style="stop-color:#000000;stop-opacity:1;"
-           offset="0"
-           id="stop4910" />
-        <stop
-           style="stop-color:#000000;stop-opacity:0;"
-           offset="1"
-           id="stop4911" />
-      </linearGradient>
-      <linearGradient
-         id="linearGradient1780">
-        <stop
-           style="stop-color:#454545;stop-opacity:1.0000000;"
-           offset="0.0000000"
-           id="stop1781" />
-        <stop
-           style="stop-color:#ffffff;stop-opacity:0;"
-           offset="1"
-           id="stop1782" />
-      </linearGradient>
-      <linearGradient
-         id="linearGradient3869">
-        <stop
-           offset="0.0000000"
-           style="stop-color:#d2dd2e;stop-opacity:1.0000000;"
-           id="stop3872" />
-        <stop
-           offset="0.76146787"
-           style="stop-color:#b3b96d;stop-opacity:0.65555555;"
-           id="stop3871" />
-        <stop
-           offset="1.0000000"
-           style="stop-color:#b1b952;stop-opacity:0.0000000;"
-           id="stop3870" />
-      </linearGradient>
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient9217"
-         id="linearGradient3799"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="matrix(0.112563,0,0,0.115364,26.43402,157.1761)"
-         x1="4373.3052"
-         y1="319.33466"
-         x2="96.982727"
-         y2="2708.2139" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient7337"
-         id="linearGradient3800"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="matrix(0.230667,0,0,7.644947e-2,26.55186,129.5549)"
-         x1="862.1651"
-         y1="2479.5938"
-         x2="1523.3719"
-         y2="2479.5938" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient5442"
-         id="linearGradient3801"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="matrix(0.162855,0,0,7.648058e-2,75.52973,161.8049)"
-         x1="580.22791"
-         y1="2173.3171"
-         x2="1782.0374"
-         y2="1630.2036" />
-      <radialGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient5442"
-         id="radialGradient3802"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="matrix(0.159978,0,0,7.785591e-2,363.0923,173.8583)"
-         cx="-606.79681"
-         cy="1573.4399"
-         fx="-606.79681"
-         fy="1573.4399"
-         r="739.70477" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient21707"
-         id="linearGradient3803"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="scale(0.659854,1.515487)"
-         x1="4848.5972"
-         y1="3945.1116"
-         x2="5625.4653"
-         y2="1720.9402" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient7337"
-         id="linearGradient3804"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="matrix(0.236634,0,0,0.208284,-2451.443,4783.687)"
-         x1="-7797.7422"
-         y1="5021.4731"
-         x2="-352.84012"
-         y2="1184.9034" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient7337"
-         id="linearGradient3805"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="matrix(0.236634,0,0,0.208284,-2451.443,4783.687)"
-         x1="-7797.7422"
-         y1="5021.4731"
-         x2="-352.84012"
-         y2="1184.9034" />
-      <defs
-         id="defs3745">
-        <linearGradient
-           id="linearGradient22333"
-           x1="0"
-           y1="0.5"
-           x2="1"
-           y2="0.5"
-           gradientUnits="objectBoundingBox"
-           spreadMethod="pad"
-           xlink:href="#linearGradient13777" />
-        <linearGradient
-           id="linearGradient21707">
-          <stop
-             style="stop-color:#ffffff;stop-opacity:1.0000000;"
-             offset="0.0000000"
-             id="stop21708" />
-          <stop
-             style="stop-color:#a7b135;stop-opacity:0;"
-             offset="1"
-             id="stop21709" />
-        </linearGradient>
-        <linearGradient
-           inkscape:collect="always"
-           id="linearGradient9217"
-           x1="0"
-           y1="0.5"
-           x2="1"
-           y2="0.5"
-           gradientUnits="objectBoundingBox"
-           spreadMethod="pad"
-           xlink:href="#linearGradient11847" />
-        <linearGradient
-           id="linearGradient8584">
-          <stop
-             style="stop-color:#000000;stop-opacity:1.0000000;"
-             offset="0.0000000"
-             id="stop8585" />
-          <stop
-             style="stop-color:#cece4c;stop-opacity:0;"
-             offset="1"
-             id="stop8586" />
-        </linearGradient>
-        <linearGradient
-           id="linearGradient7337">
-          <stop
-             style="stop-color:#b1b12f;stop-opacity:1.0000000;"
-             offset="0.0000000"
-             id="stop7338" />
-          <stop
-             style="stop-color:#cece4c;stop-opacity:0;"
-             offset="1"
-             id="stop7339" />
-        </linearGradient>
-        <linearGradient
-           id="linearGradient5442"
-           x1="0"
-           y1="0.5"
-           x2="1"
-           y2="0.5"
-           gradientUnits="objectBoundingBox"
-           spreadMethod="pad"
-           xlink:href="#linearGradient3869" />
-      </defs>
-      <sodipodi:namedview
-         id="namedview3772"
-         pagecolor="#ffffff"
-         bordercolor="#666666"
-         borderopacity="1.0"
-         inkscape:pageopacity="0.0"
-         inkscape:pageshadow="2"
-         inkscape:zoom="0.80057989"
-         inkscape:cx="297.63780"
-         inkscape:cy="420.94487"
-         inkscape:current-layer="layer1"
-         inkscape:window-width="1440"
-         inkscape:window-height="851"
-         inkscape:window-x="0"
-         inkscape:window-y="27"
-         showguides="true"
-         inkscape:guide-bbox="true" />
-      <metadata
-         id="metadata3773">
-        <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>
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient4909"
-         id="linearGradient6167"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="scale(0.891889,1.121216)"
-         x1="-148.77991"
-         y1="106.3186"
-         x2="-160.14931"
-         y2="-66.932083" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient10560"
-         id="linearGradient10563"
-         gradientTransform="matrix(0.915477,0.127968,-0.149762,1.071392,19.54851,-8.45341)"
-         x1="698.5448"
-         y1="69.852913"
-         x2="758.31232"
-         y2="359.09653"
-         gradientUnits="userSpaceOnUse" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient10560"
-         id="linearGradient10578"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="matrix(0.915477,0.127968,-0.149762,1.071392,0,0)"
-         x1="647.37115"
-         y1="96.894905"
-         x2="770.59186"
-         y2="342.74301" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient4909"
-         id="linearGradient10604"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="scale(0.891889,1.121216)"
-         x1="-148.77991"
-         y1="106.3186"
-         x2="-160.14931"
-         y2="-66.932083" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient10630"
-         id="linearGradient10633"
-         gradientTransform="scale(0.883732,1.131565)"
-         x1="-164.59187"
-         y1="105.15539"
-         x2="-154.1456"
-         y2="3.6783011"
-         gradientUnits="userSpaceOnUse" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient10630"
-         id="linearGradient10647"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="scale(0.883732,1.131565)"
-         x1="-164.59187"
-         y1="105.15539"
-         x2="-154.1456"
-         y2="3.6783011" />
-      <radialGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient1780"
-         id="radialGradient5568"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="matrix(-0.663014,1.058409,1.330757,0.590372,-891.7907,666.4254)"
-         cx="-446.72464"
-         cy="218.60974"
-         fx="-446.72464"
-         fy="218.60974"
-         r="308.80975" />
-      <linearGradient
-         inkscape:collect="always"
-         xlink:href="#linearGradient10630"
-         id="linearGradient4391"
-         gradientUnits="userSpaceOnUse"
-         gradientTransform="matrix(0.437171,-0.479724,0.614848,0.55753,723.0732,-61.92042)"
-         x1="-164.59187"
-         y1="105.15539"
-         x2="-154.1456"
-         y2="3.6783011" />
-    </defs>
-    <defs
-       id="defs1539">
-      <linearGradient
-         id="linearGradient1553">
-        <stop
-           id="stop1555"
-           style="stop-color:#d17d00;stop-opacity:1.0000000;"
-           offset="0.0000000" />
-        <stop
-           id="stop1557"
-           style="stop-color:#a7b135;stop-opacity:0.0000000;"
-           offset="1.0000000" />
-      </linearGradient>
-      <linearGradient
-         id="linearGradient1559">
-        <stop
-           id="stop1561"
-           style="stop-color:#000000;stop-opacity:1.0000000;"
-           offset="0.0000000" />
-        <stop
-           id="stop1563"
-           style="stop-color:#000000;stop-opacity:0.0000000;"
-           offset="1.0000000" />
-      </linearGradient>
-      <linearGradient
-         id="linearGradient1565">
-        <stop
-           id="stop1567"
-           offset="0.0000000"
-           style="stop-color:#2e1b0b;stop-opacity:1.0000000;" />
-        <stop
-           id="stop1569"
-           offset="1"
-           style="stop-color:#431e00;stop-opacity:0;" />
-      </linearGradient>
-      <linearGradient
-         id="linearGradient1577">
-        <stop
-           id="stop1579"
-           offset="0"
-           style="stop-color:#eee07e;stop-opacity:1;" />
-        <stop
-           id="stop1581"
-           offset="1"
-           style="stop-color:#764413;stop-opacity:1;" />
-      </linearGradient>
-      <linearGradient
-         id="linearGradient1583">
-        <stop
-           id="stop1585"
-           style="stop-color:#d2dd2e;stop-opacity:1.0000000;"
-           offset="0.0000000" />
-        <stop
-           id="stop1587"
-           style="stop-color:#b3b96d;stop-opacity:0.65555555;"
-           offset="0.76146787" />
-        <stop
-           id="stop1589"
-           style="stop-color:#b1b952;stop-opacity:0.0000000;"
-           offset="1.0000000" />
-      </linearGradient>
-      <linearGradient
-         y2="2708.2139"
-         x2="96.982727"
-         y1="319.33466"
-         x1="4373.3052"
-         gradientTransform="matrix(0.112563,0,0,0.115364,26.43402,157.1761)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1591"
-         xlink:href="#linearGradient9217"
-         inkscape:collect="always" />
-      <linearGradient
-         y2="2479.5938"
-         x2="1523.3719"
-         y1="2479.5938"
-         x1="862.1651"
-         gradientTransform="matrix(0.230667,0,0,7.644947e-2,26.55186,129.5549)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1593"
-         xlink:href="#linearGradient7337"
-         inkscape:collect="always" />
-      <linearGradient
-         y2="1630.2036"
-         x2="1782.0374"
-         y1="2173.3171"
-         x1="580.22791"
-         gradientTransform="matrix(0.162855,0,0,7.648058e-2,75.52973,161.8049)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1595"
-         xlink:href="#linearGradient5442"
-         inkscape:collect="always" />
-      <radialGradient
-         r="739.70477"
-         fy="1573.4399"
-         fx="-606.79681"
-         cy="1573.4399"
-         cx="-606.79681"
-         gradientTransform="matrix(0.159978,0,0,7.785591e-2,363.0923,173.8583)"
-         gradientUnits="userSpaceOnUse"
-         id="radialGradient1597"
-         xlink:href="#linearGradient5442"
-         inkscape:collect="always" />
-      <linearGradient
-         y2="1720.9402"
-         x2="5625.4653"
-         y1="3945.1116"
-         x1="4848.5972"
-         gradientTransform="scale(0.659854,1.515487)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1599"
-         xlink:href="#linearGradient21707"
-         inkscape:collect="always" />
-      <linearGradient
-         y2="1184.9034"
-         x2="-352.84012"
-         y1="5021.4731"
-         x1="-7797.7422"
-         gradientTransform="matrix(0.236634,0,0,0.208284,-2451.443,4783.687)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1601"
-         xlink:href="#linearGradient7337"
-         inkscape:collect="always" />
-      <linearGradient
-         y2="1184.9034"
-         x2="-352.84012"
-         y1="5021.4731"
-         x1="-7797.7422"
-         gradientTransform="matrix(0.236634,0,0,0.208284,-2451.443,4783.687)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1603"
-         xlink:href="#linearGradient7337"
-         inkscape:collect="always" />
-      <defs
-         id="defs1605">
-        <linearGradient
-           xlink:href="#linearGradient13777"
-           spreadMethod="pad"
-           gradientUnits="objectBoundingBox"
-           y2="0.5"
-           x2="1"
-           y1="0.5"
-           x1="0"
-           id="linearGradient1607" />
-        <linearGradient
-           id="linearGradient1609">
-          <stop
-             id="stop1611"
-             offset="0.0000000"
-             style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-          <stop
-             id="stop1613"
-             offset="1"
-             style="stop-color:#a7b135;stop-opacity:0;" />
-        </linearGradient>
-        <linearGradient
-           xlink:href="#linearGradient11847"
-           spreadMethod="pad"
-           gradientUnits="objectBoundingBox"
-           y2="0.5"
-           x2="1"
-           y1="0.5"
-           x1="0"
-           id="linearGradient1615"
-           inkscape:collect="always" />
-        <linearGradient
-           id="linearGradient1617">
-          <stop
-             id="stop1619"
-             offset="0.0000000"
-             style="stop-color:#000000;stop-opacity:1.0000000;" />
-          <stop
-             id="stop1621"
-             offset="1"
-             style="stop-color:#cece4c;stop-opacity:0;" />
-        </linearGradient>
-        <linearGradient
-           id="linearGradient1623">
-          <stop
-             id="stop1625"
-             offset="0.0000000"
-             style="stop-color:#b1b12f;stop-opacity:1.0000000;" />
-          <stop
-             id="stop1627"
-             offset="1"
-             style="stop-color:#cece4c;stop-opacity:0;" />
-        </linearGradient>
-        <linearGradient
-           xlink:href="#linearGradient3869"
-           spreadMethod="pad"
-           gradientUnits="objectBoundingBox"
-           y2="0.5"
-           x2="1"
-           y1="0.5"
-           x1="0"
-           id="linearGradient1629" />
-      </defs>
-      <sodipodi:namedview
-         inkscape:guide-bbox="true"
-         showguides="true"
-         inkscape:window-y="27"
-         inkscape:window-x="0"
-         inkscape:window-height="851"
-         inkscape:window-width="1440"
-         inkscape:current-layer="layer1"
-         inkscape:cy="420.94487"
-         inkscape:cx="297.63780"
-         inkscape:zoom="0.80057989"
-         inkscape:pageshadow="2"
-         inkscape:pageopacity="0.0"
-         borderopacity="1.0"
-         bordercolor="#666666"
-         pagecolor="#ffffff"
-         id="namedview1631" />
-      <metadata
-         id="metadata1633">
-        <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>
-      <linearGradient
-         y2="-66.932083"
-         x2="-160.14931"
-         y1="106.3186"
-         x1="-148.77991"
-         gradientTransform="scale(0.891889,1.121216)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1635"
-         xlink:href="#linearGradient4909"
-         inkscape:collect="always" />
-      <linearGradient
-         gradientUnits="userSpaceOnUse"
-         y2="359.09653"
-         x2="758.31232"
-         y1="69.852913"
-         x1="698.5448"
-         gradientTransform="matrix(0.915477,0.127968,-0.149762,1.071392,19.54851,-8.45341)"
-         id="linearGradient1637"
-         xlink:href="#linearGradient10560"
-         inkscape:collect="always" />
-      <linearGradient
-         y2="342.74301"
-         x2="770.59186"
-         y1="96.894905"
-         x1="647.37115"
-         gradientTransform="matrix(0.915477,0.127968,-0.149762,1.071392,0,0)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1639"
-         xlink:href="#linearGradient10560"
-         inkscape:collect="always" />
-      <linearGradient
-         y2="-66.932083"
-         x2="-160.14931"
-         y1="106.3186"
-         x1="-148.77991"
-         gradientTransform="scale(0.891889,1.121216)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1641"
-         xlink:href="#linearGradient4909"
-         inkscape:collect="always" />
-      <linearGradient
-         y2="3.6783011"
-         x2="-154.1456"
-         y1="105.15539"
-         x1="-164.59187"
-         gradientTransform="scale(0.883732,1.131565)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1645"
-         xlink:href="#linearGradient10630"
-         inkscape:collect="always" />
-      <radialGradient
-         r="308.80975"
-         fy="218.60974"
-         fx="-446.72464"
-         cy="218.60974"
-         cx="-446.72464"
-         gradientTransform="matrix(-0.663014,1.058409,1.330757,0.590372,-891.7907,666.4254)"
-         gradientUnits="userSpaceOnUse"
-         id="radialGradient1647"
-         xlink:href="#linearGradient1780"
-         inkscape:collect="always" />
-      <linearGradient
-         y2="3.6783011"
-         x2="-154.1456"
-         y1="105.15539"
-         x1="-164.59187"
-         gradientTransform="matrix(0.437171,-0.479724,0.614848,0.55753,723.0732,-61.92042)"
-         gradientUnits="userSpaceOnUse"
-         id="linearGradient1649"
-         xlink:href="#linearGradient10630"
-         inkscape:collect="always" />
-    </defs>
-    <defs
-       id="defs909">
-      <linearGradient
-         xlink:href="#linearGradient1574"
-         spreadMethod="pad"
-         gradientUnits="objectBoundingBox"
-         y2="0.5"
-         x2="1"
-         y1="0.5"
-         x1="0"
-         id="linearGradient943" />
-      <defs
-         id="defs582">
-        <linearGradient
-           xlink:href="#linearGradient943"
-           spreadMethod="pad"
-           gradientUnits="objectBoundingBox"
-           y2="0.5"
-           x2="1"
-           y1="0.5"
-           x1="0"
-           id="linearGradient596" />
-        <linearGradient
-           xlink:href="#linearGradient1571"
-           spreadMethod="pad"
-           gradientUnits="objectBoundingBox"
-           y2="0.5"
-           x2="1"
-           y1="0.5"
-           x1="0"
-           id="linearGradient584" />
-        <radialGradient
-           gradientTransform="scale(0.999997,1.000003)"
-           fy="0.32031101"
-           fx="0.67796201"
-           r="1.143751"
-           cy="0.32031101"
-           cx="0.67796201"
-           id="radialGradient587"
-           xlink:href="#linearGradient596" />
-        <linearGradient
-           y2="0.171875"
-           x2="0.5"
-           y1="0.546875"
-           x1="0.88999999"
-           id="linearGradient594"
-           xlink:href="#linearGradient584" />
-        <radialGradient
-           fy="0.62499702"
-           fx="0.66000003"
-           r="0.580935"
-           cy="0.62499702"
-           cx="0.66000003"
-           id="radialGradient595"
-           xlink:href="#linearGradient584" />
-      </defs>
-      <sodipodi:namedview
-         id="namedview919" />
-    </defs>
-    <linearGradient
-       id="linearGradient1571">
-      <stop
-         id="stop1573"
-         style="stop-color:#ff5f27;stop-opacity:1.0000000;"
-         offset="0.0000000" />
-      <stop
-         id="stop1572"
-         style="stop-color:#ffff00;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1574">
-      <stop
-         id="stop1576"
-         style="stop-color:#8f5faa;stop-opacity:1.0000000;"
-         offset="0.0000000" />
-      <stop
-         id="stop1575"
-         style="stop-color:#7addc2;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1577"
-       id="linearGradient1920"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.654877e-2,-4.211438e-18,1.329721e-2,7.654877e-2,129.6047,18.81676)"
-       x1="1342.5908"
-       y1="557.17963"
-       x2="1068.0459"
-       y2="538.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1577"
-       id="linearGradient1922"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.654877e-2,0,0,7.654877e-2,132.274,20.09945)"
-       x1="1342.5908"
-       y1="557.17963"
-       x2="1068.0459"
-       y2="538.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15088"
-       id="linearGradient1924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.676511,1.282685)"
-       x1="230.44722"
-       y1="63.67025"
-       x2="222.92461"
-       y2="56.956726" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14127"
-       id="linearGradient1926"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.172027,0,0,1.172027,-246.8033,-39.92309)"
-       x1="213.6573"
-       y1="51.897442"
-       x2="221.30118"
-       y2="51.034321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1577"
-       id="linearGradient1928"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.971723e-2,0,0,8.971723e-2,-85.68365,-17.64453)"
-       x1="1342.5908"
-       y1="557.17963"
-       x2="1068.0459"
-       y2="538.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1577"
-       id="linearGradient1930"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.654877e-2,-3.23418e-18,1.329721e-2,7.654877e-2,129.6047,18.81676)"
-       x1="1342.5908"
-       y1="557.17963"
-       x2="1068.0459"
-       y2="538.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1577"
-       id="linearGradient1936"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.971723e-2,0,0,8.971723e-2,-85.70318,-17.62391)"
-       x1="1342.5908"
-       y1="557.17963"
-       x2="1068.0459"
-       y2="538.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1577"
-       id="linearGradient1938"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.971723e-2,0,0,8.971723e-2,-85.70318,-17.62391)"
-       x1="1342.5908"
-       y1="557.17963"
-       x2="1068.0459"
-       y2="538.55939" />
-    <linearGradient
-       id="linearGradient3153">
-      <stop
-         id="stop3155"
-         offset="0"
-         style="stop-color:#a5a236;stop-opacity:1;" />
-      <stop
-         id="stop3157"
-         offset="1"
-         style="stop-color:#636120;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1577"
-       id="linearGradient11118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.654877e-2,1.908866e-18,-1.908866e-18,7.654877e-2,137.9505,18.81676)"
-       x1="1342.5908"
-       y1="557.17963"
-       x2="1068.0459"
-       y2="538.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15088"
-       id="linearGradient11120"
-       gradientUnits="userSpaceOnUse"
-       x1="230.44722"
-       y1="63.67025"
-       x2="224.54974"
-       y2="54.430073" />
-    <linearGradient
-       id="linearGradient12003">
-      <stop
-         id="stop12005"
-         offset="0"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop12007"
-         offset="1"
-         style="stop-color:#737373;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12024">
-      <stop
-         style="stop-color:#9d9d9d;stop-opacity:1;"
-         offset="0"
-         id="stop12026" />
-      <stop
-         style="stop-color:#4e4e4e;stop-opacity:1;"
-         offset="1"
-         id="stop12028" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.78"
-     inkscape:cx="56.671551"
-     inkscape:cy="1.9240182"
-     inkscape:current-layer="g1160"
-     inkscape:window-width="933"
-     inkscape:window-height="945"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     showgrid="false" />
-  <metadata
-     id="metadata4">
-    <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
-     id="g1160"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     style="display:inline">
-    <g
-       inkscape:label="Layer 1"
-       id="g14585"
-       transform="matrix(-0.80024,0,0,0.80024,414.1606,-72.80011)" />
-    <g
-       id="g14587"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1571.562,260.1311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14589"
-       transform="matrix(-0.80024,0,0,0.80024,2238.779,227.6448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14591"
-       transform="matrix(-0.757324,0,0,0.76036,384.77,-53.6154)" />
-    <g
-       id="g14593"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1480.1,262.7241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14595"
-       transform="matrix(-0.757324,0,0,0.76036,2111.536,231.8568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16865"
-       transform="matrix(-0.80024,0,0,0.80024,383.3923,-73.81709)" />
-    <g
-       id="g16867"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1540.794,259.1141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16869"
-       transform="matrix(-0.80024,0,0,0.80024,2208.011,226.6278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16871"
-       transform="matrix(-0.757324,0,0,0.76036,354.0017,-54.63238)" />
-    <g
-       id="g16873"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1449.332,261.7071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16875"
-       transform="matrix(-0.757324,0,0,0.76036,2080.768,230.8398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6044"
-       transform="matrix(-0.80024,0,0,0.80024,326.7814,-82.22363)" />
-    <g
-       id="g6046"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1484.183,250.7076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6048"
-       transform="matrix(-0.80024,0,0,0.80024,2151.4,218.2213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6050"
-       transform="matrix(-0.757324,0,0,0.76036,297.3908,-63.03892)" />
-    <g
-       id="g6052"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1392.721,253.3006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6054"
-       transform="matrix(-0.757324,0,0,0.76036,2024.157,222.4333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g8313"
-       transform="matrix(-0.757324,0,0,0.76036,376.536,-60.20879)" />
-    <g
-       id="g8315"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1471.866,256.1307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g8317"
-       transform="matrix(-0.757324,0,0,0.76036,2103.302,225.2634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g11911"
-       transform="matrix(-0.80024,0,0,0.80024,356.3158,-74.73739)" />
-    <g
-       id="g11913"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1513.717,258.1938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g11915"
-       transform="matrix(-0.80024,0,0,0.80024,2180.934,225.7075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g11917"
-       transform="matrix(-0.757324,0,0,0.76036,326.9252,-55.55268)" />
-    <g
-       id="g11919"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1422.255,260.7868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g11921"
-       transform="matrix(-0.757324,0,0,0.76036,2053.691,229.9195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16475"
-       transform="matrix(-0.80024,0,0,0.80024,367.4423,-78.20206)" />
-    <g
-       id="g16477"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1524.843,254.7291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16479"
-       transform="matrix(-0.80024,0,0,0.80024,2192.06,222.2428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16481"
-       transform="matrix(-0.757324,0,0,0.76036,338.0517,-59.01735)" />
-    <g
-       id="g16483"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1433.381,257.3221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16485"
-       transform="matrix(-0.757324,0,0,0.76036,2064.817,226.4548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14710"
-       transform="matrix(-0.80024,0,0,0.80024,445.1606,-72.80011)" />
-    <g
-       id="g14712"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1602.562,260.1311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14714"
-       transform="matrix(-0.80024,0,0,0.80024,2269.779,227.6448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14716"
-       transform="matrix(-0.757324,0,0,0.76036,415.77,-53.6154)" />
-    <g
-       id="g14718"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1511.1,262.7241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14720"
-       transform="matrix(-0.757324,0,0,0.76036,2142.536,231.8568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14726"
-       transform="matrix(-0.80024,0,0,0.80024,414.3923,-73.81709)" />
-    <g
-       id="g14728"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1571.794,259.1141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14730"
-       transform="matrix(-0.80024,0,0,0.80024,2239.011,226.6278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14732"
-       transform="matrix(-0.757324,0,0,0.76036,385.0017,-54.63238)" />
-    <g
-       id="g14734"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1480.332,261.7071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14736"
-       transform="matrix(-0.757324,0,0,0.76036,2111.768,230.8398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14738"
-       transform="matrix(-0.80024,0,0,0.80024,357.7814,-82.22363)" />
-    <g
-       id="g14740"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1515.183,250.7076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14742"
-       transform="matrix(-0.80024,0,0,0.80024,2182.4,218.2213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14744"
-       transform="matrix(-0.757324,0,0,0.76036,328.3908,-63.03892)" />
-    <g
-       id="g14746"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1423.721,253.3006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14748"
-       transform="matrix(-0.757324,0,0,0.76036,2055.157,222.4333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14750"
-       transform="matrix(-0.757324,0,0,0.76036,407.536,-60.20879)" />
-    <g
-       id="g14752"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1502.866,256.1307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14754"
-       transform="matrix(-0.757324,0,0,0.76036,2134.302,225.2634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14756"
-       transform="matrix(-0.80024,0,0,0.80024,387.3158,-74.73739)" />
-    <g
-       id="g14758"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1544.717,258.1938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14760"
-       transform="matrix(-0.80024,0,0,0.80024,2211.934,225.7075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14762"
-       transform="matrix(-0.757324,0,0,0.76036,357.9252,-55.55268)" />
-    <g
-       id="g14764"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1453.255,260.7868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14766"
-       transform="matrix(-0.757324,0,0,0.76036,2084.691,229.9195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14822"
-       transform="matrix(-0.80024,0,0,0.80024,398.4423,-78.20206)" />
-    <g
-       id="g14824"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1555.843,254.7291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14826"
-       transform="matrix(-0.80024,0,0,0.80024,2223.06,222.2428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14828"
-       transform="matrix(-0.757324,0,0,0.76036,369.0517,-59.01735)" />
-    <g
-       id="g14830"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1464.381,257.3221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g14832"
-       transform="matrix(-0.757324,0,0,0.76036,2095.817,226.4548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15077"
-       transform="matrix(-0.80024,0,0,0.80024,476.1606,-72.80011)" />
-    <g
-       id="g15079"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1633.562,260.1311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15081"
-       transform="matrix(-0.80024,0,0,0.80024,2300.779,227.6448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15083"
-       transform="matrix(-0.757324,0,0,0.76036,446.77,-53.6154)" />
-    <g
-       id="g15085"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1542.1,262.7241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15087"
-       transform="matrix(-0.757324,0,0,0.76036,2173.536,231.8568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15093"
-       transform="matrix(-0.80024,0,0,0.80024,445.3923,-73.81709)" />
-    <g
-       id="g15095"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1602.794,259.1141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15097"
-       transform="matrix(-0.80024,0,0,0.80024,2270.011,226.6278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15099"
-       transform="matrix(-0.757324,0,0,0.76036,416.0017,-54.63238)" />
-    <g
-       id="g15101"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1511.332,261.7071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15103"
-       transform="matrix(-0.757324,0,0,0.76036,2142.768,230.8398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15105"
-       transform="matrix(-0.80024,0,0,0.80024,388.7814,-82.22363)" />
-    <g
-       id="g15107"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1546.183,250.7076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15109"
-       transform="matrix(-0.80024,0,0,0.80024,2213.4,218.2213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15111"
-       transform="matrix(-0.757324,0,0,0.76036,359.3908,-63.03892)" />
-    <g
-       id="g15113"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1454.721,253.3006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15115"
-       transform="matrix(-0.757324,0,0,0.76036,2086.157,222.4333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15117"
-       transform="matrix(-0.757324,0,0,0.76036,438.536,-60.20879)" />
-    <g
-       id="g15119"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1533.866,256.1307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15121"
-       transform="matrix(-0.757324,0,0,0.76036,2165.302,225.2634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15123"
-       transform="matrix(-0.80024,0,0,0.80024,418.3158,-74.73739)" />
-    <g
-       id="g15125"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1575.717,258.1938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15127"
-       transform="matrix(-0.80024,0,0,0.80024,2242.934,225.7075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15129"
-       transform="matrix(-0.757324,0,0,0.76036,388.9252,-55.55268)" />
-    <g
-       id="g15131"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1484.255,260.7868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15133"
-       transform="matrix(-0.757324,0,0,0.76036,2115.691,229.9195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15189"
-       transform="matrix(-0.80024,0,0,0.80024,429.4423,-78.20206)" />
-    <g
-       id="g15191"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1586.843,254.7291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15193"
-       transform="matrix(-0.80024,0,0,0.80024,2254.06,222.2428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15195"
-       transform="matrix(-0.757324,0,0,0.76036,400.0517,-59.01735)" />
-    <g
-       id="g15197"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1495.381,257.3221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15199"
-       transform="matrix(-0.757324,0,0,0.76036,2126.817,226.4548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15255"
-       transform="matrix(-0.80024,0,0,0.80024,507.1606,-72.80011)" />
-    <g
-       id="g15257"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1664.562,260.1311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15259"
-       transform="matrix(-0.80024,0,0,0.80024,2331.779,227.6448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15261"
-       transform="matrix(-0.757324,0,0,0.76036,477.77,-53.6154)" />
-    <g
-       id="g15263"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1573.1,262.7241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15265"
-       transform="matrix(-0.757324,0,0,0.76036,2204.536,231.8568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15271"
-       transform="matrix(-0.80024,0,0,0.80024,476.3923,-73.81709)" />
-    <g
-       id="g15273"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1633.794,259.1141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15275"
-       transform="matrix(-0.80024,0,0,0.80024,2301.011,226.6278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15277"
-       transform="matrix(-0.757324,0,0,0.76036,447.0017,-54.63238)" />
-    <g
-       id="g15279"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1542.332,261.7071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15281"
-       transform="matrix(-0.757324,0,0,0.76036,2173.768,230.8398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15283"
-       transform="matrix(-0.80024,0,0,0.80024,419.7814,-82.22363)" />
-    <g
-       id="g15285"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1577.183,250.7076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15287"
-       transform="matrix(-0.80024,0,0,0.80024,2244.4,218.2213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15289"
-       transform="matrix(-0.757324,0,0,0.76036,390.3908,-63.03892)" />
-    <g
-       id="g15291"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1485.721,253.3006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15293"
-       transform="matrix(-0.757324,0,0,0.76036,2117.157,222.4333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15295"
-       transform="matrix(-0.757324,0,0,0.76036,469.536,-60.20879)" />
-    <g
-       id="g15297"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1564.866,256.1307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15299"
-       transform="matrix(-0.757324,0,0,0.76036,2196.302,225.2634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15301"
-       transform="matrix(-0.80024,0,0,0.80024,449.3158,-74.73739)" />
-    <g
-       id="g15303"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1606.717,258.1938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15305"
-       transform="matrix(-0.80024,0,0,0.80024,2273.934,225.7075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15307"
-       transform="matrix(-0.757324,0,0,0.76036,419.9252,-55.55268)" />
-    <g
-       id="g15309"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1515.255,260.7868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15311"
-       transform="matrix(-0.757324,0,0,0.76036,2146.691,229.9195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15367"
-       transform="matrix(-0.80024,0,0,0.80024,460.4423,-78.20206)" />
-    <g
-       id="g15369"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1617.843,254.7291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15371"
-       transform="matrix(-0.80024,0,0,0.80024,2285.06,222.2428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15373"
-       transform="matrix(-0.757324,0,0,0.76036,431.0517,-59.01735)" />
-    <g
-       id="g15375"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1526.381,257.3221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15377"
-       transform="matrix(-0.757324,0,0,0.76036,2157.817,226.4548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15809"
-       transform="matrix(-0.80024,0,0,0.80024,538.1606,-72.80011)" />
-    <g
-       id="g15811"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1695.562,260.1311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15813"
-       transform="matrix(-0.80024,0,0,0.80024,2362.779,227.6448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15815"
-       transform="matrix(-0.757324,0,0,0.76036,508.77,-53.6154)" />
-    <g
-       id="g15817"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1604.1,262.7241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15819"
-       transform="matrix(-0.757324,0,0,0.76036,2235.536,231.8568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15825"
-       transform="matrix(-0.80024,0,0,0.80024,507.3923,-73.81709)" />
-    <g
-       id="g15827"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1664.794,259.1141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15829"
-       transform="matrix(-0.80024,0,0,0.80024,2332.011,226.6278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15831"
-       transform="matrix(-0.757324,0,0,0.76036,478.0017,-54.63238)" />
-    <g
-       id="g15833"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1573.332,261.7071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15835"
-       transform="matrix(-0.757324,0,0,0.76036,2204.768,230.8398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15837"
-       transform="matrix(-0.80024,0,0,0.80024,450.7814,-82.22363)" />
-    <g
-       id="g15839"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1608.183,250.7076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15841"
-       transform="matrix(-0.80024,0,0,0.80024,2275.4,218.2213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15843"
-       transform="matrix(-0.757324,0,0,0.76036,421.3908,-63.03892)" />
-    <g
-       id="g15845"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1516.721,253.3006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15847"
-       transform="matrix(-0.757324,0,0,0.76036,2148.157,222.4333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15849"
-       transform="matrix(-0.757324,0,0,0.76036,500.536,-60.20879)" />
-    <g
-       id="g15851"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1595.866,256.1307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15853"
-       transform="matrix(-0.757324,0,0,0.76036,2227.302,225.2634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15855"
-       transform="matrix(-0.80024,0,0,0.80024,480.3158,-74.73739)" />
-    <g
-       id="g15857"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1637.717,258.1938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15859"
-       transform="matrix(-0.80024,0,0,0.80024,2304.934,225.7075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15861"
-       transform="matrix(-0.757324,0,0,0.76036,450.9252,-55.55268)" />
-    <g
-       id="g15863"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1546.255,260.7868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15865"
-       transform="matrix(-0.757324,0,0,0.76036,2177.691,229.9195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15921"
-       transform="matrix(-0.80024,0,0,0.80024,491.4423,-78.20206)" />
-    <g
-       id="g15923"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1648.843,254.7291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15925"
-       transform="matrix(-0.80024,0,0,0.80024,2316.06,222.2428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15927"
-       transform="matrix(-0.757324,0,0,0.76036,462.0517,-59.01735)" />
-    <g
-       id="g15929"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1557.381,257.3221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15931"
-       transform="matrix(-0.757324,0,0,0.76036,2188.817,226.4548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15987"
-       transform="matrix(-0.80024,0,0,0.80024,569.1606,-72.80011)" />
-    <g
-       id="g15989"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1726.562,260.1311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15991"
-       transform="matrix(-0.80024,0,0,0.80024,2393.779,227.6448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15993"
-       transform="matrix(-0.757324,0,0,0.76036,539.77,-53.6154)" />
-    <g
-       id="g15995"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1635.1,262.7241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g15997"
-       transform="matrix(-0.757324,0,0,0.76036,2266.536,231.8568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16003"
-       transform="matrix(-0.80024,0,0,0.80024,538.3923,-73.81709)" />
-    <g
-       id="g16005"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1695.794,259.1141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16007"
-       transform="matrix(-0.80024,0,0,0.80024,2363.011,226.6278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16009"
-       transform="matrix(-0.757324,0,0,0.76036,509.0017,-54.63238)" />
-    <g
-       id="g16011"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1604.332,261.7071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16013"
-       transform="matrix(-0.757324,0,0,0.76036,2235.768,230.8398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16015"
-       transform="matrix(-0.80024,0,0,0.80024,481.7814,-82.22363)" />
-    <g
-       id="g16017"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1639.183,250.7076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16019"
-       transform="matrix(-0.80024,0,0,0.80024,2306.4,218.2213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16021"
-       transform="matrix(-0.757324,0,0,0.76036,452.3908,-63.03892)" />
-    <g
-       id="g16023"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1547.721,253.3006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16025"
-       transform="matrix(-0.757324,0,0,0.76036,2179.157,222.4333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16027"
-       transform="matrix(-0.757324,0,0,0.76036,531.536,-60.20879)" />
-    <g
-       id="g16029"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1626.866,256.1307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16031"
-       transform="matrix(-0.757324,0,0,0.76036,2258.302,225.2634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16033"
-       transform="matrix(-0.80024,0,0,0.80024,511.3158,-74.73739)" />
-    <g
-       id="g16035"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1668.717,258.1938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16037"
-       transform="matrix(-0.80024,0,0,0.80024,2335.934,225.7075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16039"
-       transform="matrix(-0.757324,0,0,0.76036,481.9252,-55.55268)" />
-    <g
-       id="g16041"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1577.255,260.7868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16043"
-       transform="matrix(-0.757324,0,0,0.76036,2208.691,229.9195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16099"
-       transform="matrix(-0.80024,0,0,0.80024,522.4423,-78.20206)" />
-    <g
-       id="g16101"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1679.843,254.7291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16103"
-       transform="matrix(-0.80024,0,0,0.80024,2347.06,222.2428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16105"
-       transform="matrix(-0.757324,0,0,0.76036,493.0517,-59.01735)" />
-    <g
-       id="g16107"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1588.381,257.3221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16109"
-       transform="matrix(-0.757324,0,0,0.76036,2219.817,226.4548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16167"
-       transform="matrix(-0.80024,0,0,0.80024,600.1606,-72.80011)" />
-    <g
-       id="g16169"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1757.562,260.1311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16171"
-       transform="matrix(-0.80024,0,0,0.80024,2424.779,227.6448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16173"
-       transform="matrix(-0.757324,0,0,0.76036,570.77,-53.6154)" />
-    <g
-       id="g16175"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1666.1,262.7241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16177"
-       transform="matrix(-0.757324,0,0,0.76036,2297.536,231.8568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16183"
-       transform="matrix(-0.80024,0,0,0.80024,569.3923,-73.81709)" />
-    <g
-       id="g16185"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1726.794,259.1141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16187"
-       transform="matrix(-0.80024,0,0,0.80024,2394.011,226.6278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16189"
-       transform="matrix(-0.757324,0,0,0.76036,540.0017,-54.63238)" />
-    <g
-       id="g16191"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1635.332,261.7071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16193"
-       transform="matrix(-0.757324,0,0,0.76036,2266.768,230.8398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16195"
-       transform="matrix(-0.80024,0,0,0.80024,512.7814,-82.22363)" />
-    <g
-       id="g16197"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1670.183,250.7076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16199"
-       transform="matrix(-0.80024,0,0,0.80024,2337.4,218.2213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16201"
-       transform="matrix(-0.757324,0,0,0.76036,483.3908,-63.03892)" />
-    <g
-       id="g16203"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1578.721,253.3006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16205"
-       transform="matrix(-0.757324,0,0,0.76036,2210.157,222.4333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16207"
-       transform="matrix(-0.757324,0,0,0.76036,562.536,-60.20879)" />
-    <g
-       id="g16209"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1657.866,256.1307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16211"
-       transform="matrix(-0.757324,0,0,0.76036,2289.302,225.2634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16213"
-       transform="matrix(-0.80024,0,0,0.80024,542.3158,-74.73739)" />
-    <g
-       id="g16215"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1699.717,258.1938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16217"
-       transform="matrix(-0.80024,0,0,0.80024,2366.934,225.7075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16219"
-       transform="matrix(-0.757324,0,0,0.76036,512.9252,-55.55268)" />
-    <g
-       id="g16221"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1608.255,260.7868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16223"
-       transform="matrix(-0.757324,0,0,0.76036,2239.691,229.9195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16279"
-       transform="matrix(-0.80024,0,0,0.80024,553.4423,-78.20206)" />
-    <g
-       id="g16281"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1710.843,254.7291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16283"
-       transform="matrix(-0.80024,0,0,0.80024,2378.06,222.2428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16285"
-       transform="matrix(-0.757324,0,0,0.76036,524.0517,-59.01735)" />
-    <g
-       id="g16287"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1619.381,257.3221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16289"
-       transform="matrix(-0.757324,0,0,0.76036,2250.817,226.4548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16345"
-       transform="matrix(-0.80024,0,0,0.80024,631.1606,-72.80011)" />
-    <g
-       id="g16347"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1788.562,260.1311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16349"
-       transform="matrix(-0.80024,0,0,0.80024,2455.779,227.6448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16351"
-       transform="matrix(-0.757324,0,0,0.76036,601.77,-53.6154)" />
-    <g
-       id="g16353"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1697.1,262.7241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16355"
-       transform="matrix(-0.757324,0,0,0.76036,2328.536,231.8568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16361"
-       transform="matrix(-0.80024,0,0,0.80024,600.3923,-73.81709)" />
-    <g
-       id="g16363"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1757.794,259.1141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16365"
-       transform="matrix(-0.80024,0,0,0.80024,2425.011,226.6278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16367"
-       transform="matrix(-0.757324,0,0,0.76036,571.0017,-54.63238)" />
-    <g
-       id="g16369"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1666.332,261.7071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16371"
-       transform="matrix(-0.757324,0,0,0.76036,2297.768,230.8398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16373"
-       transform="matrix(-0.80024,0,0,0.80024,543.7814,-82.22363)" />
-    <g
-       id="g16375"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1701.183,250.7076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16377"
-       transform="matrix(-0.80024,0,0,0.80024,2368.4,218.2213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16379"
-       transform="matrix(-0.757324,0,0,0.76036,514.3908,-63.03892)" />
-    <g
-       id="g16381"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1609.721,253.3006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16383"
-       transform="matrix(-0.757324,0,0,0.76036,2241.157,222.4333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16385"
-       transform="matrix(-0.757324,0,0,0.76036,593.536,-60.20879)" />
-    <g
-       id="g16387"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1688.866,256.1307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16389"
-       transform="matrix(-0.757324,0,0,0.76036,2320.302,225.2634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16391"
-       transform="matrix(-0.80024,0,0,0.80024,573.3158,-74.73739)" />
-    <g
-       id="g16393"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1730.717,258.1938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16395"
-       transform="matrix(-0.80024,0,0,0.80024,2397.934,225.7075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16397"
-       transform="matrix(-0.757324,0,0,0.76036,543.9252,-55.55268)" />
-    <g
-       id="g16399"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1639.255,260.7868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16401"
-       transform="matrix(-0.757324,0,0,0.76036,2270.691,229.9195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16457"
-       transform="matrix(-0.80024,0,0,0.80024,584.4423,-78.20206)" />
-    <g
-       id="g16459"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1741.843,254.7291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16461"
-       transform="matrix(-0.80024,0,0,0.80024,2409.06,222.2428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16463"
-       transform="matrix(-0.757324,0,0,0.76036,555.0517,-59.01735)" />
-    <g
-       id="g16465"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1650.381,257.3221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g16467"
-       transform="matrix(-0.757324,0,0,0.76036,2281.817,226.4548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4133"
-       transform="matrix(-0.80024,0,0,0.80024,411.905,-33.04011)" />
-    <g
-       id="g4135"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1569.306,299.8911)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4137"
-       transform="matrix(-0.80024,0,0,0.80024,2236.523,267.4048)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4139"
-       transform="matrix(-0.757324,0,0,0.76036,382.5144,-13.8554)" />
-    <g
-       id="g4141"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1477.844,302.4841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4143"
-       transform="matrix(-0.757324,0,0,0.76036,2109.28,271.6168)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4145"
-       transform="matrix(-0.80024,0,0,0.80024,381.1367,-34.05709)" />
-    <g
-       id="g4147"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1538.538,298.8741)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4149"
-       transform="matrix(-0.80024,0,0,0.80024,2205.755,266.3878)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4151"
-       transform="matrix(-0.757324,0,0,0.76036,351.7461,-14.87238)" />
-    <g
-       id="g4153"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1447.076,301.4671)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4155"
-       transform="matrix(-0.757324,0,0,0.76036,2078.512,270.5998)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4157"
-       transform="matrix(-0.80024,0,0,0.80024,324.5258,-42.46363)" />
-    <g
-       id="g4159"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1481.927,290.4676)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4161"
-       transform="matrix(-0.80024,0,0,0.80024,2149.144,257.9813)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4163"
-       transform="matrix(-0.757324,0,0,0.76036,295.1352,-23.27892)" />
-    <g
-       id="g4165"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1390.465,293.0606)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4167"
-       transform="matrix(-0.757324,0,0,0.76036,2021.901,262.1933)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4169"
-       transform="matrix(-0.757324,0,0,0.76036,374.2804,-20.44879)" />
-    <g
-       id="g4171"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1469.61,295.8907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4173"
-       transform="matrix(-0.757324,0,0,0.76036,2101.046,265.0234)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4175"
-       transform="matrix(-0.80024,0,0,0.80024,354.0602,-34.97739)" />
-    <g
-       id="g4177"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1511.461,297.9538)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4179"
-       transform="matrix(-0.80024,0,0,0.80024,2178.678,265.4675)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4181"
-       transform="matrix(-0.757324,0,0,0.76036,324.6696,-15.79268)" />
-    <g
-       id="g4183"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1419.999,300.5468)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4185"
-       transform="matrix(-0.757324,0,0,0.76036,2051.435,269.6795)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4187"
-       transform="matrix(-0.80024,0,0,0.80024,365.1867,-38.44206)" />
-    <g
-       id="g4189"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1522.587,294.4891)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4191"
-       transform="matrix(-0.80024,0,0,0.80024,2189.804,262.0028)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4193"
-       transform="matrix(-0.757324,0,0,0.76036,335.7961,-19.25735)" />
-    <g
-       id="g4195"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1431.125,297.0821)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4197"
-       transform="matrix(-0.757324,0,0,0.76036,2062.561,266.2148)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4199"
-       transform="matrix(-0.80024,0,0,0.80024,442.905,-33.04011)" />
-    <g
-       id="g4201"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1600.306,299.8911)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4203"
-       transform="matrix(-0.80024,0,0,0.80024,2267.523,267.4048)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4205"
-       transform="matrix(-0.757324,0,0,0.76036,413.5144,-13.8554)" />
-    <g
-       id="g4207"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1508.844,302.4841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4209"
-       transform="matrix(-0.757324,0,0,0.76036,2140.28,271.6168)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4211"
-       transform="matrix(-0.80024,0,0,0.80024,412.1367,-34.05709)" />
-    <g
-       id="g4213"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1569.538,298.8741)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4215"
-       transform="matrix(-0.80024,0,0,0.80024,2236.755,266.3878)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4217"
-       transform="matrix(-0.757324,0,0,0.76036,382.7461,-14.87238)" />
-    <g
-       id="g4219"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1478.076,301.4671)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4221"
-       transform="matrix(-0.757324,0,0,0.76036,2109.512,270.5998)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4223"
-       transform="matrix(-0.80024,0,0,0.80024,355.5258,-42.46363)" />
-    <g
-       id="g4225"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1512.927,290.4676)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4227"
-       transform="matrix(-0.80024,0,0,0.80024,2180.144,257.9813)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4229"
-       transform="matrix(-0.757324,0,0,0.76036,326.1352,-23.27892)" />
-    <g
-       id="g4231"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1421.465,293.0606)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4233"
-       transform="matrix(-0.757324,0,0,0.76036,2052.901,262.1933)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4235"
-       transform="matrix(-0.757324,0,0,0.76036,405.2804,-20.44879)" />
-    <g
-       id="g4237"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1500.61,295.8907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4239"
-       transform="matrix(-0.757324,0,0,0.76036,2132.046,265.0234)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4241"
-       transform="matrix(-0.80024,0,0,0.80024,385.0602,-34.97739)" />
-    <g
-       id="g4243"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1542.461,297.9538)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4245"
-       transform="matrix(-0.80024,0,0,0.80024,2209.678,265.4675)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4247"
-       transform="matrix(-0.757324,0,0,0.76036,355.6696,-15.79268)" />
-    <g
-       id="g4249"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1450.999,300.5468)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4251"
-       transform="matrix(-0.757324,0,0,0.76036,2082.435,269.6795)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4253"
-       transform="matrix(-0.80024,0,0,0.80024,396.1867,-38.44206)" />
-    <g
-       id="g4255"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1553.587,294.4891)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4257"
-       transform="matrix(-0.80024,0,0,0.80024,2220.804,262.0028)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4259"
-       transform="matrix(-0.757324,0,0,0.76036,366.7961,-19.25735)" />
-    <g
-       id="g4261"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1462.125,297.0821)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4263"
-       transform="matrix(-0.757324,0,0,0.76036,2093.561,266.2148)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4265"
-       transform="matrix(-0.80024,0,0,0.80024,473.905,-33.04011)" />
-    <g
-       id="g4267"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1631.306,299.8911)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4269"
-       transform="matrix(-0.80024,0,0,0.80024,2298.523,267.4048)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4271"
-       transform="matrix(-0.757324,0,0,0.76036,444.5144,-13.8554)" />
-    <g
-       id="g4273"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1539.844,302.4841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4275"
-       transform="matrix(-0.757324,0,0,0.76036,2171.28,271.6168)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4277"
-       transform="matrix(-0.80024,0,0,0.80024,443.1367,-34.05709)" />
-    <g
-       id="g4279"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1600.538,298.8741)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4281"
-       transform="matrix(-0.80024,0,0,0.80024,2267.755,266.3878)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4283"
-       transform="matrix(-0.757324,0,0,0.76036,413.7461,-14.87238)" />
-    <g
-       id="g4285"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1509.076,301.4671)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4287"
-       transform="matrix(-0.757324,0,0,0.76036,2140.512,270.5998)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4289"
-       transform="matrix(-0.80024,0,0,0.80024,386.5258,-42.46363)" />
-    <g
-       id="g4291"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1543.927,290.4676)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4293"
-       transform="matrix(-0.80024,0,0,0.80024,2211.144,257.9813)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4295"
-       transform="matrix(-0.757324,0,0,0.76036,357.1352,-23.27892)" />
-    <g
-       id="g4297"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1452.465,293.0606)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4299"
-       transform="matrix(-0.757324,0,0,0.76036,2083.901,262.1933)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4301"
-       transform="matrix(-0.757324,0,0,0.76036,436.2804,-20.44879)" />
-    <g
-       id="g4303"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1531.61,295.8907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4305"
-       transform="matrix(-0.757324,0,0,0.76036,2163.046,265.0234)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4307"
-       transform="matrix(-0.80024,0,0,0.80024,416.0602,-34.97739)" />
-    <g
-       id="g4309"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1573.461,297.9538)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4311"
-       transform="matrix(-0.80024,0,0,0.80024,2240.678,265.4675)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4313"
-       transform="matrix(-0.757324,0,0,0.76036,386.6696,-15.79268)" />
-    <g
-       id="g4315"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1481.999,300.5468)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4317"
-       transform="matrix(-0.757324,0,0,0.76036,2113.435,269.6795)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4319"
-       transform="matrix(-0.80024,0,0,0.80024,427.1867,-38.44206)" />
-    <g
-       id="g4321"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1584.587,294.4891)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4323"
-       transform="matrix(-0.80024,0,0,0.80024,2251.804,262.0028)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4325"
-       transform="matrix(-0.757324,0,0,0.76036,397.7961,-19.25735)" />
-    <g
-       id="g4327"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1493.125,297.0821)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4329"
-       transform="matrix(-0.757324,0,0,0.76036,2124.561,266.2148)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4331"
-       transform="matrix(-0.80024,0,0,0.80024,504.905,-33.04011)" />
-    <g
-       id="g4333"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1662.306,299.8911)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4335"
-       transform="matrix(-0.80024,0,0,0.80024,2329.523,267.4048)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4337"
-       transform="matrix(-0.757324,0,0,0.76036,475.5144,-13.8554)" />
-    <g
-       id="g4339"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1570.844,302.4841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4341"
-       transform="matrix(-0.757324,0,0,0.76036,2202.28,271.6168)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4343"
-       transform="matrix(-0.80024,0,0,0.80024,474.1367,-34.05709)" />
-    <g
-       id="g4345"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1631.538,298.8741)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4347"
-       transform="matrix(-0.80024,0,0,0.80024,2298.755,266.3878)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4349"
-       transform="matrix(-0.757324,0,0,0.76036,444.7461,-14.87238)" />
-    <g
-       id="g4351"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1540.076,301.4671)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4353"
-       transform="matrix(-0.757324,0,0,0.76036,2171.512,270.5998)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4355"
-       transform="matrix(-0.80024,0,0,0.80024,417.5258,-42.46363)" />
-    <g
-       id="g4357"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1574.927,290.4676)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4359"
-       transform="matrix(-0.80024,0,0,0.80024,2242.144,257.9813)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4361"
-       transform="matrix(-0.757324,0,0,0.76036,388.1352,-23.27892)" />
-    <g
-       id="g4363"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1483.465,293.0606)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4365"
-       transform="matrix(-0.757324,0,0,0.76036,2114.901,262.1933)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4367"
-       transform="matrix(-0.757324,0,0,0.76036,467.2804,-20.44879)" />
-    <g
-       id="g4369"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1562.61,295.8907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4371"
-       transform="matrix(-0.757324,0,0,0.76036,2194.046,265.0234)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4373"
-       transform="matrix(-0.80024,0,0,0.80024,447.0602,-34.97739)" />
-    <g
-       id="g4375"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1604.461,297.9538)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4377"
-       transform="matrix(-0.80024,0,0,0.80024,2271.678,265.4675)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4379"
-       transform="matrix(-0.757324,0,0,0.76036,417.6696,-15.79268)" />
-    <g
-       id="g4381"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1512.999,300.5468)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4383"
-       transform="matrix(-0.757324,0,0,0.76036,2144.435,269.6795)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4385"
-       transform="matrix(-0.80024,0,0,0.80024,458.1867,-38.44206)" />
-    <g
-       id="g4387"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1615.587,294.4891)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4389"
-       transform="matrix(-0.80024,0,0,0.80024,2282.804,262.0028)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4391"
-       transform="matrix(-0.757324,0,0,0.76036,428.7961,-19.25735)" />
-    <g
-       id="g4393"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1524.125,297.0821)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4395"
-       transform="matrix(-0.757324,0,0,0.76036,2155.561,266.2148)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4397"
-       transform="matrix(-0.80024,0,0,0.80024,535.905,-33.04011)" />
-    <g
-       id="g4399"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1693.306,299.8911)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4401"
-       transform="matrix(-0.80024,0,0,0.80024,2360.523,267.4048)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4403"
-       transform="matrix(-0.757324,0,0,0.76036,506.5144,-13.8554)" />
-    <g
-       id="g4405"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1601.844,302.4841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4407"
-       transform="matrix(-0.757324,0,0,0.76036,2233.28,271.6168)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4409"
-       transform="matrix(-0.80024,0,0,0.80024,505.1367,-34.05709)" />
-    <g
-       id="g4411"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1662.538,298.8741)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4413"
-       transform="matrix(-0.80024,0,0,0.80024,2329.755,266.3878)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4415"
-       transform="matrix(-0.757324,0,0,0.76036,475.7461,-14.87238)" />
-    <g
-       id="g4417"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1571.076,301.4671)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4419"
-       transform="matrix(-0.757324,0,0,0.76036,2202.512,270.5998)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4421"
-       transform="matrix(-0.80024,0,0,0.80024,448.5258,-42.46363)" />
-    <g
-       id="g4423"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1605.927,290.4676)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4425"
-       transform="matrix(-0.80024,0,0,0.80024,2273.144,257.9813)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4427"
-       transform="matrix(-0.757324,0,0,0.76036,419.1352,-23.27892)" />
-    <g
-       id="g4429"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1514.465,293.0606)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4431"
-       transform="matrix(-0.757324,0,0,0.76036,2145.901,262.1933)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4433"
-       transform="matrix(-0.757324,0,0,0.76036,498.2804,-20.44879)" />
-    <g
-       id="g4435"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1593.61,295.8907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4437"
-       transform="matrix(-0.757324,0,0,0.76036,2225.046,265.0234)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4439"
-       transform="matrix(-0.80024,0,0,0.80024,478.0602,-34.97739)" />
-    <g
-       id="g4441"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1635.461,297.9538)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4443"
-       transform="matrix(-0.80024,0,0,0.80024,2302.678,265.4675)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4445"
-       transform="matrix(-0.757324,0,0,0.76036,448.6696,-15.79268)" />
-    <g
-       id="g4447"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1543.999,300.5468)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4449"
-       transform="matrix(-0.757324,0,0,0.76036,2175.435,269.6795)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4451"
-       transform="matrix(-0.80024,0,0,0.80024,489.1867,-38.44206)" />
-    <g
-       id="g4453"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1646.587,294.4891)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4455"
-       transform="matrix(-0.80024,0,0,0.80024,2313.804,262.0028)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4457"
-       transform="matrix(-0.757324,0,0,0.76036,459.7961,-19.25735)" />
-    <g
-       id="g4459"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1555.125,297.0821)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4461"
-       transform="matrix(-0.757324,0,0,0.76036,2186.561,266.2148)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4463"
-       transform="matrix(-0.80024,0,0,0.80024,566.905,-33.04011)" />
-    <g
-       id="g4465"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1724.306,299.8911)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4467"
-       transform="matrix(-0.80024,0,0,0.80024,2391.523,267.4048)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4469"
-       transform="matrix(-0.757324,0,0,0.76036,537.5144,-13.8554)" />
-    <g
-       id="g4471"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1632.844,302.4841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4473"
-       transform="matrix(-0.757324,0,0,0.76036,2264.28,271.6168)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4475"
-       transform="matrix(-0.80024,0,0,0.80024,536.1367,-34.05709)" />
-    <g
-       id="g4477"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1693.538,298.8741)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4479"
-       transform="matrix(-0.80024,0,0,0.80024,2360.755,266.3878)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4481"
-       transform="matrix(-0.757324,0,0,0.76036,506.7461,-14.87238)" />
-    <g
-       id="g4483"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1602.076,301.4671)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4485"
-       transform="matrix(-0.757324,0,0,0.76036,2233.512,270.5998)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4487"
-       transform="matrix(-0.80024,0,0,0.80024,479.5258,-42.46363)" />
-    <g
-       id="g4489"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1636.927,290.4676)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4491"
-       transform="matrix(-0.80024,0,0,0.80024,2304.144,257.9813)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4493"
-       transform="matrix(-0.757324,0,0,0.76036,450.1352,-23.27892)" />
-    <g
-       id="g4495"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1545.465,293.0606)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4497"
-       transform="matrix(-0.757324,0,0,0.76036,2176.901,262.1933)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4499"
-       transform="matrix(-0.757324,0,0,0.76036,529.2804,-20.44879)" />
-    <g
-       id="g4501"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1624.61,295.8907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4503"
-       transform="matrix(-0.757324,0,0,0.76036,2256.046,265.0234)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4505"
-       transform="matrix(-0.80024,0,0,0.80024,509.0602,-34.97739)" />
-    <g
-       id="g4507"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1666.461,297.9538)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4509"
-       transform="matrix(-0.80024,0,0,0.80024,2333.678,265.4675)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4511"
-       transform="matrix(-0.757324,0,0,0.76036,479.6696,-15.79268)" />
-    <g
-       id="g4513"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1574.999,300.5468)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4515"
-       transform="matrix(-0.757324,0,0,0.76036,2206.435,269.6795)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4517"
-       transform="matrix(-0.80024,0,0,0.80024,520.1867,-38.44206)" />
-    <g
-       id="g4519"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1677.587,294.4891)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4521"
-       transform="matrix(-0.80024,0,0,0.80024,2344.804,262.0028)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4523"
-       transform="matrix(-0.757324,0,0,0.76036,490.7961,-19.25735)" />
-    <g
-       id="g4525"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1586.125,297.0821)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4527"
-       transform="matrix(-0.757324,0,0,0.76036,2217.561,266.2148)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4529"
-       transform="matrix(-0.80024,0,0,0.80024,597.905,-33.04011)" />
-    <g
-       id="g4531"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1755.306,299.8911)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4533"
-       transform="matrix(-0.80024,0,0,0.80024,2422.523,267.4048)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4535"
-       transform="matrix(-0.757324,0,0,0.76036,568.5144,-13.8554)" />
-    <g
-       id="g4537"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1663.844,302.4841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4539"
-       transform="matrix(-0.757324,0,0,0.76036,2295.28,271.6168)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4541"
-       transform="matrix(-0.80024,0,0,0.80024,567.1367,-34.05709)" />
-    <g
-       id="g4543"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1724.538,298.8741)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4545"
-       transform="matrix(-0.80024,0,0,0.80024,2391.755,266.3878)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4547"
-       transform="matrix(-0.757324,0,0,0.76036,537.7461,-14.87238)" />
-    <g
-       id="g4549"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1633.076,301.4671)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4551"
-       transform="matrix(-0.757324,0,0,0.76036,2264.512,270.5998)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4553"
-       transform="matrix(-0.80024,0,0,0.80024,510.5258,-42.46363)" />
-    <g
-       id="g4555"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1667.927,290.4676)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4557"
-       transform="matrix(-0.80024,0,0,0.80024,2335.144,257.9813)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4559"
-       transform="matrix(-0.757324,0,0,0.76036,481.1352,-23.27892)" />
-    <g
-       id="g4561"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1576.465,293.0606)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4563"
-       transform="matrix(-0.757324,0,0,0.76036,2207.901,262.1933)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4565"
-       transform="matrix(-0.757324,0,0,0.76036,560.2804,-20.44879)" />
-    <g
-       id="g4567"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1655.61,295.8907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4569"
-       transform="matrix(-0.757324,0,0,0.76036,2287.046,265.0234)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4571"
-       transform="matrix(-0.80024,0,0,0.80024,540.0602,-34.97739)" />
-    <g
-       id="g4573"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1697.461,297.9538)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4575"
-       transform="matrix(-0.80024,0,0,0.80024,2364.678,265.4675)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4577"
-       transform="matrix(-0.757324,0,0,0.76036,510.6696,-15.79268)" />
-    <g
-       id="g4579"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1605.999,300.5468)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4581"
-       transform="matrix(-0.757324,0,0,0.76036,2237.435,269.6795)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4583"
-       transform="matrix(-0.80024,0,0,0.80024,551.1867,-38.44206)" />
-    <g
-       id="g4585"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1708.587,294.4891)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4587"
-       transform="matrix(-0.80024,0,0,0.80024,2375.804,262.0028)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4589"
-       transform="matrix(-0.757324,0,0,0.76036,521.7961,-19.25735)" />
-    <g
-       id="g4591"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1617.125,297.0821)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4593"
-       transform="matrix(-0.757324,0,0,0.76036,2248.561,266.2148)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4595"
-       transform="matrix(-0.80024,0,0,0.80024,628.905,-33.04011)" />
-    <g
-       id="g4597"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1786.306,299.8911)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4599"
-       transform="matrix(-0.80024,0,0,0.80024,2453.523,267.4048)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4601"
-       transform="matrix(-0.757324,0,0,0.76036,599.5144,-13.8554)" />
-    <g
-       id="g4603"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1694.844,302.4841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4605"
-       transform="matrix(-0.757324,0,0,0.76036,2326.28,271.6168)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4607"
-       transform="matrix(-0.80024,0,0,0.80024,598.1367,-34.05709)" />
-    <g
-       id="g4609"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1755.538,298.8741)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4611"
-       transform="matrix(-0.80024,0,0,0.80024,2422.755,266.3878)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4613"
-       transform="matrix(-0.757324,0,0,0.76036,568.7461,-14.87238)" />
-    <g
-       id="g4615"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1664.076,301.4671)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4617"
-       transform="matrix(-0.757324,0,0,0.76036,2295.512,270.5998)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4619"
-       transform="matrix(-0.80024,0,0,0.80024,541.5258,-42.46363)" />
-    <g
-       id="g4621"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1698.927,290.4676)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4623"
-       transform="matrix(-0.80024,0,0,0.80024,2366.144,257.9813)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4625"
-       transform="matrix(-0.757324,0,0,0.76036,512.1352,-23.27892)" />
-    <g
-       id="g4627"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1607.465,293.0606)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4629"
-       transform="matrix(-0.757324,0,0,0.76036,2238.901,262.1933)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4631"
-       transform="matrix(-0.757324,0,0,0.76036,591.2804,-20.44879)" />
-    <g
-       id="g4633"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1686.61,295.8907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4635"
-       transform="matrix(-0.757324,0,0,0.76036,2318.046,265.0234)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4637"
-       transform="matrix(-0.80024,0,0,0.80024,571.0602,-34.97739)" />
-    <g
-       id="g4639"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1728.461,297.9538)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4641"
-       transform="matrix(-0.80024,0,0,0.80024,2395.678,265.4675)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4643"
-       transform="matrix(-0.757324,0,0,0.76036,541.6696,-15.79268)" />
-    <g
-       id="g4645"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1636.999,300.5468)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4647"
-       transform="matrix(-0.757324,0,0,0.76036,2268.435,269.6795)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4649"
-       transform="matrix(-0.80024,0,0,0.80024,582.1867,-38.44206)" />
-    <g
-       id="g4651"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1739.587,294.4891)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4653"
-       transform="matrix(-0.80024,0,0,0.80024,2406.804,262.0028)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4655"
-       transform="matrix(-0.757324,0,0,0.76036,552.7961,-19.25735)" />
-    <g
-       id="g4657"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1648.125,297.0821)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g4659"
-       transform="matrix(-0.757324,0,0,0.76036,2279.561,266.2148)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2562"
-       transform="matrix(-0.80024,0,0,0.80024,397.093,-96.7675)" />
-    <g
-       id="g2564"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1554.494,236.1637)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2566"
-       transform="matrix(-0.80024,0,0,0.80024,2221.711,203.6774)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2568"
-       transform="matrix(-0.757324,0,0,0.76036,367.7024,-77.5828)" />
-    <g
-       id="g2570"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1463.032,238.7567)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2572"
-       transform="matrix(-0.757324,0,0,0.76036,2094.468,207.8894)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2574"
-       transform="matrix(-0.80024,0,0,0.80024,366.3247,-97.7845)" />
-    <g
-       id="g2576"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1523.726,235.1467)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2578"
-       transform="matrix(-0.80024,0,0,0.80024,2190.943,202.6604)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2580"
-       transform="matrix(-0.757324,0,0,0.76036,336.9341,-78.5998)" />
-    <g
-       id="g2582"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1432.264,237.7397)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2584"
-       transform="matrix(-0.757324,0,0,0.76036,2063.7,206.8724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2586"
-       transform="matrix(-0.80024,0,0,0.80024,309.7138,-106.191)" />
-    <g
-       id="g2588"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1467.115,226.7402)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2590"
-       transform="matrix(-0.80024,0,0,0.80024,2134.332,194.2539)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2592"
-       transform="matrix(-0.757324,0,0,0.76036,280.3232,-87.0063)" />
-    <g
-       id="g2594"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1375.653,229.3332)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2596"
-       transform="matrix(-0.757324,0,0,0.76036,2007.089,198.4659)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2598"
-       transform="matrix(-0.757324,0,0,0.76036,359.4684,-84.1762)" />
-    <g
-       id="g2600"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1454.798,232.1633)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2602"
-       transform="matrix(-0.757324,0,0,0.76036,2086.234,201.296)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2604"
-       transform="matrix(-0.80024,0,0,0.80024,339.2482,-98.7048)" />
-    <g
-       id="g2606"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1496.649,234.2264)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2608"
-       transform="matrix(-0.80024,0,0,0.80024,2163.866,201.7401)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2610"
-       transform="matrix(-0.757324,0,0,0.76036,309.8576,-79.5201)" />
-    <g
-       id="g2612"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1405.187,236.8194)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2614"
-       transform="matrix(-0.757324,0,0,0.76036,2036.623,205.9521)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2616"
-       transform="matrix(-0.80024,0,0,0.80024,350.3747,-102.1694)" />
-    <g
-       id="g2618"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1507.775,230.7617)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2620"
-       transform="matrix(-0.80024,0,0,0.80024,2174.992,198.2754)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2622"
-       transform="matrix(-0.757324,0,0,0.76036,320.9841,-82.9847)" />
-    <g
-       id="g2624"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1416.313,233.3547)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2626"
-       transform="matrix(-0.757324,0,0,0.76036,2047.749,202.4874)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2628"
-       transform="matrix(-0.80024,0,0,0.80024,428.093,-96.7675)" />
-    <g
-       id="g2630"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1585.494,236.1637)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2632"
-       transform="matrix(-0.80024,0,0,0.80024,2252.711,203.6774)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2634"
-       transform="matrix(-0.757324,0,0,0.76036,398.7024,-77.5828)" />
-    <g
-       id="g2636"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1494.032,238.7567)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2638"
-       transform="matrix(-0.757324,0,0,0.76036,2125.468,207.8894)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2640"
-       transform="matrix(-0.80024,0,0,0.80024,397.3247,-97.7845)" />
-    <g
-       id="g2642"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1554.726,235.1467)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2644"
-       transform="matrix(-0.80024,0,0,0.80024,2221.943,202.6604)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2646"
-       transform="matrix(-0.757324,0,0,0.76036,367.9341,-78.5998)" />
-    <g
-       id="g2648"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1463.264,237.7397)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2650"
-       transform="matrix(-0.757324,0,0,0.76036,2094.7,206.8724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2652"
-       transform="matrix(-0.80024,0,0,0.80024,340.7138,-106.191)" />
-    <g
-       id="g2654"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1498.115,226.7402)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2656"
-       transform="matrix(-0.80024,0,0,0.80024,2165.332,194.2539)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2658"
-       transform="matrix(-0.757324,0,0,0.76036,311.3232,-87.0063)" />
-    <g
-       id="g2660"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1406.653,229.3332)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2662"
-       transform="matrix(-0.757324,0,0,0.76036,2038.089,198.4659)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2664"
-       transform="matrix(-0.757324,0,0,0.76036,390.4684,-84.1762)" />
-    <g
-       id="g2666"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1485.798,232.1633)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2668"
-       transform="matrix(-0.757324,0,0,0.76036,2117.234,201.296)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2670"
-       transform="matrix(-0.80024,0,0,0.80024,370.2482,-98.7048)" />
-    <g
-       id="g2672"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1527.649,234.2264)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2674"
-       transform="matrix(-0.80024,0,0,0.80024,2194.866,201.7401)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2676"
-       transform="matrix(-0.757324,0,0,0.76036,340.8576,-79.5201)" />
-    <g
-       id="g2678"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1436.187,236.8194)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2680"
-       transform="matrix(-0.757324,0,0,0.76036,2067.623,205.9521)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2682"
-       transform="matrix(-0.80024,0,0,0.80024,381.3747,-102.1694)" />
-    <g
-       id="g2684"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1538.775,230.7617)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2686"
-       transform="matrix(-0.80024,0,0,0.80024,2205.992,198.2754)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2688"
-       transform="matrix(-0.757324,0,0,0.76036,351.9841,-82.9847)" />
-    <g
-       id="g2690"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1447.313,233.3547)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2692"
-       transform="matrix(-0.757324,0,0,0.76036,2078.749,202.4874)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2694"
-       transform="matrix(-0.80024,0,0,0.80024,459.093,-96.7675)" />
-    <g
-       id="g2696"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1616.494,236.1637)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2698"
-       transform="matrix(-0.80024,0,0,0.80024,2283.711,203.6774)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2700"
-       transform="matrix(-0.757324,0,0,0.76036,429.7024,-77.5828)" />
-    <g
-       id="g2702"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1525.032,238.7567)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2704"
-       transform="matrix(-0.757324,0,0,0.76036,2156.468,207.8894)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2706"
-       transform="matrix(-0.80024,0,0,0.80024,428.3247,-97.7845)" />
-    <g
-       id="g2708"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1585.726,235.1467)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2710"
-       transform="matrix(-0.80024,0,0,0.80024,2252.943,202.6604)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2712"
-       transform="matrix(-0.757324,0,0,0.76036,398.9341,-78.5998)" />
-    <g
-       id="g2714"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1494.264,237.7397)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2716"
-       transform="matrix(-0.757324,0,0,0.76036,2125.7,206.8724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2718"
-       transform="matrix(-0.80024,0,0,0.80024,371.7138,-106.191)" />
-    <g
-       id="g2720"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1529.115,226.7402)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2722"
-       transform="matrix(-0.80024,0,0,0.80024,2196.332,194.2539)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2724"
-       transform="matrix(-0.757324,0,0,0.76036,342.3232,-87.0063)" />
-    <g
-       id="g2726"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1437.653,229.3332)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2728"
-       transform="matrix(-0.757324,0,0,0.76036,2069.089,198.4659)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2730"
-       transform="matrix(-0.757324,0,0,0.76036,421.4684,-84.1762)" />
-    <g
-       id="g2732"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1516.798,232.1633)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2734"
-       transform="matrix(-0.757324,0,0,0.76036,2148.234,201.296)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2736"
-       transform="matrix(-0.80024,0,0,0.80024,401.2482,-98.7048)" />
-    <g
-       id="g2738"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1558.649,234.2264)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2740"
-       transform="matrix(-0.80024,0,0,0.80024,2225.866,201.7401)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2742"
-       transform="matrix(-0.757324,0,0,0.76036,371.8576,-79.5201)" />
-    <g
-       id="g2744"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1467.187,236.8194)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2746"
-       transform="matrix(-0.757324,0,0,0.76036,2098.623,205.9521)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2748"
-       transform="matrix(-0.80024,0,0,0.80024,412.3747,-102.1694)" />
-    <g
-       id="g2750"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1569.775,230.7617)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2752"
-       transform="matrix(-0.80024,0,0,0.80024,2236.992,198.2754)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2754"
-       transform="matrix(-0.757324,0,0,0.76036,382.9841,-82.9847)" />
-    <g
-       id="g2756"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1478.313,233.3547)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2758"
-       transform="matrix(-0.757324,0,0,0.76036,2109.749,202.4874)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2760"
-       transform="matrix(-0.80024,0,0,0.80024,490.093,-96.7675)" />
-    <g
-       id="g2762"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1647.494,236.1637)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2764"
-       transform="matrix(-0.80024,0,0,0.80024,2314.711,203.6774)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2766"
-       transform="matrix(-0.757324,0,0,0.76036,460.7024,-77.5828)" />
-    <g
-       id="g2768"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1556.032,238.7567)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2770"
-       transform="matrix(-0.757324,0,0,0.76036,2187.468,207.8894)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2772"
-       transform="matrix(-0.80024,0,0,0.80024,459.3247,-97.7845)" />
-    <g
-       id="g2774"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1616.726,235.1467)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2776"
-       transform="matrix(-0.80024,0,0,0.80024,2283.943,202.6604)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2778"
-       transform="matrix(-0.757324,0,0,0.76036,429.9341,-78.5998)" />
-    <g
-       id="g2780"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1525.264,237.7397)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2782"
-       transform="matrix(-0.757324,0,0,0.76036,2156.7,206.8724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2784"
-       transform="matrix(-0.80024,0,0,0.80024,402.7138,-106.191)" />
-    <g
-       id="g2786"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1560.115,226.7402)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2788"
-       transform="matrix(-0.80024,0,0,0.80024,2227.332,194.2539)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2790"
-       transform="matrix(-0.757324,0,0,0.76036,373.3232,-87.0063)" />
-    <g
-       id="g2792"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1468.653,229.3332)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2794"
-       transform="matrix(-0.757324,0,0,0.76036,2100.089,198.4659)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2796"
-       transform="matrix(-0.757324,0,0,0.76036,452.4684,-84.1762)" />
-    <g
-       id="g2798"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1547.798,232.1633)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2800"
-       transform="matrix(-0.757324,0,0,0.76036,2179.234,201.296)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2802"
-       transform="matrix(-0.80024,0,0,0.80024,432.2482,-98.7048)" />
-    <g
-       id="g2804"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1589.649,234.2264)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2806"
-       transform="matrix(-0.80024,0,0,0.80024,2256.866,201.7401)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2808"
-       transform="matrix(-0.757324,0,0,0.76036,402.8576,-79.5201)" />
-    <g
-       id="g2810"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1498.187,236.8194)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2812"
-       transform="matrix(-0.757324,0,0,0.76036,2129.623,205.9521)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2814"
-       transform="matrix(-0.80024,0,0,0.80024,443.3747,-102.1694)" />
-    <g
-       id="g2816"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1600.775,230.7617)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2818"
-       transform="matrix(-0.80024,0,0,0.80024,2267.992,198.2754)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2820"
-       transform="matrix(-0.757324,0,0,0.76036,413.9841,-82.9847)" />
-    <g
-       id="g2822"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1509.313,233.3547)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2824"
-       transform="matrix(-0.757324,0,0,0.76036,2140.749,202.4874)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2826"
-       transform="matrix(-0.80024,0,0,0.80024,521.093,-96.7675)" />
-    <g
-       id="g2828"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1678.494,236.1637)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2830"
-       transform="matrix(-0.80024,0,0,0.80024,2345.711,203.6774)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2832"
-       transform="matrix(-0.757324,0,0,0.76036,491.7024,-77.5828)" />
-    <g
-       id="g2834"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1587.032,238.7567)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2836"
-       transform="matrix(-0.757324,0,0,0.76036,2218.468,207.8894)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2838"
-       transform="matrix(-0.80024,0,0,0.80024,490.3247,-97.7845)" />
-    <g
-       id="g2840"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1647.726,235.1467)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2842"
-       transform="matrix(-0.80024,0,0,0.80024,2314.943,202.6604)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2844"
-       transform="matrix(-0.757324,0,0,0.76036,460.9341,-78.5998)" />
-    <g
-       id="g2846"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1556.264,237.7397)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2848"
-       transform="matrix(-0.757324,0,0,0.76036,2187.7,206.8724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2850"
-       transform="matrix(-0.80024,0,0,0.80024,433.7138,-106.191)" />
-    <g
-       id="g2852"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1591.115,226.7402)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2854"
-       transform="matrix(-0.80024,0,0,0.80024,2258.332,194.2539)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2856"
-       transform="matrix(-0.757324,0,0,0.76036,404.3232,-87.0063)" />
-    <g
-       id="g2858"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1499.653,229.3332)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2860"
-       transform="matrix(-0.757324,0,0,0.76036,2131.089,198.4659)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2862"
-       transform="matrix(-0.757324,0,0,0.76036,483.4684,-84.1762)" />
-    <g
-       id="g2864"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1578.798,232.1633)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2866"
-       transform="matrix(-0.757324,0,0,0.76036,2210.234,201.296)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2868"
-       transform="matrix(-0.80024,0,0,0.80024,463.2482,-98.7048)" />
-    <g
-       id="g2870"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1620.649,234.2264)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2872"
-       transform="matrix(-0.80024,0,0,0.80024,2287.866,201.7401)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2874"
-       transform="matrix(-0.757324,0,0,0.76036,433.8576,-79.5201)" />
-    <g
-       id="g2876"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1529.187,236.8194)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2878"
-       transform="matrix(-0.757324,0,0,0.76036,2160.623,205.9521)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2880"
-       transform="matrix(-0.80024,0,0,0.80024,474.3747,-102.1694)" />
-    <g
-       id="g2882"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1631.775,230.7617)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2884"
-       transform="matrix(-0.80024,0,0,0.80024,2298.992,198.2754)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2886"
-       transform="matrix(-0.757324,0,0,0.76036,444.9841,-82.9847)" />
-    <g
-       id="g2888"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1540.313,233.3547)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2890"
-       transform="matrix(-0.757324,0,0,0.76036,2171.749,202.4874)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2892"
-       transform="matrix(-0.80024,0,0,0.80024,552.093,-96.7675)" />
-    <g
-       id="g2894"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1709.494,236.1637)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2896"
-       transform="matrix(-0.80024,0,0,0.80024,2376.711,203.6774)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2898"
-       transform="matrix(-0.757324,0,0,0.76036,522.7024,-77.5828)" />
-    <g
-       id="g2900"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1618.032,238.7567)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2902"
-       transform="matrix(-0.757324,0,0,0.76036,2249.468,207.8894)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2904"
-       transform="matrix(-0.80024,0,0,0.80024,521.3247,-97.7845)" />
-    <g
-       id="g2906"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1678.726,235.1467)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2908"
-       transform="matrix(-0.80024,0,0,0.80024,2345.943,202.6604)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2910"
-       transform="matrix(-0.757324,0,0,0.76036,491.9341,-78.5998)" />
-    <g
-       id="g2912"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1587.264,237.7397)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2914"
-       transform="matrix(-0.757324,0,0,0.76036,2218.7,206.8724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2916"
-       transform="matrix(-0.80024,0,0,0.80024,464.7138,-106.191)" />
-    <g
-       id="g2918"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1622.115,226.7402)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2920"
-       transform="matrix(-0.80024,0,0,0.80024,2289.332,194.2539)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2922"
-       transform="matrix(-0.757324,0,0,0.76036,435.3232,-87.0063)" />
-    <g
-       id="g2924"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1530.653,229.3332)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2926"
-       transform="matrix(-0.757324,0,0,0.76036,2162.089,198.4659)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2928"
-       transform="matrix(-0.757324,0,0,0.76036,514.4684,-84.1762)" />
-    <g
-       id="g2930"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1609.798,232.1633)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2932"
-       transform="matrix(-0.757324,0,0,0.76036,2241.234,201.296)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2934"
-       transform="matrix(-0.80024,0,0,0.80024,494.2482,-98.7048)" />
-    <g
-       id="g2936"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1651.649,234.2264)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2938"
-       transform="matrix(-0.80024,0,0,0.80024,2318.866,201.7401)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2940"
-       transform="matrix(-0.757324,0,0,0.76036,464.8576,-79.5201)" />
-    <g
-       id="g2942"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1560.187,236.8194)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2944"
-       transform="matrix(-0.757324,0,0,0.76036,2191.623,205.9521)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2946"
-       transform="matrix(-0.80024,0,0,0.80024,505.3747,-102.1694)" />
-    <g
-       id="g2948"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1662.775,230.7617)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2950"
-       transform="matrix(-0.80024,0,0,0.80024,2329.992,198.2754)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2952"
-       transform="matrix(-0.757324,0,0,0.76036,475.9841,-82.9847)" />
-    <g
-       id="g2954"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1571.313,233.3547)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2956"
-       transform="matrix(-0.757324,0,0,0.76036,2202.749,202.4874)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2958"
-       transform="matrix(-0.80024,0,0,0.80024,583.093,-96.7675)" />
-    <g
-       id="g2960"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1740.494,236.1637)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2962"
-       transform="matrix(-0.80024,0,0,0.80024,2407.711,203.6774)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2964"
-       transform="matrix(-0.757324,0,0,0.76036,553.7024,-77.5828)" />
-    <g
-       id="g2966"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1649.032,238.7567)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2968"
-       transform="matrix(-0.757324,0,0,0.76036,2280.468,207.8894)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2970"
-       transform="matrix(-0.80024,0,0,0.80024,552.3247,-97.7845)" />
-    <g
-       id="g2972"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1709.726,235.1467)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2974"
-       transform="matrix(-0.80024,0,0,0.80024,2376.943,202.6604)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2976"
-       transform="matrix(-0.757324,0,0,0.76036,522.9341,-78.5998)" />
-    <g
-       id="g2978"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1618.264,237.7397)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2980"
-       transform="matrix(-0.757324,0,0,0.76036,2249.7,206.8724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2982"
-       transform="matrix(-0.80024,0,0,0.80024,495.7138,-106.191)" />
-    <g
-       id="g2984"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1653.115,226.7402)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2986"
-       transform="matrix(-0.80024,0,0,0.80024,2320.332,194.2539)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2988"
-       transform="matrix(-0.757324,0,0,0.76036,466.3232,-87.0063)" />
-    <g
-       id="g2990"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1561.653,229.3332)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2992"
-       transform="matrix(-0.757324,0,0,0.76036,2193.089,198.4659)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2994"
-       transform="matrix(-0.757324,0,0,0.76036,545.4684,-84.1762)" />
-    <g
-       id="g2996"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1640.798,232.1633)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g2998"
-       transform="matrix(-0.757324,0,0,0.76036,2272.234,201.296)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3000"
-       transform="matrix(-0.80024,0,0,0.80024,525.2482,-98.7048)" />
-    <g
-       id="g3002"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1682.649,234.2264)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3004"
-       transform="matrix(-0.80024,0,0,0.80024,2349.866,201.7401)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3006"
-       transform="matrix(-0.757324,0,0,0.76036,495.8576,-79.5201)" />
-    <g
-       id="g3008"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1591.187,236.8194)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3010"
-       transform="matrix(-0.757324,0,0,0.76036,2222.623,205.9521)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3012"
-       transform="matrix(-0.80024,0,0,0.80024,536.3747,-102.1694)" />
-    <g
-       id="g3014"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1693.775,230.7617)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3016"
-       transform="matrix(-0.80024,0,0,0.80024,2360.992,198.2754)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3018"
-       transform="matrix(-0.757324,0,0,0.76036,506.9841,-82.9847)" />
-    <g
-       id="g3020"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1602.313,233.3547)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3022"
-       transform="matrix(-0.757324,0,0,0.76036,2233.749,202.4874)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3024"
-       transform="matrix(-0.80024,0,0,0.80024,614.093,-96.7675)" />
-    <g
-       id="g3026"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1771.494,236.1637)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3028"
-       transform="matrix(-0.80024,0,0,0.80024,2438.711,203.6774)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3030"
-       transform="matrix(-0.757324,0,0,0.76036,584.7024,-77.5828)" />
-    <g
-       id="g3032"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1680.032,238.7567)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3034"
-       transform="matrix(-0.757324,0,0,0.76036,2311.468,207.8894)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3036"
-       transform="matrix(-0.80024,0,0,0.80024,583.3247,-97.7845)" />
-    <g
-       id="g3038"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1740.726,235.1467)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3040"
-       transform="matrix(-0.80024,0,0,0.80024,2407.943,202.6604)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3042"
-       transform="matrix(-0.757324,0,0,0.76036,553.9341,-78.5998)" />
-    <g
-       id="g3044"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1649.264,237.7397)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3046"
-       transform="matrix(-0.757324,0,0,0.76036,2280.7,206.8724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3048"
-       transform="matrix(-0.80024,0,0,0.80024,526.7138,-106.191)" />
-    <g
-       id="g3050"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1684.115,226.7402)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3052"
-       transform="matrix(-0.80024,0,0,0.80024,2351.332,194.2539)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3054"
-       transform="matrix(-0.757324,0,0,0.76036,497.3232,-87.0063)" />
-    <g
-       id="g3056"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1592.653,229.3332)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3058"
-       transform="matrix(-0.757324,0,0,0.76036,2224.089,198.4659)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3060"
-       transform="matrix(-0.757324,0,0,0.76036,576.4684,-84.1762)" />
-    <g
-       id="g3062"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1671.798,232.1633)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3064"
-       transform="matrix(-0.757324,0,0,0.76036,2303.234,201.296)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3066"
-       transform="matrix(-0.80024,0,0,0.80024,556.2482,-98.7048)" />
-    <g
-       id="g3068"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1713.649,234.2264)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3070"
-       transform="matrix(-0.80024,0,0,0.80024,2380.866,201.7401)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3072"
-       transform="matrix(-0.757324,0,0,0.76036,526.8576,-79.5201)" />
-    <g
-       id="g3074"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1622.187,236.8194)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3076"
-       transform="matrix(-0.757324,0,0,0.76036,2253.623,205.9521)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3078"
-       transform="matrix(-0.80024,0,0,0.80024,567.3747,-102.1694)" />
-    <g
-       id="g3080"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1724.775,230.7617)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3082"
-       transform="matrix(-0.80024,0,0,0.80024,2391.992,198.2754)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3084"
-       transform="matrix(-0.757324,0,0,0.76036,537.9841,-82.9847)" />
-    <g
-       id="g3086"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1633.313,233.3547)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3088"
-       transform="matrix(-0.757324,0,0,0.76036,2264.749,202.4874)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6160"
-       transform="matrix(-0.80024,0,0,0.80024,374.313,-23.00011)" />
-    <g
-       id="g6162"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1531.714,309.9311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6164"
-       transform="matrix(-0.80024,0,0,0.80024,2198.931,277.4448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6166"
-       transform="matrix(-0.757324,0,0,0.76036,344.9224,-3.8154)" />
-    <g
-       id="g6168"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1440.252,312.5241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6170"
-       transform="matrix(-0.757324,0,0,0.76036,2071.688,281.6568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6172"
-       transform="matrix(-0.80024,0,0,0.80024,343.5447,-24.01709)" />
-    <g
-       id="g6174"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1500.946,308.9141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6176"
-       transform="matrix(-0.80024,0,0,0.80024,2168.163,276.4278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6178"
-       transform="matrix(-0.757324,0,0,0.76036,314.1541,-4.83238)" />
-    <g
-       id="g6180"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1409.484,311.5071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6182"
-       transform="matrix(-0.757324,0,0,0.76036,2040.92,280.6398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6184"
-       transform="matrix(-0.80024,0,0,0.80024,286.9338,-32.42363)" />
-    <g
-       id="g6186"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1444.335,300.5076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6188"
-       transform="matrix(-0.80024,0,0,0.80024,2111.552,268.0213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6190"
-       transform="matrix(-0.757324,0,0,0.76036,257.5432,-13.23892)" />
-    <g
-       id="g6192"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1352.873,303.1006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6194"
-       transform="matrix(-0.757324,0,0,0.76036,1984.309,272.2333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6196"
-       transform="matrix(-0.757324,0,0,0.76036,336.6884,-10.40879)" />
-    <g
-       id="g6198"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1432.018,305.9307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6200"
-       transform="matrix(-0.757324,0,0,0.76036,2063.454,275.0634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6202"
-       transform="matrix(-0.80024,0,0,0.80024,316.4682,-24.93739)" />
-    <g
-       id="g6204"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1473.869,307.9938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6206"
-       transform="matrix(-0.80024,0,0,0.80024,2141.086,275.5075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6208"
-       transform="matrix(-0.757324,0,0,0.76036,287.0776,-5.75268)" />
-    <g
-       id="g6210"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1382.407,310.5868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6212"
-       transform="matrix(-0.757324,0,0,0.76036,2013.843,279.7195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6214"
-       transform="matrix(-0.80024,0,0,0.80024,327.5947,-28.40206)" />
-    <g
-       id="g6216"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1484.995,304.5291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6218"
-       transform="matrix(-0.80024,0,0,0.80024,2152.212,272.0428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6220"
-       transform="matrix(-0.757324,0,0,0.76036,298.2041,-9.21735)" />
-    <g
-       id="g6222"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1393.533,307.1221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6224"
-       transform="matrix(-0.757324,0,0,0.76036,2024.969,276.2548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6226"
-       transform="matrix(-0.80024,0,0,0.80024,405.313,-23.00011)" />
-    <g
-       id="g6228"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1562.714,309.9311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6230"
-       transform="matrix(-0.80024,0,0,0.80024,2229.931,277.4448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6232"
-       transform="matrix(-0.757324,0,0,0.76036,375.9224,-3.8154)" />
-    <g
-       id="g6234"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1471.252,312.5241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6236"
-       transform="matrix(-0.757324,0,0,0.76036,2102.688,281.6568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6238"
-       transform="matrix(-0.80024,0,0,0.80024,374.5447,-24.01709)" />
-    <g
-       id="g6240"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1531.946,308.9141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6242"
-       transform="matrix(-0.80024,0,0,0.80024,2199.163,276.4278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6244"
-       transform="matrix(-0.757324,0,0,0.76036,345.1541,-4.83238)" />
-    <g
-       id="g6246"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1440.484,311.5071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6248"
-       transform="matrix(-0.757324,0,0,0.76036,2071.92,280.6398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6250"
-       transform="matrix(-0.80024,0,0,0.80024,317.9338,-32.42363)" />
-    <g
-       id="g6252"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1475.335,300.5076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6254"
-       transform="matrix(-0.80024,0,0,0.80024,2142.552,268.0213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6256"
-       transform="matrix(-0.757324,0,0,0.76036,288.5432,-13.23892)" />
-    <g
-       id="g6258"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1383.873,303.1006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6260"
-       transform="matrix(-0.757324,0,0,0.76036,2015.309,272.2333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6262"
-       transform="matrix(-0.757324,0,0,0.76036,367.6884,-10.40879)" />
-    <g
-       id="g6264"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1463.018,305.9307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6266"
-       transform="matrix(-0.757324,0,0,0.76036,2094.454,275.0634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6268"
-       transform="matrix(-0.80024,0,0,0.80024,347.4682,-24.93739)" />
-    <g
-       id="g6270"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1504.869,307.9938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6272"
-       transform="matrix(-0.80024,0,0,0.80024,2172.086,275.5075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6274"
-       transform="matrix(-0.757324,0,0,0.76036,318.0776,-5.75268)" />
-    <g
-       id="g6276"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1413.407,310.5868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6278"
-       transform="matrix(-0.757324,0,0,0.76036,2044.843,279.7195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6280"
-       transform="matrix(-0.80024,0,0,0.80024,358.5947,-28.40206)" />
-    <g
-       id="g6282"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1515.995,304.5291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6284"
-       transform="matrix(-0.80024,0,0,0.80024,2183.212,272.0428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6286"
-       transform="matrix(-0.757324,0,0,0.76036,329.2041,-9.21735)" />
-    <g
-       id="g6288"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1424.533,307.1221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6290"
-       transform="matrix(-0.757324,0,0,0.76036,2055.969,276.2548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6292"
-       transform="matrix(-0.80024,0,0,0.80024,436.313,-23.00011)" />
-    <g
-       id="g6294"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1593.714,309.9311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6296"
-       transform="matrix(-0.80024,0,0,0.80024,2260.931,277.4448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6298"
-       transform="matrix(-0.757324,0,0,0.76036,406.9224,-3.8154)" />
-    <g
-       id="g6300"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1502.252,312.5241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6302"
-       transform="matrix(-0.757324,0,0,0.76036,2133.688,281.6568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6304"
-       transform="matrix(-0.80024,0,0,0.80024,405.5447,-24.01709)" />
-    <g
-       id="g6306"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1562.946,308.9141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6308"
-       transform="matrix(-0.80024,0,0,0.80024,2230.163,276.4278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6310"
-       transform="matrix(-0.757324,0,0,0.76036,376.1541,-4.83238)" />
-    <g
-       id="g6312"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1471.484,311.5071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6314"
-       transform="matrix(-0.757324,0,0,0.76036,2102.92,280.6398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6316"
-       transform="matrix(-0.80024,0,0,0.80024,348.9338,-32.42363)" />
-    <g
-       id="g6318"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1506.335,300.5076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6320"
-       transform="matrix(-0.80024,0,0,0.80024,2173.552,268.0213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6322"
-       transform="matrix(-0.757324,0,0,0.76036,319.5432,-13.23892)" />
-    <g
-       id="g6324"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1414.873,303.1006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6326"
-       transform="matrix(-0.757324,0,0,0.76036,2046.309,272.2333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6328"
-       transform="matrix(-0.757324,0,0,0.76036,398.6884,-10.40879)" />
-    <g
-       id="g6330"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1494.018,305.9307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6332"
-       transform="matrix(-0.757324,0,0,0.76036,2125.454,275.0634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6334"
-       transform="matrix(-0.80024,0,0,0.80024,378.4682,-24.93739)" />
-    <g
-       id="g6336"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1535.869,307.9938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6338"
-       transform="matrix(-0.80024,0,0,0.80024,2203.086,275.5075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6340"
-       transform="matrix(-0.757324,0,0,0.76036,349.0776,-5.75268)" />
-    <g
-       id="g6342"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1444.407,310.5868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6344"
-       transform="matrix(-0.757324,0,0,0.76036,2075.843,279.7195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6346"
-       transform="matrix(-0.80024,0,0,0.80024,389.5947,-28.40206)" />
-    <g
-       id="g6348"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1546.995,304.5291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6350"
-       transform="matrix(-0.80024,0,0,0.80024,2214.212,272.0428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6352"
-       transform="matrix(-0.757324,0,0,0.76036,360.2041,-9.21735)" />
-    <g
-       id="g6354"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1455.533,307.1221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6356"
-       transform="matrix(-0.757324,0,0,0.76036,2086.969,276.2548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6358"
-       transform="matrix(-0.80024,0,0,0.80024,467.313,-23.00011)" />
-    <g
-       id="g6360"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1624.714,309.9311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6362"
-       transform="matrix(-0.80024,0,0,0.80024,2291.931,277.4448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6364"
-       transform="matrix(-0.757324,0,0,0.76036,437.9224,-3.8154)" />
-    <g
-       id="g6366"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1533.252,312.5241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6368"
-       transform="matrix(-0.757324,0,0,0.76036,2164.688,281.6568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6370"
-       transform="matrix(-0.80024,0,0,0.80024,436.5447,-24.01709)" />
-    <g
-       id="g6372"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1593.946,308.9141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6374"
-       transform="matrix(-0.80024,0,0,0.80024,2261.163,276.4278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6376"
-       transform="matrix(-0.757324,0,0,0.76036,407.1541,-4.83238)" />
-    <g
-       id="g6378"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1502.484,311.5071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6380"
-       transform="matrix(-0.757324,0,0,0.76036,2133.92,280.6398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6382"
-       transform="matrix(-0.80024,0,0,0.80024,379.9338,-32.42363)" />
-    <g
-       id="g6384"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1537.335,300.5076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6386"
-       transform="matrix(-0.80024,0,0,0.80024,2204.552,268.0213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6388"
-       transform="matrix(-0.757324,0,0,0.76036,350.5432,-13.23892)" />
-    <g
-       id="g6390"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1445.873,303.1006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6392"
-       transform="matrix(-0.757324,0,0,0.76036,2077.309,272.2333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6394"
-       transform="matrix(-0.757324,0,0,0.76036,429.6884,-10.40879)" />
-    <g
-       id="g6396"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1525.018,305.9307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6398"
-       transform="matrix(-0.757324,0,0,0.76036,2156.454,275.0634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6400"
-       transform="matrix(-0.80024,0,0,0.80024,409.4682,-24.93739)" />
-    <g
-       id="g6402"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1566.869,307.9938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6404"
-       transform="matrix(-0.80024,0,0,0.80024,2234.086,275.5075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6406"
-       transform="matrix(-0.757324,0,0,0.76036,380.0776,-5.75268)" />
-    <g
-       id="g6408"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1475.407,310.5868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6410"
-       transform="matrix(-0.757324,0,0,0.76036,2106.843,279.7195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6412"
-       transform="matrix(-0.80024,0,0,0.80024,420.5947,-28.40206)" />
-    <g
-       id="g6414"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1577.995,304.5291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6416"
-       transform="matrix(-0.80024,0,0,0.80024,2245.212,272.0428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6418"
-       transform="matrix(-0.757324,0,0,0.76036,391.2041,-9.21735)" />
-    <g
-       id="g6420"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1486.533,307.1221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6422"
-       transform="matrix(-0.757324,0,0,0.76036,2117.969,276.2548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6424"
-       transform="matrix(-0.80024,0,0,0.80024,498.313,-23.00011)" />
-    <g
-       id="g6426"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1655.714,309.9311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6428"
-       transform="matrix(-0.80024,0,0,0.80024,2322.931,277.4448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6430"
-       transform="matrix(-0.757324,0,0,0.76036,468.9224,-3.8154)" />
-    <g
-       id="g6432"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1564.252,312.5241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6434"
-       transform="matrix(-0.757324,0,0,0.76036,2195.688,281.6568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6436"
-       transform="matrix(-0.80024,0,0,0.80024,467.5447,-24.01709)" />
-    <g
-       id="g6438"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1624.946,308.9141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6440"
-       transform="matrix(-0.80024,0,0,0.80024,2292.163,276.4278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6442"
-       transform="matrix(-0.757324,0,0,0.76036,438.1541,-4.83238)" />
-    <g
-       id="g6444"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1533.484,311.5071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6446"
-       transform="matrix(-0.757324,0,0,0.76036,2164.92,280.6398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6448"
-       transform="matrix(-0.80024,0,0,0.80024,410.9338,-32.42363)" />
-    <g
-       id="g6450"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1568.335,300.5076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6452"
-       transform="matrix(-0.80024,0,0,0.80024,2235.552,268.0213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6454"
-       transform="matrix(-0.757324,0,0,0.76036,381.5432,-13.23892)" />
-    <g
-       id="g6456"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1476.873,303.1006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6458"
-       transform="matrix(-0.757324,0,0,0.76036,2108.309,272.2333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6460"
-       transform="matrix(-0.757324,0,0,0.76036,460.6884,-10.40879)" />
-    <g
-       id="g6462"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1556.018,305.9307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6464"
-       transform="matrix(-0.757324,0,0,0.76036,2187.454,275.0634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6466"
-       transform="matrix(-0.80024,0,0,0.80024,440.4682,-24.93739)" />
-    <g
-       id="g6468"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1597.869,307.9938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6470"
-       transform="matrix(-0.80024,0,0,0.80024,2265.086,275.5075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6472"
-       transform="matrix(-0.757324,0,0,0.76036,411.0776,-5.75268)" />
-    <g
-       id="g6474"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1506.407,310.5868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6476"
-       transform="matrix(-0.757324,0,0,0.76036,2137.843,279.7195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6478"
-       transform="matrix(-0.80024,0,0,0.80024,451.5947,-28.40206)" />
-    <g
-       id="g6480"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1608.995,304.5291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6482"
-       transform="matrix(-0.80024,0,0,0.80024,2276.212,272.0428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6484"
-       transform="matrix(-0.757324,0,0,0.76036,422.2041,-9.21735)" />
-    <g
-       id="g6486"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1517.533,307.1221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6488"
-       transform="matrix(-0.757324,0,0,0.76036,2148.969,276.2548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6490"
-       transform="matrix(-0.80024,0,0,0.80024,529.313,-23.00011)" />
-    <g
-       id="g6492"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1686.714,309.9311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6494"
-       transform="matrix(-0.80024,0,0,0.80024,2353.931,277.4448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6496"
-       transform="matrix(-0.757324,0,0,0.76036,499.9224,-3.8154)" />
-    <g
-       id="g6498"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1595.252,312.5241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6500"
-       transform="matrix(-0.757324,0,0,0.76036,2226.688,281.6568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6502"
-       transform="matrix(-0.80024,0,0,0.80024,498.5447,-24.01709)" />
-    <g
-       id="g6504"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1655.946,308.9141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6506"
-       transform="matrix(-0.80024,0,0,0.80024,2323.163,276.4278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6508"
-       transform="matrix(-0.757324,0,0,0.76036,469.1541,-4.83238)" />
-    <g
-       id="g6510"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1564.484,311.5071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6512"
-       transform="matrix(-0.757324,0,0,0.76036,2195.92,280.6398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6514"
-       transform="matrix(-0.80024,0,0,0.80024,441.9338,-32.42363)" />
-    <g
-       id="g6516"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1599.335,300.5076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6518"
-       transform="matrix(-0.80024,0,0,0.80024,2266.552,268.0213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6520"
-       transform="matrix(-0.757324,0,0,0.76036,412.5432,-13.23892)" />
-    <g
-       id="g6522"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1507.873,303.1006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6524"
-       transform="matrix(-0.757324,0,0,0.76036,2139.309,272.2333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6526"
-       transform="matrix(-0.757324,0,0,0.76036,491.6884,-10.40879)" />
-    <g
-       id="g6528"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1587.018,305.9307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6530"
-       transform="matrix(-0.757324,0,0,0.76036,2218.454,275.0634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6532"
-       transform="matrix(-0.80024,0,0,0.80024,471.4682,-24.93739)" />
-    <g
-       id="g6534"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1628.869,307.9938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6536"
-       transform="matrix(-0.80024,0,0,0.80024,2296.086,275.5075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6538"
-       transform="matrix(-0.757324,0,0,0.76036,442.0776,-5.75268)" />
-    <g
-       id="g6540"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1537.407,310.5868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6542"
-       transform="matrix(-0.757324,0,0,0.76036,2168.843,279.7195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6544"
-       transform="matrix(-0.80024,0,0,0.80024,482.5947,-28.40206)" />
-    <g
-       id="g6546"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1639.995,304.5291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6548"
-       transform="matrix(-0.80024,0,0,0.80024,2307.212,272.0428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6550"
-       transform="matrix(-0.757324,0,0,0.76036,453.2041,-9.21735)" />
-    <g
-       id="g6552"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1548.533,307.1221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6554"
-       transform="matrix(-0.757324,0,0,0.76036,2179.969,276.2548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6556"
-       transform="matrix(-0.80024,0,0,0.80024,560.313,-23.00011)" />
-    <g
-       id="g6558"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1717.714,309.9311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6560"
-       transform="matrix(-0.80024,0,0,0.80024,2384.931,277.4448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6562"
-       transform="matrix(-0.757324,0,0,0.76036,530.9224,-3.8154)" />
-    <g
-       id="g6564"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1626.252,312.5241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6566"
-       transform="matrix(-0.757324,0,0,0.76036,2257.688,281.6568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6568"
-       transform="matrix(-0.80024,0,0,0.80024,529.5447,-24.01709)" />
-    <g
-       id="g6570"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1686.946,308.9141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6572"
-       transform="matrix(-0.80024,0,0,0.80024,2354.163,276.4278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6574"
-       transform="matrix(-0.757324,0,0,0.76036,500.1541,-4.83238)" />
-    <g
-       id="g6576"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1595.484,311.5071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6578"
-       transform="matrix(-0.757324,0,0,0.76036,2226.92,280.6398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6580"
-       transform="matrix(-0.80024,0,0,0.80024,472.9338,-32.42363)" />
-    <g
-       id="g6582"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1630.335,300.5076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6584"
-       transform="matrix(-0.80024,0,0,0.80024,2297.552,268.0213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6586"
-       transform="matrix(-0.757324,0,0,0.76036,443.5432,-13.23892)" />
-    <g
-       id="g6588"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1538.873,303.1006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6590"
-       transform="matrix(-0.757324,0,0,0.76036,2170.309,272.2333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6592"
-       transform="matrix(-0.757324,0,0,0.76036,522.6884,-10.40879)" />
-    <g
-       id="g6594"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1618.018,305.9307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6596"
-       transform="matrix(-0.757324,0,0,0.76036,2249.454,275.0634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6598"
-       transform="matrix(-0.80024,0,0,0.80024,502.4682,-24.93739)" />
-    <g
-       id="g6600"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1659.869,307.9938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6602"
-       transform="matrix(-0.80024,0,0,0.80024,2327.086,275.5075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6604"
-       transform="matrix(-0.757324,0,0,0.76036,473.0776,-5.75268)" />
-    <g
-       id="g6606"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1568.407,310.5868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6608"
-       transform="matrix(-0.757324,0,0,0.76036,2199.843,279.7195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6610"
-       transform="matrix(-0.80024,0,0,0.80024,513.5947,-28.40206)" />
-    <g
-       id="g6612"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1670.995,304.5291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6614"
-       transform="matrix(-0.80024,0,0,0.80024,2338.212,272.0428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6616"
-       transform="matrix(-0.757324,0,0,0.76036,484.2041,-9.21735)" />
-    <g
-       id="g6618"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1579.533,307.1221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6620"
-       transform="matrix(-0.757324,0,0,0.76036,2210.969,276.2548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6622"
-       transform="matrix(-0.80024,0,0,0.80024,591.313,-23.00011)" />
-    <g
-       id="g6624"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1748.714,309.9311)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6626"
-       transform="matrix(-0.80024,0,0,0.80024,2415.931,277.4448)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6628"
-       transform="matrix(-0.757324,0,0,0.76036,561.9224,-3.8154)" />
-    <g
-       id="g6630"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1657.252,312.5241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6632"
-       transform="matrix(-0.757324,0,0,0.76036,2288.688,281.6568)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6634"
-       transform="matrix(-0.80024,0,0,0.80024,560.5447,-24.01709)" />
-    <g
-       id="g6636"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1717.946,308.9141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6638"
-       transform="matrix(-0.80024,0,0,0.80024,2385.163,276.4278)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6640"
-       transform="matrix(-0.757324,0,0,0.76036,531.1541,-4.83238)" />
-    <g
-       id="g6642"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1626.484,311.5071)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6644"
-       transform="matrix(-0.757324,0,0,0.76036,2257.92,280.6398)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6646"
-       transform="matrix(-0.80024,0,0,0.80024,503.9338,-32.42363)" />
-    <g
-       id="g6648"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1661.335,300.5076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6650"
-       transform="matrix(-0.80024,0,0,0.80024,2328.552,268.0213)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6652"
-       transform="matrix(-0.757324,0,0,0.76036,474.5432,-13.23892)" />
-    <g
-       id="g6654"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1569.873,303.1006)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6656"
-       transform="matrix(-0.757324,0,0,0.76036,2201.309,272.2333)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6658"
-       transform="matrix(-0.757324,0,0,0.76036,553.6884,-10.40879)" />
-    <g
-       id="g6660"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1649.018,305.9307)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6662"
-       transform="matrix(-0.757324,0,0,0.76036,2280.454,275.0634)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6664"
-       transform="matrix(-0.80024,0,0,0.80024,533.4682,-24.93739)" />
-    <g
-       id="g6666"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1690.869,307.9938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6668"
-       transform="matrix(-0.80024,0,0,0.80024,2358.086,275.5075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6670"
-       transform="matrix(-0.757324,0,0,0.76036,504.0776,-5.75268)" />
-    <g
-       id="g6672"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1599.407,310.5868)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6674"
-       transform="matrix(-0.757324,0,0,0.76036,2230.843,279.7195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6676"
-       transform="matrix(-0.80024,0,0,0.80024,544.5947,-28.40206)" />
-    <g
-       id="g6678"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.80024,0,0,0.80024,1701.995,304.5291)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6680"
-       transform="matrix(-0.80024,0,0,0.80024,2369.212,272.0428)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6682"
-       transform="matrix(-0.757324,0,0,0.76036,515.2041,-9.21735)" />
-    <g
-       id="g6684"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.757324,0,0,0.76036,1610.533,307.1221)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g6686"
-       transform="matrix(-0.757324,0,0,0.76036,2241.969,276.2548)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g29199"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,390.7873,56.03283)" />
-    <g
-       id="g29315"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1448.207,632.4718)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g29317"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2106.545,745.723)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3589"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,357.9306,68.37378)" />
-    <g
-       id="g3591"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1358.367,615.1315)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g3593"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1981.426,722.1892)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47420"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,337.3551,35.52764)" />
-    <g
-       id="g47422"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1394.775,611.9666)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47424"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2053.112,725.2179)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47426"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,304.4984,47.8686)" />
-    <g
-       id="g47428"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1304.935,594.6264)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47430"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1927.994,701.6841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47432"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,381.1382,67.82645)" />
-    <g
-       id="g47434"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1381.574,614.5841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47436"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2004.633,721.6418)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47438"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,364.5575,49.25179)" />
-    <g
-       id="g47440"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1421.977,625.6906)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47442"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2080.314,738.9419)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47444"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,331.7008,61.59275)" />
-    <g
-       id="g47446"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1332.137,608.3504)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47448"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1955.196,715.4081)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47450"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,647.9706,21.95808)" />
-    <g
-       id="g47452"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2554.904,1061.498)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47454"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3742.138,1265.733)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47456"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,588.7175,44.21357)" />
-    <g
-       id="g47458"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2392.887,1030.227)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47460"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3516.501,1223.293)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21531"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,594.2075,8.11261)" />
-    <g
-       id="g21533"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2501.141,1047.652)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21535"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3688.375,1251.888)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21537"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,534.9544,30.368)" />
-    <g
-       id="g21539"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2339.124,1016.381)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21541"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3462.739,1209.447)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21543"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,497.8488,-28.86608)" />
-    <g
-       id="g21545"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2404.783,1010.674)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21547"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3592.016,1214.909)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21549"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,438.5957,-6.61068)" />
-    <g
-       id="g21551"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2242.766,979.4026)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21553"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3366.379,1172.468)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21555"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,576.8065,29.38105)" />
-    <g
-       id="g21557"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2380.976,1015.394)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21559"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3504.59,1208.46)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21561"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,546.9052,-4.11624)" />
-    <g
-       id="g21563"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2453.838,1035.423)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21565"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3641.072,1239.659)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21567"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,487.652,18.13925)" />
-    <g
-       id="g21569"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2291.821,1004.152)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21571"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3415.435,1197.218)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21573"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,567.8487,-5.85565)" />
-    <g
-       id="g21575"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2474.781,1033.684)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21577"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3662.015,1237.919)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21579"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,508.5956,16.39986)" />
-    <g
-       id="g21581"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2312.764,1002.413)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g21583"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3436.378,1195.479)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47489"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,702.54,34.10412)" />
-    <g
-       id="g47491"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2609.473,1073.644)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47493"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3796.707,1277.879)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47495"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,643.2869,56.35961)" />
-    <g
-       id="g47497"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2447.457,1042.373)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47499"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3571.07,1235.439)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47501"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,648.7769,20.25866)" />
-    <g
-       id="g47503"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2555.711,1059.798)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47505"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3742.944,1264.034)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47507"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,589.5238,42.51405)" />
-    <g
-       id="g47509"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2393.694,1028.527)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47511"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3517.307,1221.593)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47513"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,552.4182,-16.72003)" />
-    <g
-       id="g47515"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2459.352,1022.82)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47517"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3646.586,1227.055)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47519"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,493.1652,5.53538)" />
-    <g
-       id="g47521"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2297.335,991.5487)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47523"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3420.949,1184.615)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47525"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,631.3759,41.5271)" />
-    <g
-       id="g47527"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2435.546,1027.54)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47529"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3559.16,1220.606)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47531"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,601.4747,8.02982)" />
-    <g
-       id="g47533"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2508.408,1047.57)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47535"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3695.641,1251.805)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47537"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,542.2215,30.28531)" />
-    <g
-       id="g47539"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2346.391,1016.298)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47541"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3470.004,1209.364)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47543"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,622.4182,6.29042)" />
-    <g
-       id="g47545"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2529.35,1045.83)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47547"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3716.584,1250.065)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47549"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,563.165,28.54591)" />
-    <g
-       id="g47551"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2367.333,1014.558)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47553"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3490.948,1207.625)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47555"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,757.1095,46.25019)" />
-    <g
-       id="g47557"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2664.043,1085.79)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47559"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3851.276,1290.025)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47561"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,697.8564,68.50568)" />
-    <g
-       id="g47563"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2502.026,1054.519)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47565"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3625.64,1247.585)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47567"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,703.3464,32.40472)" />
-    <g
-       id="g47569"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2610.281,1071.944)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47571"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3797.514,1276.18)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47573"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,644.0933,54.66011)" />
-    <g
-       id="g47575"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2448.263,1040.673)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47577"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3571.877,1233.739)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47579"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,606.9877,-4.57396)" />
-    <g
-       id="g47581"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2513.922,1034.966)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47583"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3701.155,1239.201)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47585"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,547.7346,17.68143)" />
-    <g
-       id="g47587"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2351.905,1003.695)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47589"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3475.518,1196.761)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47591"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,685.9453,53.67314)" />
-    <g
-       id="g47593"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2490.115,1039.686)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47595"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3613.729,1232.752)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47597"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,656.0441,20.17587)" />
-    <g
-       id="g47599"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2562.977,1059.716)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47601"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3750.211,1263.951)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47603"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,596.7909,42.43136)" />
-    <g
-       id="g47605"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2400.96,1028.444)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47607"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3524.574,1221.51)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47609"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,676.9876,18.43646)" />
-    <g
-       id="g47611"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2583.92,1057.976)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47613"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3771.153,1262.211)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47615"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,617.7344,40.69195)" />
-    <g
-       id="g47617"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2421.903,1026.705)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47619"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3545.517,1219.771)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47621"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,811.6789,58.39623)" />
-    <g
-       id="g47623"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2718.612,1097.936)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47625"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3905.846,1302.171)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47627"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,752.4258,80.65172)" />
-    <g
-       id="g47629"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2556.595,1066.665)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47631"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3680.21,1259.731)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47633"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,757.9158,44.55077)" />
-    <g
-       id="g47635"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2664.85,1084.091)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47637"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3852.084,1288.326)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47639"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,698.6627,66.80616)" />
-    <g
-       id="g47641"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2502.833,1052.82)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47643"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3626.447,1245.885)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47645"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,661.5571,7.57208)" />
-    <g
-       id="g47647"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2568.491,1047.112)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47649"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3755.725,1251.347)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47651"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,602.3041,29.82749)" />
-    <g
-       id="g47653"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2406.474,1015.841)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47655"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3530.088,1208.907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47657"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,740.5148,65.81921)" />
-    <g
-       id="g47659"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2544.684,1051.832)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47661"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3668.299,1244.898)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47663"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,710.6135,32.32191)" />
-    <g
-       id="g47665"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2617.547,1071.862)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47667"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3804.781,1276.097)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47669"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,651.3604,54.57742)" />
-    <g
-       id="g47671"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2455.53,1040.591)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47673"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3579.144,1233.656)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47675"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,731.5571,30.58253)" />
-    <g
-       id="g47677"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2638.489,1070.122)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47679"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3825.723,1274.357)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47681"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,672.3039,52.83802)" />
-    <g
-       id="g47683"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2476.472,1038.851)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47685"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3600.086,1231.917)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47687"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,866.2483,70.54228)" />
-    <g
-       id="g47689"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2773.182,1110.082)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47691"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3960.415,1314.317)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47693"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,806.9953,92.79779)" />
-    <g
-       id="g47695"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2611.165,1078.811)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47697"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3734.778,1271.877)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47699"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,812.4853,56.69683)" />
-    <g
-       id="g47701"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2719.42,1096.237)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47703"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3906.653,1300.472)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47705"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,753.2322,78.95223)" />
-    <g
-       id="g47707"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2557.403,1064.966)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47709"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3681.016,1258.031)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47711"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,716.1266,19.71815)" />
-    <g
-       id="g47713"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2623.06,1059.258)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47715"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3810.294,1263.493)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47717"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,656.8735,41.97354)" />
-    <g
-       id="g47719"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2461.043,1027.987)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47721"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3584.658,1221.053)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47723"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,795.0842,77.96525)" />
-    <g
-       id="g47725"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2599.254,1063.978)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47727"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3722.867,1257.044)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47729"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,765.183,44.46798)" />
-    <g
-       id="g47731"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2672.116,1084.008)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47733"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3859.349,1288.243)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47735"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,705.9298,66.72347)" />
-    <g
-       id="g47737"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2510.099,1052.736)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47739"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3633.713,1245.802)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47741"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,786.1265,42.72857)" />
-    <g
-       id="g47743"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2693.059,1082.268)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47745"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3880.292,1286.503)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47747"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,726.8733,64.98406)" />
-    <g
-       id="g47749"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2531.042,1050.997)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47751"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3654.655,1244.063)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47753"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,920.8178,82.68834)" />
-    <g
-       id="g47755"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2827.751,1122.228)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47757"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,4014.985,1326.463)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47759"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,861.5647,104.9438)" />
-    <g
-       id="g47761"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2665.734,1090.957)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47763"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3789.348,1284.023)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47765"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,867.0547,68.84288)" />
-    <g
-       id="g47767"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2773.988,1108.383)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47769"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3961.223,1312.618)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47771"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,807.8016,91.09827)" />
-    <g
-       id="g47773"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2611.971,1077.111)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47775"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3735.586,1270.177)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47777"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,770.696,31.86419)" />
-    <g
-       id="g47779"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2677.63,1071.404)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47781"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3864.863,1275.639)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47783"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,711.4429,54.11958)" />
-    <g
-       id="g47785"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2515.613,1040.133)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47787"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3639.227,1233.199)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47789"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,849.6537,90.11132)" />
-    <g
-       id="g47791"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2653.823,1076.124)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47793"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3777.437,1269.19)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47795"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,819.7524,56.61402)" />
-    <g
-       id="g47797"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2726.685,1096.154)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47799"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3913.919,1300.389)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47801"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,760.4992,78.86951)" />
-    <g
-       id="g47803"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2564.668,1064.882)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47805"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3688.283,1257.949)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47807"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,840.6959,54.87462)" />
-    <g
-       id="g47809"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2747.629,1094.414)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47811"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3934.862,1298.649)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47813"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,781.4428,77.13013)" />
-    <g
-       id="g47815"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2585.612,1063.143)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47817"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3709.225,1256.209)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47819"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,975.3872,94.83439)" />
-    <g
-       id="g47821"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2882.321,1134.374)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47823"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,4069.554,1338.609)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47825"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,916.1342,117.0899)" />
-    <g
-       id="g47827"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2720.304,1103.103)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47829"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3843.917,1296.169)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47831"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,921.6241,80.98892)" />
-    <g
-       id="g47833"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2828.558,1120.529)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47835"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,4015.791,1324.764)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47837"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,862.3711,103.2443)" />
-    <g
-       id="g47839"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2666.541,1089.258)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47841"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3790.155,1282.324)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47843"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,825.2655,44.01026)" />
-    <g
-       id="g47845"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2732.199,1083.55)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47847"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3919.433,1287.785)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47849"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,766.0124,66.26565)" />
-    <g
-       id="g47851"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2570.182,1052.279)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47853"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3693.796,1245.345)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47855"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,904.2231,102.2574)" />
-    <g
-       id="g47857"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2708.393,1088.271)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47859"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3832.007,1281.336)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47861"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,874.3219,68.76009)" />
-    <g
-       id="g47863"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2781.255,1108.3)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47865"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3968.488,1312.535)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47867"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,815.0687,91.01558)" />
-    <g
-       id="g47869"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2619.238,1077.029)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47871"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3742.851,1270.094)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47873"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,895.2654,67.02068)" />
-    <g
-       id="g47875"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2802.197,1106.56)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47877"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3989.432,1310.795)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47879"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,836.0122,89.27617)" />
-    <g
-       id="g47881"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2640.181,1075.289)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47883"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3763.795,1268.355)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47885"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,1029.957,106.9805)" />
-    <g
-       id="g47887"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2936.891,1146.52)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47889"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,4124.124,1350.755)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47891"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,970.7036,129.2359)" />
-    <g
-       id="g47893"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2774.874,1115.249)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47895"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3898.487,1308.315)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47897"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,976.1936,93.13499)" />
-    <g
-       id="g47899"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2883.128,1132.675)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47901"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,4070.361,1336.91)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47903"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,916.9405,115.3904)" />
-    <g
-       id="g47905"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2721.11,1101.404)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47907"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3844.724,1294.469)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47909"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,879.8349,56.1563)" />
-    <g
-       id="g47911"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2786.769,1095.696)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47913"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,3974.002,1299.931)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47915"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,820.5818,78.41169)" />
-    <g
-       id="g47917"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2624.752,1064.425)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47919"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3748.365,1257.491)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47921"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,958.7925,114.4034)" />
-    <g
-       id="g47923"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2762.963,1100.417)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47925"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3886.576,1293.483)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47927"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,928.8913,80.90613)" />
-    <g
-       id="g47929"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2835.824,1120.446)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47931"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,4023.058,1324.681)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47933"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,869.6381,103.1616)" />
-    <g
-       id="g47935"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2673.807,1089.175)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47937"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3797.421,1282.241)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47939"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,949.8348,79.16673)" />
-    <g
-       id="g47941"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,2856.767,1118.706)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47943"
-       transform="matrix(-1.408666,-0.31354,-0.31354,1.408666,4044,1322.941)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47945"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,890.5817,101.4222)" />
-    <g
-       id="g47947"
-       inkscape:label="Layer 1"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,2694.75,1087.435)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47949"
-       transform="matrix(-1.33312,-0.296726,-0.297915,1.338466,3818.364,1280.501)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28145"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,452.5654,70.50502)" />
-    <g
-       id="g28147"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1509.986,646.944)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28149"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2168.323,760.1953)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28151"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,419.7088,82.846)" />
-    <g
-       id="g28153"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1420.145,629.6038)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28155"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2043.204,736.6615)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g47996"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,422.753,62.82752)" />
-    <g
-       id="g47998"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1480.174,639.2666)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g48000"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2138.511,752.5178)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g48002"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,389.8963,75.16848)" />
-    <g
-       id="g48004"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1390.333,621.9263)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g48006"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2013.392,728.984)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28163"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,369.3208,42.32234)" />
-    <g
-       id="g28165"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1426.741,618.7614)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28167"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2085.079,732.0127)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28169"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,336.4641,54.66329)" />
-    <g
-       id="g28171"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1336.901,601.4212)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28173"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1959.96,708.4789)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28175"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,413.1039,74.62114)" />
-    <g
-       id="g28177"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1413.54,621.3789)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28179"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2036.6,728.4366)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28181"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,396.5232,56.04648)" />
-    <g
-       id="g28183"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1453.944,632.4854)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28185"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2112.281,745.7367)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28187"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,363.6665,68.38744)" />
-    <g
-       id="g28189"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1364.103,615.1452)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28191"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1987.162,722.2029)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g48023"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,408.1367,55.08195)" />
-    <g
-       id="g48025"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1465.557,631.5208)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g48027"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2123.894,744.772)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g48029"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,375.2801,67.42293)" />
-    <g
-       id="g48031"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1375.716,614.1805)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g48033"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1998.775,721.2382)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28250"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,482.8249,77.24018)" />
-    <g
-       id="g28252"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1540.245,653.6792)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28254"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2198.583,766.9305)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28256"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,449.9683,89.58115)" />
-    <g
-       id="g28258"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1450.405,636.3389)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28260"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2073.464,743.3966)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28262"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,453.0125,69.56268)" />
-    <g
-       id="g28264"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1510.433,646.0017)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28266"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2168.771,759.253)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28268"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,420.1558,81.90363)" />
-    <g
-       id="g28270"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1420.593,628.6615)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28272"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2043.652,735.7192)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28274"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,399.5803,49.05749)" />
-    <g
-       id="g28276"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1457.001,625.4966)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28278"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2115.338,738.7478)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28280"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,366.7236,61.39844)" />
-    <g
-       id="g28282"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1367.16,608.1563)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28284"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1990.22,715.214)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28286"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,443.3634,81.35629)" />
-    <g
-       id="g28288"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1443.8,628.1141)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28290"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2066.859,735.1718)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28292"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,426.7827,62.78164)" />
-    <g
-       id="g28294"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1484.203,639.2206)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28296"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2142.54,752.4719)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28298"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,393.926,75.12259)" />
-    <g
-       id="g28300"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1394.362,621.8803)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28302"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2017.422,728.938)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28304"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,438.3962,61.8171)" />
-    <g
-       id="g28306"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1495.816,638.2559)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28308"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2154.153,751.5072)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28310"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,405.5396,74.15808)" />
-    <g
-       id="g28312"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1405.975,620.9157)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28314"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2029.035,727.9734)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28316"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,513.0844,83.97533)" />
-    <g
-       id="g28318"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1570.505,660.4143)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28320"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2228.842,773.6656)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28322"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,480.2278,96.31631)" />
-    <g
-       id="g28324"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1480.664,643.0741)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28326"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2103.723,750.1318)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28328"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,483.272,76.29783)" />
-    <g
-       id="g28330"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1540.693,652.7369)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28332"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2199.03,765.9882)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28334"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,450.4153,88.63878)" />
-    <g
-       id="g28336"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1450.852,635.3966)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28338"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2073.911,742.4543)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28340"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,429.8398,55.79264)" />
-    <g
-       id="g28342"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1487.26,632.2317)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28344"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2145.598,745.483)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28346"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,396.9831,68.1336)" />
-    <g
-       id="g28348"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1397.42,614.8915)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28350"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2020.479,721.9492)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28352"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,473.6229,88.09145)" />
-    <g
-       id="g28354"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1474.059,634.8492)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28356"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2097.119,741.907)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28358"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,457.0422,69.51679)" />
-    <g
-       id="g28360"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1514.463,645.9557)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28362"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2172.8,759.207)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28364"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,424.1855,81.85775)" />
-    <g
-       id="g28366"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1424.622,628.6155)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28368"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2047.681,735.6732)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28370"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,468.6557,68.55226)" />
-    <g
-       id="g28372"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1526.076,644.9911)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28374"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2184.413,758.2423)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28376"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,435.7991,80.89323)" />
-    <g
-       id="g28378"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1436.235,627.6508)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28380"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2059.294,734.7085)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28382"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,543.3439,90.71048)" />
-    <g
-       id="g28384"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1600.764,667.1495)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28386"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2259.102,780.4008)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28388"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,510.4873,103.0515)" />
-    <g
-       id="g28390"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1510.924,649.8092)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28392"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2133.983,756.867)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28394"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,513.5315,83.03298)" />
-    <g
-       id="g28396"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1570.952,659.472)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28398"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2229.29,772.7233)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28400"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,480.6748,95.37394)" />
-    <g
-       id="g28402"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1481.112,642.1318)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28404"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2104.171,749.1895)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28406"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,460.0993,62.52779)" />
-    <g
-       id="g28408"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1517.52,638.9669)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28410"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2175.857,752.2181)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28412"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,427.2426,74.86875)" />
-    <g
-       id="g28414"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1427.679,621.6266)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28416"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2050.739,728.6843)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28418"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,503.8824,94.8266)" />
-    <g
-       id="g28420"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1504.319,641.5844)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28422"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2127.378,748.6421)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28424"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,487.3017,76.25194)" />
-    <g
-       id="g28426"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1544.722,652.6909)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28428"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2203.059,765.9422)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28430"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,454.445,88.5929)" />
-    <g
-       id="g28432"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1454.881,635.3506)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28434"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2077.941,742.4084)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28436"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,498.9152,75.28741)" />
-    <g
-       id="g28438"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1556.335,651.7262)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28440"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2214.672,764.9775)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28442"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,466.0586,87.62839)" />
-    <g
-       id="g28444"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1466.494,634.386)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28446"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2089.554,741.4437)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28448"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,573.6034,97.44564)" />
-    <g
-       id="g28450"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1631.024,673.8846)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28452"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2289.361,787.1359)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28454"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,540.7468,109.7866)" />
-    <g
-       id="g28456"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1541.183,656.5444)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28458"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2164.242,763.6021)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28460"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,543.791,89.76814)" />
-    <g
-       id="g28462"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1601.212,666.2072)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28464"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2259.549,779.4585)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28466"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,510.9343,102.1091)" />
-    <g
-       id="g28468"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1511.371,648.8669)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28470"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2134.43,755.9247)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28472"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,490.3588,69.26295)" />
-    <g
-       id="g28474"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1547.779,645.702)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28476"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2206.117,758.9533)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28478"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,457.5021,81.6039)" />
-    <g
-       id="g28480"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1457.939,628.3618)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28482"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2080.998,735.4195)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28484"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,534.1419,101.5617)" />
-    <g
-       id="g28486"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1534.578,648.3196)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28488"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2157.638,755.3773)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28490"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,517.5612,82.9871)" />
-    <g
-       id="g28492"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1574.982,659.426)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28494"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2233.319,772.6773)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28496"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,484.7045,95.32805)" />
-    <g
-       id="g28498"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1485.141,642.0858)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28500"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2108.2,749.1435)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28502"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,529.1747,82.02256)" />
-    <g
-       id="g28504"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1586.595,658.4614)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28506"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2244.932,771.7126)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28508"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,496.3181,94.36354)" />
-    <g
-       id="g28510"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1496.754,641.1211)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28512"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2119.813,748.1788)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28514"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,603.8629,104.1808)" />
-    <g
-       id="g28516"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1661.283,680.6198)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28518"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2319.621,793.8711)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28520"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,571.0063,116.5218)" />
-    <g
-       id="g28522"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1571.443,663.2796)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28524"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2194.502,770.3373)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28526"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,574.0505,96.50329)" />
-    <g
-       id="g28528"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1631.471,672.9423)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28530"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2289.809,786.1936)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28532"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,541.1939,108.8443)" />
-    <g
-       id="g28534"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1541.631,655.6021)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28536"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2164.69,762.6598)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28538"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,520.6183,75.9981)" />
-    <g
-       id="g28540"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1578.039,652.4372)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28542"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2236.376,765.6884)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28544"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,487.7616,88.33906)" />
-    <g
-       id="g28546"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1488.198,635.0969)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28548"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2111.258,742.1546)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28550"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,564.4014,108.2969)" />
-    <g
-       id="g28552"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1564.838,655.0547)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28554"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2187.897,762.1124)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28556"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,547.8207,89.72225)" />
-    <g
-       id="g28558"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1605.241,666.1612)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28560"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2263.578,779.4125)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28562"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,514.964,102.0632)" />
-    <g
-       id="g28564"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1515.4,648.821)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28566"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2138.46,755.8787)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28568"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,559.4342,88.75772)" />
-    <g
-       id="g28570"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1616.854,665.1965)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28572"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2275.191,778.4478)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28574"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,526.5776,101.0987)" />
-    <g
-       id="g28576"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1527.013,647.8563)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28578"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2150.073,754.914)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28580"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,634.1224,110.9159)" />
-    <g
-       id="g28582"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1691.543,687.355)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28584"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2349.88,800.6062)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28586"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,601.2658,123.2569)" />
-    <g
-       id="g28588"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1601.702,670.0147)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28590"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2224.761,777.0724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28592"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,604.31,103.2384)" />
-    <g
-       id="g28594"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1661.731,679.6775)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28596"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2320.068,792.9288)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28598"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,571.4534,115.5794)" />
-    <g
-       id="g28600"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1571.89,662.3373)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28602"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2194.949,769.395)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28604"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,550.8778,82.73325)" />
-    <g
-       id="g28606"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1608.298,659.1723)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28608"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2266.636,772.4236)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28610"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,518.0211,95.07421)" />
-    <g
-       id="g28612"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1518.458,641.8321)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28614"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2141.517,748.8898)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28616"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,594.6609,115.0321)" />
-    <g
-       id="g28618"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1595.097,661.7899)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28620"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2218.157,768.8476)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28622"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,578.0802,96.4574)" />
-    <g
-       id="g28624"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1635.501,672.8964)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28626"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2293.838,786.1476)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28628"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,545.2236,108.7984)" />
-    <g
-       id="g28630"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1545.66,655.5561)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28632"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2168.719,762.6138)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28634"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,589.6937,95.49287)" />
-    <g
-       id="g28636"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1647.114,671.9317)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28638"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2305.451,785.1829)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28640"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,556.8371,107.8338)" />
-    <g
-       id="g28642"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1557.273,654.5914)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28644"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2180.332,761.6491)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28646"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,664.3819,117.6511)" />
-    <g
-       id="g28648"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1721.802,694.0901)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28650"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2380.14,807.3414)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28652"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,631.5253,129.9921)" />
-    <g
-       id="g28654"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1631.962,676.7499)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28656"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2255.021,783.8076)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28658"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,634.5695,109.9736)" />
-    <g
-       id="g28660"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1691.99,686.4127)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28662"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2350.328,799.6639)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28664"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,601.7128,122.3145)" />
-    <g
-       id="g28666"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1602.15,669.0724)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28668"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2225.209,776.1301)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28670"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,581.1373,89.46841)" />
-    <g
-       id="g28672"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1638.558,665.9075)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28674"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2296.895,779.1587)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28676"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,548.2807,101.8094)" />
-    <g
-       id="g28678"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1548.717,648.5672)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28680"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2171.777,755.6249)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28682"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,624.9204,121.7672)" />
-    <g
-       id="g28684"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1625.357,668.525)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28686"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2248.416,775.5827)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28688"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,608.3397,103.1926)" />
-    <g
-       id="g28690"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1665.76,679.6315)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28692"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2324.097,792.8828)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28694"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,575.4831,115.5335)" />
-    <g
-       id="g28696"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1575.919,662.2913)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28698"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2198.979,769.349)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28700"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,619.9532,102.228)" />
-    <g
-       id="g28702"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,1677.373,678.6668)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28704"
-       transform="matrix(-0.781125,-0.173863,-0.173863,0.781125,2335.71,791.9181)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28706"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,587.0966,114.569)" />
-    <g
-       id="g28708"
-       inkscape:label="Layer 1"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,1587.532,661.3266)" />
-    <g
-       inkscape:label="Layer 1"
-       id="g28710"
-       transform="matrix(-0.739234,-0.164538,-0.165198,0.742197,2210.592,768.3843)" />
-    <g
-       id="g4122"
-       transform="matrix(1.336833,0,0,1.336833,-4.380039,1.130616)"
-       style="opacity:1">
-      <g
-         transform="matrix(1.167201,-0.106258,0.106258,1.167201,-247.6991,-18.36223)"
-         id="g1824"
-         style="display:inline">
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1826"
-           d="M 232.93452,72.015533 C 233.42217,72.044833 234.39659,72.835313 234.2234,73.357284 C 234.04399,73.897905 233.95343,73.077138 233.51117,73.050562 C 232.69425,73.001477 232.43566,72.437887 232.93452,72.015533 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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:nodetypes="cssc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1828"
-           d="M 233.0947,73.032733 C 233.58235,73.062033 234.55676,73.852513 234.38357,74.374484 C 234.20417,74.915105 234.11362,74.094338 233.67135,74.067762 C 232.85443,74.018677 232.59584,73.455087 233.0947,73.032733 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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:nodetypes="cssc" />
-        <path
-           style="color:#000000;fill:url(#linearGradient1920);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68257791;stroke-linecap:round;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 225.23681,67.69541 C 226.94314,67.22718 231.98992,69.477795 233.33627,72.63887 C 233.7063,73.42655 233.73382,73.936267 233.24219,74.477342 C 231.90554,74.36031 216.05846,70.492737 222.39284,65.368845"
-           id="path1830"
-           sodipodi:nodetypes="cccc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1832"
-           d="M 233.13305,73.77868 C 233.6207,73.80798 234.59511,74.59846 234.42192,75.120431 C 234.24252,75.661052 234.15196,74.840285 233.70969,74.813709 C 232.89277,74.764624 232.63418,74.201034 233.13305,73.77868 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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:nodetypes="cssc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1834"
-           d="M 232.21757,73.77868 C 232.70522,73.80798 233.67963,74.59846 233.50644,75.120431 C 233.32704,75.661052 233.23648,74.840285 232.79421,74.813709 C 231.97729,74.764624 231.7187,74.201034 232.21757,73.77868 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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:nodetypes="cssc" />
-        <path
-           sodipodi:nodetypes="cssc"
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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 231.33787,73.57524 C 231.82552,73.60454 232.79993,74.39502 232.62674,74.916991 C 232.44733,75.457612 232.35678,74.636845 231.91451,74.610269 C 231.09759,74.561184 230.83899,73.997594 231.33787,73.57524 z "
-           id="path1836"
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)" />
-      </g>
-      <g
-         transform="matrix(1.172027,0,0,1.172027,-240.7123,-41.20163)"
-         id="g1838"
-         style="display:inline">
-        <path
-           style="opacity:1;color:#000000;fill:url(#linearGradient1922);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68257791;stroke-linecap:round;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 226.07037,53.754251 C 226.81959,57.161533 227.94337,63.636758 225.48503,65.370078 C 225.63583,66.052028 225.01483,65.571728 224.22057,65.502045 C 223.79189,65.133737 223.74398,64.078072 223.59761,63.416179 C 223.42926,62.654873 223.62052,62.057263 223.48284,61.434653 C 223.35173,60.841754 222.0061,53.742132 222.28423,53.132607"
-           id="path1840"
-           sodipodi:nodetypes="cccccc" />
-        <path
-           style="opacity:1;color:#000000;fill:url(#linearGradient1924);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;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 226.07037,53.754251 C 226.81959,57.161533 227.94337,63.636758 225.48503,65.370078 C 225.63583,66.052028 225.01483,65.571728 224.22057,65.502045 C 223.79189,65.133737 223.74398,64.078072 223.59761,63.416179 C 223.42926,62.654873 223.62052,62.057263 223.48284,61.434653 C 223.35173,60.841754 222.0061,53.742132 222.28423,53.132607"
-           id="path1842"
-           sodipodi:nodetypes="cccccc" />
-        <path
-           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68257791;stroke-linecap:round;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 226.07037,53.754251 C 226.81959,57.161533 227.94337,63.636758 225.48503,65.370078 C 225.63583,66.052028 225.01483,65.571728 224.22057,65.502045 C 223.79189,65.133737 223.74398,64.078072 223.59761,63.416179 C 223.42926,62.654873 223.62052,62.057263 223.48284,61.434653 C 223.35173,60.841754 222.0061,53.742132 222.28423,53.132607"
-           id="path1844"
-           sodipodi:nodetypes="cccccc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1846"
-           d="M 224.23222,64.062365 C 224.36647,64.537443 223.98571,65.848778 223.46597,65.943398 C 222.92766,66.041387 223.62568,65.549855 223.50393,65.118994 C 223.27904,64.323145 223.69381,63.800119 224.23222,64.062365 z "
-           style="fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#5f491c;stroke-width:0.09588197pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cssc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1848"
-           d="M 224.673,64.604872 C 224.80725,65.07995 224.42649,66.391285 223.90675,66.485905 C 223.36844,66.583894 224.06646,66.092362 223.94471,65.661501 C 223.71982,64.865652 224.13459,64.342626 224.673,64.604872 z "
-           style="fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#5f491c;stroke-width:0.09588197pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cssc" />
-        <path
-           sodipodi:nodetypes="cssc"
-           style="fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#5f491c;stroke-width:0.09588197pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 226.63959,63.926739 C 226.77384,64.401817 226.39308,65.713152 225.87334,65.807772 C 225.33503,65.905761 226.03305,65.414229 225.9113,64.983368 C 225.68641,64.187519 226.10118,63.664493 226.63959,63.926739 z "
-           id="path1850"
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1852"
-           d="M 225.96145,64.503152 C 226.0957,64.97823 225.71494,66.289565 225.1952,66.384185 C 224.65689,66.482174 225.35491,65.990642 225.23316,65.559781 C 225.00827,64.763932 225.42304,64.240906 225.96145,64.503152 z "
-           style="fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#5f491c;stroke-width:0.09588197pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cssc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1854"
-           d="M 225.31723,64.910032 C 225.45148,65.38511 225.07072,66.696445 224.55098,66.791065 C 224.01267,66.889054 224.71069,66.397522 224.58894,65.966661 C 224.36405,65.170812 224.77882,64.647786 225.31723,64.910032 z "
-           style="fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#5f491c;stroke-width:0.09588197pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cssc" />
-      </g>
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         sodipodi:nodetypes="cssssc"
-         id="path1856"
-         d="M 18.37921,40.702821 C 18.37921,40.702821 -2.5880089,44.084433 4.3429841,17.11205 C 7.1286461,6.2714735 0.79395709,16.427822 1.9505021,11.406217 C 3.6166671,4.1718875 14.80344,-3.4307055 15.52467,12.582934 C 16.20867,27.769662 21.43404,34.005697 20.25911,36.120579 C 19.08418,38.235461 18.26172,40.937809 18.37921,40.702821 z "
-         style="fill:url(#linearGradient1926);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="czczcscc"
-         id="path1858"
-         d="M 24.90007,19.906163 C 25.50012,18.729091 27.80337,12.548878 25.70918,11.996811 C 23.62911,11.448466 22.51503,9.5904705 17.28903,8.8164005 C 11.055428,15.391485 6.8240831,40.554033 19.9522,42.119862 C 33.08032,43.68569 34.25639,31.834699 28.13291,29.83306 C 28.13291,29.83306 23.69996,22.26031 24.90007,19.906163 z M 28.13685,29.820487 C 27.39578,29.581368 26.10072,29.712899 25.28311,30.154993"
-         style="color:#000000;fill:url(#linearGradient1928);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.79999971;stroke-linecap:round;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" />
-      <path
-         id="path1860"
-         d="M 28.44233,35.115796 C 30.44851,35.167352 28.42197,33.838544 28.72394,35.350925 C 27.35893,35.844315 27.43835,35.475336 28.46727,35.945751 L 26.90948,35.323207 C 28.20339,36.115208 28.9766,37.048103 30.22625,36.138479 C 30.34289,34.648913 28.12958,33.465699 26.88267,34.359185 L 28.44233,35.115796 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         transform="matrix(1.167201,-0.106258,0.106258,1.167201,-252.9544,-15.47221)"
-         id="g1862"
-         style="display:inline">
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1864"
-           d="M 232.93452,72.015533 C 233.42217,72.044833 234.39659,72.835313 234.2234,73.357284 C 234.04399,73.897905 233.95343,73.077138 233.51117,73.050562 C 232.69425,73.001477 232.43566,72.437887 232.93452,72.015533 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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:nodetypes="cssc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1866"
-           d="M 233.0947,73.032733 C 233.58235,73.062033 234.55676,73.852513 234.38357,74.374484 C 234.20417,74.915105 234.11362,74.094338 233.67135,74.067762 C 232.85443,74.018677 232.59584,73.455087 233.0947,73.032733 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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:nodetypes="cssc" />
-        <path
-           style="color:#000000;fill:url(#linearGradient1930);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68257791;stroke-linecap:round;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 225.23681,67.69541 C 226.94314,67.22718 231.98992,69.477795 233.33627,72.63887 C 233.7063,73.42655 233.73382,73.936267 233.24219,74.477342 C 231.90554,74.36031 216.05846,70.492737 222.39284,65.368845"
-           id="path1868"
-           sodipodi:nodetypes="cccc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1870"
-           d="M 233.13305,73.77868 C 233.6207,73.80798 234.59511,74.59846 234.42192,75.120431 C 234.24252,75.661052 234.15196,74.840285 233.70969,74.813709 C 232.89277,74.764624 232.63418,74.201034 233.13305,73.77868 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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:nodetypes="cssc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path1872"
-           d="M 232.21757,73.77868 C 232.70522,73.80798 233.67963,74.59846 233.50644,75.120431 C 233.32704,75.661052 233.23648,74.840285 232.79421,74.813709 C 231.97729,74.764624 231.7187,74.201034 232.21757,73.77868 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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:nodetypes="cssc" />
-        <path
-           sodipodi:nodetypes="cssc"
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588195pt;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 231.33787,73.57524 C 231.82552,73.60454 232.79993,74.39502 232.62674,74.916991 C 232.44733,75.457612 232.35678,74.636845 231.91451,74.610269 C 231.09759,74.561184 230.83899,73.997594 231.33787,73.57524 z "
-           id="path1874"
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)" />
-      </g>
-      <g
-         transform="translate(1.952909e-2,-2.06233e-2)"
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         id="g1894"
-         style="display:inline">
-        <path
-           style="fill:#785d3c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.79999971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 24.759422,9.3805187 C 24.750878,8.6334324 22.41184,3.7347439 20.030305,5.5619821 C 18.697288,6.5847444 20.882134,9.8798655 21.029001,10.056106"
-           id="path1896"
-           sodipodi:nodetypes="csc" />
-        <path
-           style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.79999971;stroke-linecap:round;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 29.945935,14.858222 C 28.38592,14.454808 26.467277,15.89972 28.773908,18.117923 C 28.783542,18.127184 28.774986,18.141275 28.773908,18.154548 C 29.492255,17.883053 30.44305,17.896374 30.971458,17.275528 C 31.289687,16.533003 30.420348,15.432755 29.945935,14.858222 z "
-           id="path1898"
-           sodipodi:nodetypes="csscc" />
-        <path
-           style="color:#000000;fill:url(#linearGradient1936);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.79999971;stroke-linecap:round;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 17.603025,14.565216 C 21.599567,19.32332 24.925827,19.608907 28.773908,18.154548 C 28.774986,18.141275 28.780858,18.129331 28.773908,18.117923 C 27.648258,16.2715 28.52109,14.264083 29.945935,14.858222 C 28.903991,12.121527 26.743207,7.4345062 22.217882,6.9104144 C 18.957256,6.5327931 14.385964,8.5136969 14.366133,13.351742"
-           id="path1900"
-           sodipodi:nodetypes="ccsccc" />
-        <path
-           style="color:#000000;fill:url(#linearGradient1938);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.79999971;stroke-linecap:round;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 20.764392,9.1662816 C 20.93518,7.1901667 17.978039,4.1499884 16.211513,5.8177184 C 14.98978,6.9711254 16.887104,9.6656284 17.033971,9.8418684"
-           id="path1902"
-           sodipodi:nodetypes="csc" />
-        <path
-           transform="matrix(0.288545,0,0,0.254431,21.47458,13.40736)"
-           sodipodi:open="true"
-           sodipodi:end="9.8998895"
-           sodipodi:start="3.6184187"
-           d="M 28.277651,8.3166272 A 1.7235727,1.9058738 0 1 1 28.276297,8.3195316"
-           sodipodi:ry="1.9058738"
-           sodipodi:rx="1.7235727"
-           sodipodi:cy="9.19135"
-           sodipodi:cx="29.808969"
-           id="path1904"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.87900001;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>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         transform="matrix(-0.290433,4.185835e-2,3.133544e-2,0.337277,153.0645,-33.89328)"
-         id="g1906"
-         style="display:inline">
-        <path
-           id="path1908"
-           d="M 454.75697,75.928206 C 454.75697,80.949126 452.03777,85.024066 448.68733,85.024066 C 445.33689,85.024066 442.6177,80.949126 442.6177,75.928206 C 442.6177,70.907286 445.33689,66.832336 448.68733,66.832336 C 452.03777,66.832336 454.75697,70.907286 454.75697,75.928206 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#0f0f0f;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1" />
-        <path
-           id="path1910"
-           d="M 444.89698,77.010076 C 444.89698,80.502716 442.81836,83.337336 440.25723,83.337336 C 437.69608,83.337336 435.61748,80.502716 435.61748,77.010076 C 435.61748,73.517426 437.69608,70.682816 440.25723,70.682816 C 442.81836,70.682816 444.89698,73.517426 444.89698,77.010076 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#0f0f0f;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1" />
-        <path
-           id="path1912"
-           d="M 443.64742,77.200376 C 443.64742,79.800806 442.10915,81.911286 440.21376,81.911286 C 438.31839,81.911286 436.78011,79.800806 436.78011,77.200376 C 436.78011,74.599956 438.31839,72.489476 440.21376,72.489476 C 442.10915,72.489476 443.64742,74.599956 443.64742,77.200376 z "
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#0f0f0f;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1" />
-        <path
-           id="path1914"
-           d="M 453.00501,76.587556 C 452.59149,80.602256 450.08083,83.569266 447.40087,83.210336 C 444.7209,82.851406 442.88145,79.301786 443.29498,75.287086 C 443.70849,71.272396 446.21914,68.305396 448.89911,68.664326 C 451.57907,69.023246 453.41852,72.572866 453.00501,76.587556 z "
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#0f0f0f;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1" />
-        <path
-           id="path1916"
-           d="M 450.11587,78.380266 C 450.11587,80.047796 448.76966,81.401166 447.11092,81.401166 C 445.45219,81.401166 444.10598,80.047796 444.10598,78.380266 C 444.10598,76.712736 445.45219,75.359376 447.11092,75.359376 C 448.76966,75.359376 450.11587,76.712736 450.11587,78.380266 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#0f0f0f;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1" />
-        <path
-           id="path1918"
-           d="M 443.01269,78.415036 C 443.01269,80.082566 441.66648,81.435936 440.00774,81.435936 C 438.34901,81.435936 437.0028,80.082566 437.0028,78.415036 C 437.0028,76.747506 438.34901,75.394146 440.00774,75.394146 C 441.66648,75.394146 443.01269,76.747506 443.01269,78.415036 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#0f0f0f;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
-      </g>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         transform="matrix(1.17162,3.090366e-2,-3.090366e-2,1.17162,-245.4658,-45.97921)"
-         id="g11100"
-         style="display:inline">
-        <path
-           style="opacity:1;color:#000000;fill:url(#linearGradient11118);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68257791;stroke-linecap:round;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 226.07037,53.754251 C 226.81959,57.161533 227.94337,63.636758 225.48503,65.370078 C 225.63583,66.052028 225.01483,65.571728 224.22057,65.502045 C 223.79189,65.133737 223.74398,64.078072 223.59761,63.416179 C 223.42926,62.654873 223.62052,62.057263 223.48284,61.434653 C 223.35173,60.841754 222.0061,53.742132 222.28423,53.132607"
-           id="path11102"
-           sodipodi:nodetypes="cccccc" />
-        <path
-           style="opacity:1;color:#000000;fill:url(#linearGradient11120);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;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 226.07037,53.754251 C 226.81959,57.161533 227.94337,63.636758 225.48503,65.370078 C 225.63583,66.052028 225.01483,65.571728 224.22057,65.502045 C 223.79189,65.133737 223.74398,64.078072 223.59761,63.416179 C 223.42926,62.654873 223.62052,62.057263 223.48284,61.434653 C 223.35173,60.841754 222.0061,53.742132 222.28423,53.132607"
-           id="path11104"
-           sodipodi:nodetypes="cccccc" />
-        <path
-           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68257791;stroke-linecap:round;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 226.07037,53.754251 C 226.81959,57.161533 227.94337,63.636758 225.48503,65.370078 C 225.63583,66.052028 225.01483,65.571728 224.22057,65.502045 C 223.79189,65.133737 223.74398,64.078072 223.59761,63.416179 C 223.42926,62.654873 223.62052,62.057263 223.48284,61.434653 C 223.35173,60.841754 222.0061,53.742132 222.28423,53.132607"
-           id="path11106"
-           sodipodi:nodetypes="cccccc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path11108"
-           d="M 224.23222,64.062365 C 224.36647,64.537443 223.98571,65.848778 223.46597,65.943398 C 222.92766,66.041387 223.62568,65.549855 223.50393,65.118994 C 223.27904,64.323145 223.69381,63.800119 224.23222,64.062365 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588197pt;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:nodetypes="cssc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path11110"
-           d="M 224.673,64.604872 C 224.80725,65.07995 224.42649,66.391285 223.90675,66.485905 C 223.36844,66.583894 224.06646,66.092362 223.94471,65.661501 C 223.71982,64.865652 224.13459,64.342626 224.673,64.604872 z "
-           style="fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588197pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="cssc" />
-        <path
-           sodipodi:nodetypes="cssc"
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588197pt;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 226.63959,63.926739 C 226.77384,64.401817 226.39308,65.713152 225.87334,65.807772 C 225.33503,65.905761 226.03305,65.414229 225.9113,64.983368 C 225.68641,64.187519 226.10118,63.664493 226.63959,63.926739 z "
-           id="path11112"
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path11114"
-           d="M 225.96145,64.503152 C 226.0957,64.97823 225.71494,66.289565 225.1952,66.384185 C 224.65689,66.482174 225.35491,65.990642 225.23316,65.559781 C 225.00827,64.763932 225.42304,64.240906 225.96145,64.503152 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588197pt;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:nodetypes="cssc" />
-        <path
-           sodipodi:stroke-cmyk="(0.0000000 0.41249999 1.0000000 0.51351351)"
-           id="path11116"
-           d="M 225.31723,64.910032 C 225.45148,65.38511 225.07072,66.696445 224.55098,66.791065 C 224.01267,66.889054 224.71069,66.397522 224.58894,65.966661 C 224.36405,65.170812 224.77882,64.647786 225.31723,64.910032 z "
-           style="opacity:1;color:#000000;fill:#4a412c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09588197pt;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:nodetypes="cssc" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/data/team/spipteam/flag64.png b/data/team/spipteam/flag64.png
deleted file mode 100644
index 68bae83..0000000
Binary files a/data/team/spipteam/flag64.png and /dev/null differ
diff --git a/data/team/spipteam/team.xml b/data/team/spipteam/team.xml
deleted file mode 100644
index 6c661cb..0000000
--- a/data/team/spipteam/team.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Spip</name>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="ARNO*" body="spipteam" />
-    <character name="Pit'" body="spipteam" />
-    <character name="Fil" body="spipteam" />
-    <character name="ESJ" body="spipteam" />
-    <character name="Kliké" body="spipteam" />
-    <character name="Cerdic" body="spipteam" />
-    <character name="Têtue" body="spipteam" />
-    <character name="Renââto" body="spipteam" />
-    <character name="Piif" body="spipteam" />
-    <character name="bennybi" body="spipteam" />
-    <character name="BoOz" body="spipteam" />
-    <character name="Mortimer" body="spipteam" />
-    <character name="toggg" body="spipteam" />
-    <character name="Atchoum" body="spipteam" />
-    <character name="Alexandra Maison" body="spipteam" />
-    <character name="izo" body="spipteam" />
-  </team>
-</resources>
-
diff --git a/data/team/suse/dead.png b/data/team/suse/dead.png
new file mode 100644
index 0000000..9aeba91
Binary files /dev/null and b/data/team/suse/dead.png differ
diff --git a/data/team/suse/flag.png b/data/team/suse/flag.png
new file mode 100644
index 0000000..2f91ee2
Binary files /dev/null and b/data/team/suse/flag.png differ
diff --git a/data/team/suse/flag64.png b/data/team/suse/flag64.png
new file mode 100644
index 0000000..1e4036d
Binary files /dev/null and b/data/team/suse/flag64.png differ
diff --git a/data/team/suse/team.xml b/data/team/suse/team.xml
new file mode 100644
index 0000000..f5c9f36
--- /dev/null
+++ b/data/team/suse/team.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>SuSE</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+	<character name="Geeko" body="suse"/>
+	<character name="opensuse" body="suse"/>
+	<character name="suse_LE" body="suse"/>
+	<character name="ZYpp" body="suse"/>
+	<character name="Microsuse" body="suse"/>
+	<character name="Minisuse" body="suse"/>	
+	<character name="SUPER" body="suse"/>
+	<character name="Jacklab" body="suse"/>
+	<character name="YaST" body="suse"/>
+	<character name="Rhampholeon Günther" body="suse"/>
+	<character name="Chamaeleonidae" body="suse"/>
+	<character name="Bradypodion Fitzinger" body="suse"/>
+	<character name="Brookesia Gray" body="suse"/>
+	<character name="Calumma Gray" body="suse"/>	
+	<character name="Chamaeleo Laurenti" body="suse"/>
+	<character name="Furcifer Fitzinger" body="suse"/>
+  </team>
+</resources>
diff --git a/data/team/thunderbird/dead.png b/data/team/thunderbird/dead.png
new file mode 100644
index 0000000..315e22c
Binary files /dev/null and b/data/team/thunderbird/dead.png differ
diff --git a/data/team/thunderbird/flag.png b/data/team/thunderbird/flag.png
new file mode 100644
index 0000000..a961fde
Binary files /dev/null and b/data/team/thunderbird/flag.png differ
diff --git a/data/team/thunderbird/flag64.png b/data/team/thunderbird/flag64.png
new file mode 100644
index 0000000..189b36d
Binary files /dev/null and b/data/team/thunderbird/flag64.png differ
diff --git a/data/team/thunderbird/team.xml b/data/team/thunderbird/team.xml
new file mode 100755
index 0000000..51f3aa7
--- /dev/null
+++ b/data/team/thunderbird/team.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Thunderbird</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="Thunderbird" body="thunderbird" />
+    <character name="Gibson" body="thunderbird" />
+    <character name="Phorusrhacidae" body="thunderbird" />
+    <character name="Dromornithidae" body="thunderbird" />
+    <character name="Train" body="thunderbird" />
+    <character name="Ford" body="thunderbird" />
+    <character name="Triumph" body="thunderbird" />
+    <character name="Royal Enfield" body="thunderbird" />    
+    <character name="Albuquerque" body="thunderbird" />
+    <character name="UBC" body="thunderbird" />
+    <character name="Hamilton" body="thunderbird" />
+    <character name="Seattle" body="thunderbird" />
+    <character name="Squadron" body="thunderbird" />
+    <character name="Missile" body="thunderbird" />
+  </team>
+</resources>
diff --git a/data/team/thunderbirdteam/dead.png b/data/team/thunderbirdteam/dead.png
deleted file mode 100644
index c1911ee..0000000
Binary files a/data/team/thunderbirdteam/dead.png and /dev/null differ
diff --git a/data/team/thunderbirdteam/flag.png b/data/team/thunderbirdteam/flag.png
deleted file mode 100644
index 48d071c..0000000
Binary files a/data/team/thunderbirdteam/flag.png and /dev/null differ
diff --git a/data/team/thunderbirdteam/flag64.png b/data/team/thunderbirdteam/flag64.png
deleted file mode 100644
index e0d4cf4..0000000
Binary files a/data/team/thunderbirdteam/flag64.png and /dev/null differ
diff --git a/data/team/thunderbirdteam/team.xml b/data/team/thunderbirdteam/team.xml
deleted file mode 100755
index d8dbe0a..0000000
--- a/data/team/thunderbirdteam/team.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Thunderbird</name>
-  <sound_profile>flying</sound_profile>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="Thunderbird" body="thunderbirdteam" />
-    <character name="Gibson" body="thunderbirdteam" />
-    <character name="Phorusrhacidae" body="thunderbirdteam" />
-    <character name="Dromornithidae" body="thunderbirdteam" />
-    <character name="Train" body="thunderbirdteam" />
-    <character name="Ford" body="thunderbirdteam" />
-    <character name="Triumph" body="thunderbirdteam" />
-    <character name="Royal Enfield" body="thunderbirdteam" />    
-    <character name="Albuquerque" body="thunderbirdteam" />
-    <character name="UBC" body="thunderbirdteam" />
-    <character name="Hamilton" body="thunderbirdteam" />
-    <character name="Seattle" body="thunderbirdteam" />
-    <character name="Squadron" body="thunderbirdteam" />
-    <character name="Missile" body="thunderbirdteam" />
-  </team>
-</resources>
diff --git a/data/team/tux/dead.png b/data/team/tux/dead.png
new file mode 100644
index 0000000..263d32b
Binary files /dev/null and b/data/team/tux/dead.png differ
diff --git a/data/team/tux/flag.png b/data/team/tux/flag.png
new file mode 100644
index 0000000..436a4ac
Binary files /dev/null and b/data/team/tux/flag.png differ
diff --git a/data/team/tux/flag64.png b/data/team/tux/flag64.png
new file mode 100644
index 0000000..ef62c3a
Binary files /dev/null and b/data/team/tux/flag64.png differ
diff --git a/data/team/tux/team.xml b/data/team/tux/team.xml
new file mode 100755
index 0000000..11187d9
--- /dev/null
+++ b/data/team/tux/team.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Tux</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="Tux" body="tux" />
+    <character name="Chilly Willy" body="tux" />
+    <character name="Pingu" body="tux" />
+    <character name="Royal" body="tux" />
+    <character name="Gorfou" body="tux" />
+    <character name="Papou" body="tux" />
+    <character name="Empereur" body="tux" />
+    <character name="Pygmée" body="tux" />
+    <character name="Antipode" body="tux" />
+    <character name="Adélie" body="tux" />
+    <character name="Pittsburgh" body="tux" />
+    <character name="Pengo" body="tux" />
+    <character name="Bandit" body="tux" />
+    <character name="Lea" body="tux" />   
+  </team>
+</resources>
diff --git a/data/team/tuxteam/dead.png b/data/team/tuxteam/dead.png
deleted file mode 100644
index 211336e..0000000
Binary files a/data/team/tuxteam/dead.png and /dev/null differ
diff --git a/data/team/tuxteam/flag.png b/data/team/tuxteam/flag.png
deleted file mode 100644
index a7c2ea9..0000000
Binary files a/data/team/tuxteam/flag.png and /dev/null differ
diff --git a/data/team/tuxteam/flag64.png b/data/team/tuxteam/flag64.png
deleted file mode 100644
index 1595935..0000000
Binary files a/data/team/tuxteam/flag64.png and /dev/null differ
diff --git a/data/team/tuxteam/team.xml b/data/team/tuxteam/team.xml
deleted file mode 100755
index 1318561..0000000
--- a/data/team/tuxteam/team.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Tux</name>
-  <sound_profile>flying</sound_profile>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="Tux" body="tuxteam" />
-    <character name="Chilly Willy" body="tuxteam" />
-    <character name="Pingu" body="tuxteam" />
-    <character name="Royal" body="tuxteam" />
-    <character name="Gorfou" body="tuxteam" />
-    <character name="Papou" body="tuxteam" />
-    <character name="Empereur" body="tuxteam" />
-    <character name="Pygmée" body="tuxteam" />
-    <character name="Antipode" body="tuxteam" />
-    <character name="Adélie" body="tuxteam" />
-    <character name="Pittsburgh" body="tuxteam" />
-    <character name="Pengo" body="tuxteam" />
-    <character name="Bandit" body="tuxteam" />
-    <character name="Lea" body="tuxteam" />   
-  </team>
-</resources>
diff --git a/data/team/wilber/dead.png b/data/team/wilber/dead.png
new file mode 100644
index 0000000..590445f
Binary files /dev/null and b/data/team/wilber/dead.png differ
diff --git a/data/team/wilber/flag.png b/data/team/wilber/flag.png
new file mode 100644
index 0000000..fa674d8
Binary files /dev/null and b/data/team/wilber/flag.png differ
diff --git a/data/team/wilber/flag64.png b/data/team/wilber/flag64.png
new file mode 100644
index 0000000..7a36a28
Binary files /dev/null and b/data/team/wilber/flag64.png differ
diff --git a/data/team/wilber/team.xml b/data/team/wilber/team.xml
new file mode 100644
index 0000000..bbab1bc
--- /dev/null
+++ b/data/team/wilber/team.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Wilber</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+    <character name="Pablo Picasso" body="wilber" />
+    <character name="Keith Haring" body="wilber" />
+    <character name="Leonard Da Vinci" body="wilber" />
+    <character name="Francisco Goya" body="wilber" />
+    <character name="Salvador Dali" body="wilber" />
+    <character name="Paul Gauguin" body="wilber" />
+    <character name="Edouard Manet" body="wilber" />
+    <character name="Claude Monet" body="wilber" />    
+    <character name="Rembrandt Harmenszoon van Rijn" body="wilber" />
+    <character name="Pierre-Auguste Renoir" body="wilber" />
+    <character name="Vincent Van Gogh" body="wilber" />
+    <character name="Raffaello Sanzio" body="wilber" />
+    <character name="Jean-Baptiste Oudry" body="wilber" />
+    <character name="Alessandro Botticelli" body="wilber" />
+  </team>
+</resources>
diff --git a/data/team/wilberteam/dead.png b/data/team/wilberteam/dead.png
deleted file mode 100644
index 4cd5e5c..0000000
Binary files a/data/team/wilberteam/dead.png and /dev/null differ
diff --git a/data/team/wilberteam/flag.png b/data/team/wilberteam/flag.png
deleted file mode 100644
index ad1bcbe..0000000
Binary files a/data/team/wilberteam/flag.png and /dev/null differ
diff --git a/data/team/wilberteam/flag64.png b/data/team/wilberteam/flag64.png
deleted file mode 100644
index 046fc70..0000000
Binary files a/data/team/wilberteam/flag64.png and /dev/null differ
diff --git a/data/team/wilberteam/team.xml b/data/team/wilberteam/team.xml
deleted file mode 100644
index 8fffe34..0000000
--- a/data/team/wilberteam/team.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Wilber</name>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="Pablo Picasso" body="wilberteam" />
-    <character name="Keith Haring" body="wilberteam" />
-    <character name="Leonard Da Vinci" body="wilberteam" />
-    <character name="Francisco Goya" body="wilberteam" />
-    <character name="Salvador Dali" body="wilberteam" />
-    <character name="Paul Gauguin" body="wilberteam" />
-    <character name="Edouard Manet" body="wilberteam" />
-    <character name="Claude Monet" body="wilberteam" />    
-    <character name="Rembrandt Harmenszoon van Rijn" body="wilberteam" />
-    <character name="Pierre-Auguste Renoir" body="wilberteam" />
-    <character name="Vincent Van Gogh" body="wilberteam" />
-    <character name="Raffaello Sanzio" body="wilberteam" />
-    <character name="Jean-Baptiste Oudry" body="wilberteam" />
-    <character name="Alessandro Botticelli" body="wilberteam" />
-  </team>
-</resources>
diff --git a/data/team/workrave/dead.png b/data/team/workrave/dead.png
new file mode 100644
index 0000000..88d48fd
Binary files /dev/null and b/data/team/workrave/dead.png differ
diff --git a/data/team/workrave/flag.png b/data/team/workrave/flag.png
new file mode 100644
index 0000000..0856e06
Binary files /dev/null and b/data/team/workrave/flag.png differ
diff --git a/data/team/workrave/flag64.png b/data/team/workrave/flag64.png
new file mode 100644
index 0000000..a2c273a
Binary files /dev/null and b/data/team/workrave/flag64.png differ
diff --git a/data/team/workrave/team.xml b/data/team/workrave/team.xml
new file mode 100755
index 0000000..1ee105e
--- /dev/null
+++ b/data/team/workrave/team.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources SYSTEM "../team.dtd" []>
+<resources>
+  <name>Workrave</name>
+  <surface name="flag" file="flag.png" />
+  <surface name="death_flag" file="dead.png" />
+  <surface name="big_flag" file="flag64.png" />
+  <team>
+<character name="Workrave" body="workrave"/>
+<character name="Yan Tan Tethera" body="workrave"/>
+<character name="Dolly" body="workrave"/>
+<character name="Scrapie" body="workrave"/>
+<character name="O. aries" body="workrave"/>
+<character name="Aries" body="workrave"/>
+<character name="Wool" body="workrave"/>
+<character name="O. canadensis" body="workrave"/>
+<character name="O. dalli" body="workrave"/>
+<character name="O. musimon" body="workrave"/>
+<character name="O. ammon musimon" body="workrave"/>
+<character name="O. nivicola" body="workrave"/>
+<character name="O. orientalis" body="workrave"/>
+<character name="O. vignei" body="workrave"/>  
+  </team>
+</resources>
diff --git a/data/team/workraveteam/dead.png b/data/team/workraveteam/dead.png
deleted file mode 100644
index cad4ff7..0000000
Binary files a/data/team/workraveteam/dead.png and /dev/null differ
diff --git a/data/team/workraveteam/flag.png b/data/team/workraveteam/flag.png
deleted file mode 100644
index db5b9cb..0000000
Binary files a/data/team/workraveteam/flag.png and /dev/null differ
diff --git a/data/team/workraveteam/flag64.png b/data/team/workraveteam/flag64.png
deleted file mode 100644
index ee202c6..0000000
Binary files a/data/team/workraveteam/flag64.png and /dev/null differ
diff --git a/data/team/workraveteam/team.xml b/data/team/workraveteam/team.xml
deleted file mode 100644
index 1c47bd5..0000000
--- a/data/team/workraveteam/team.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources SYSTEM "../team.dtd" []>
-<resources>
-  <name>Workrave</name>
-  <surface name="flag" file="flag.png" />
-  <surface name="death_flag" file="dead.png" />
-  <surface name="big_flag" file="flag64.png" />
-  <team>
-    <character name="Workrave" body="workraveteam" />
-    <character name="Yan Tan Tethera" body="workraveteam" />
-    <character name="Dolly" body="workraveteam" />
-    <character name="Scrapie" body="workraveteam" />
-    <character name="O. aries" body="workraveteam" />
-    <character name="Aries" body="workraveteam" />
-    <character name="Wool" body="workraveteam" />    
-    <character name="O. canadensis" body="workraveteam" />
-    <character name="O. dalli" body="workraveteam" />
-    <character name="O. musimon" body="workraveteam" />
-    <character name="O. ammon musimon" body="workraveteam" />
-    <character name="O. nivicola" body="workraveteam" />
-    <character name="O. orientalis" body="workraveteam" />
-    <character name="O. vignei" body="workraveteam" />
-  </team>
-</resources>
-
diff --git a/data/weapon/air_attack/air_attack.png b/data/weapon/air_attack/air_attack.png
index d547a58..0d59348 100644
Binary files a/data/weapon/air_attack/air_attack.png and b/data/weapon/air_attack/air_attack.png differ
diff --git a/data/weapon/air_attack/air_attack_ico.png b/data/weapon/air_attack/air_attack_ico.png
index 960ec21..89ccaad 100644
Binary files a/data/weapon/air_attack/air_attack_ico.png and b/data/weapon/air_attack/air_attack_ico.png differ
diff --git a/data/weapon/air_attack/air_attack_plane.png b/data/weapon/air_attack/air_attack_plane.png
index 254182d..354251c 100644
Binary files a/data/weapon/air_attack/air_attack_plane.png and b/data/weapon/air_attack/air_attack_plane.png differ
diff --git a/data/weapon/air_attack/obus.png b/data/weapon/air_attack/obus.png
index 9cabda8..c4f7a68 100644
Binary files a/data/weapon/air_attack/obus.png and b/data/weapon/air_attack/obus.png differ
diff --git a/data/weapon/airhammer/airhammer_ico.png b/data/weapon/airhammer/airhammer_ico.png
index 00fb7e0..d4b9e4f 100644
Binary files a/data/weapon/airhammer/airhammer_ico.png and b/data/weapon/airhammer/airhammer_ico.png differ
diff --git a/data/weapon/airhammer/airhammer_impact.png b/data/weapon/airhammer/airhammer_impact.png
index a9d42fd..737ec6e 100644
Binary files a/data/weapon/airhammer/airhammer_impact.png and b/data/weapon/airhammer/airhammer_impact.png differ
diff --git a/data/weapon/anvil/anvil.png b/data/weapon/anvil/anvil.png
index 99e3f5f..204dd7d 100644
Binary files a/data/weapon/anvil/anvil.png and b/data/weapon/anvil/anvil.png differ
diff --git a/data/weapon/anvil/anvil_ico.png b/data/weapon/anvil/anvil_ico.png
index 5c15b94..5b53f0a 100644
Binary files a/data/weapon/anvil/anvil_ico.png and b/data/weapon/anvil/anvil_ico.png differ
diff --git a/data/weapon/baseball/baseball.png b/data/weapon/baseball/baseball.png
index a0df2e6..a0a95d6 100644
Binary files a/data/weapon/baseball/baseball.png and b/data/weapon/baseball/baseball.png differ
diff --git a/data/weapon/baseball/baseball_hit.png b/data/weapon/baseball/baseball_hit.png
index caabf06..92451b6 100644
Binary files a/data/weapon/baseball/baseball_hit.png and b/data/weapon/baseball/baseball_hit.png differ
diff --git a/data/weapon/baseball/baseball_ico.png b/data/weapon/baseball/baseball_ico.png
index 68d0651..70d5e27 100644
Binary files a/data/weapon/baseball/baseball_ico.png and b/data/weapon/baseball/baseball_ico.png differ
diff --git a/data/weapon/bazooka/baz_cible.png b/data/weapon/bazooka/baz_cible.png
index 8f6c444..87859fc 100644
Binary files a/data/weapon/bazooka/baz_cible.png and b/data/weapon/bazooka/baz_cible.png differ
diff --git a/data/weapon/bazooka/bazooka_auto_ico.png b/data/weapon/bazooka/bazooka_auto_ico.png
index d8ce934..0bada6c 100644
Binary files a/data/weapon/bazooka/bazooka_auto_ico.png and b/data/weapon/bazooka/bazooka_auto_ico.png differ
diff --git a/data/weapon/bazooka/bazooka_ico.png b/data/weapon/bazooka/bazooka_ico.png
index bde3383..dbe434e 100644
Binary files a/data/weapon/bazooka/bazooka_ico.png and b/data/weapon/bazooka/bazooka_ico.png differ
diff --git a/data/weapon/bazooka/brown_bazooka.png b/data/weapon/bazooka/brown_bazooka.png
index 9ca5f18..8ed3b28 100644
Binary files a/data/weapon/bazooka/brown_bazooka.png and b/data/weapon/bazooka/brown_bazooka.png differ
diff --git a/data/weapon/bazooka/green_bazooka.png b/data/weapon/bazooka/green_bazooka.png
index 30d94c0..1bcc96f 100644
Binary files a/data/weapon/bazooka/green_bazooka.png and b/data/weapon/bazooka/green_bazooka.png differ
diff --git a/data/weapon/bazooka/yellow_bazooka.png b/data/weapon/bazooka/yellow_bazooka.png
index a3be168..17a6152 100644
Binary files a/data/weapon/bazooka/yellow_bazooka.png and b/data/weapon/bazooka/yellow_bazooka.png differ
diff --git a/data/weapon/blowtorch/blowtorch_ico.png b/data/weapon/blowtorch/blowtorch_ico.png
index c0db630..2f48826 100644
Binary files a/data/weapon/blowtorch/blowtorch_ico.png and b/data/weapon/blowtorch/blowtorch_ico.png differ
diff --git a/data/weapon/bounce_ball/bounce_ball_ico.png b/data/weapon/bounce_ball/bounce_ball_ico.png
index be36a42..66e6a47 100644
Binary files a/data/weapon/bounce_ball/bounce_ball_ico.png and b/data/weapon/bounce_ball/bounce_ball_ico.png differ
diff --git a/data/weapon/cluster_bomb/cluster.png b/data/weapon/cluster_bomb/cluster.png
index 04c7869..b794e17 100644
Binary files a/data/weapon/cluster_bomb/cluster.png and b/data/weapon/cluster_bomb/cluster.png differ
diff --git a/data/weapon/cluster_bomb/clusterbomb.png b/data/weapon/cluster_bomb/clusterbomb.png
index a193132..0d8e88a 100644
Binary files a/data/weapon/cluster_bomb/clusterbomb.png and b/data/weapon/cluster_bomb/clusterbomb.png differ
diff --git a/data/weapon/cluster_bomb/clusterbomb_ico.png b/data/weapon/cluster_bomb/clusterbomb_ico.png
index d6be0ec..c9329f8 100644
Binary files a/data/weapon/cluster_bomb/clusterbomb_ico.png and b/data/weapon/cluster_bomb/clusterbomb_ico.png differ
diff --git a/data/weapon/cluzooka/cluster.png b/data/weapon/cluzooka/cluster.png
index 977948a..1d6e934 100644
Binary files a/data/weapon/cluzooka/cluster.png and b/data/weapon/cluzooka/cluster.png differ
diff --git a/data/weapon/cluzooka/cluz_ico.png b/data/weapon/cluzooka/cluz_ico.png
index 8c35f8c..401aea3 100644
Binary files a/data/weapon/cluzooka/cluz_ico.png and b/data/weapon/cluzooka/cluz_ico.png differ
diff --git a/data/weapon/cluzooka/dark_bazooka.png b/data/weapon/cluzooka/dark_bazooka.png
index edc59cd..065a1b3 100644
Binary files a/data/weapon/cluzooka/dark_bazooka.png and b/data/weapon/cluzooka/dark_bazooka.png differ
diff --git a/data/weapon/construct/construct_icon.png b/data/weapon/construct/construct_icon.png
index 9800204..751bdad 100644
Binary files a/data/weapon/construct/construct_icon.png and b/data/weapon/construct/construct_icon.png differ
diff --git a/data/weapon/construct/construct_spr.png b/data/weapon/construct/construct_spr.png
index 2255151..e72a772 100644
Binary files a/data/weapon/construct/construct_spr.png and b/data/weapon/construct/construct_spr.png differ
diff --git a/data/weapon/disco_grenade/disco_grenade.png b/data/weapon/disco_grenade/disco_grenade.png
index 41eadea..b31ed71 100644
Binary files a/data/weapon/disco_grenade/disco_grenade.png and b/data/weapon/disco_grenade/disco_grenade.png differ
diff --git a/data/weapon/disco_grenade/disco_grenade_ico.png b/data/weapon/disco_grenade/disco_grenade_ico.png
index 86d4cce..f16644f 100644
Binary files a/data/weapon/disco_grenade/disco_grenade_ico.png and b/data/weapon/disco_grenade/disco_grenade_ico.png differ
diff --git a/data/weapon/dynamite/dynamite.png b/data/weapon/dynamite/dynamite.png
index a9ee22b..827d3d8 100644
Binary files a/data/weapon/dynamite/dynamite.png and b/data/weapon/dynamite/dynamite.png differ
diff --git a/data/weapon/dynamite/dynamite_ani.png b/data/weapon/dynamite/dynamite_ani.png
index 486360d..eaded70 100644
Binary files a/data/weapon/dynamite/dynamite_ani.png and b/data/weapon/dynamite/dynamite_ani.png differ
diff --git a/data/weapon/dynamite/dynamite_ico.png b/data/weapon/dynamite/dynamite_ico.png
index 45c26ae..8690e3b 100644
Binary files a/data/weapon/dynamite/dynamite_ico.png and b/data/weapon/dynamite/dynamite_ico.png differ
diff --git a/data/weapon/flamethrower/flame_ico.png b/data/weapon/flamethrower/flame_ico.png
index ba1e556..23969f3 100644
Binary files a/data/weapon/flamethrower/flame_ico.png and b/data/weapon/flamethrower/flame_ico.png differ
diff --git a/data/weapon/footbomb/bilson.png b/data/weapon/footbomb/bilson.png
index 74a85a7..b0fcd38 100644
Binary files a/data/weapon/footbomb/bilson.png and b/data/weapon/footbomb/bilson.png differ
diff --git a/data/weapon/footbomb/footbomb_ico.png b/data/weapon/footbomb/footbomb_ico.png
index 615e072..827d997 100644
Binary files a/data/weapon/footbomb/footbomb_ico.png and b/data/weapon/footbomb/footbomb_ico.png differ
diff --git a/data/weapon/gnu/gnu.png b/data/weapon/gnu/gnu.png
index 6576af9..23907bf 100644
Binary files a/data/weapon/gnu/gnu.png and b/data/weapon/gnu/gnu.png differ
diff --git a/data/weapon/gnu/gnu_ico.png b/data/weapon/gnu/gnu_ico.png
index 02a9b28..71f0ecf 100644
Binary files a/data/weapon/gnu/gnu_ico.png and b/data/weapon/gnu/gnu_ico.png differ
diff --git a/data/weapon/gnu/gnulauncher.png b/data/weapon/gnu/gnulauncher.png
index e596e40..52f9fd1 100644
Binary files a/data/weapon/gnu/gnulauncher.png and b/data/weapon/gnu/gnulauncher.png differ
diff --git a/data/weapon/grapple/grapple.png b/data/weapon/grapple/grapple.png
index 3707adc..0de3e15 100644
Binary files a/data/weapon/grapple/grapple.png and b/data/weapon/grapple/grapple.png differ
diff --git a/data/weapon/grapple/grapple_hook.png b/data/weapon/grapple/grapple_hook.png
index b1d90f3..335d1f4 100644
Binary files a/data/weapon/grapple/grapple_hook.png and b/data/weapon/grapple/grapple_hook.png differ
diff --git a/data/weapon/grapple/grapple_ico.png b/data/weapon/grapple/grapple_ico.png
index a17671b..e13ce34 100644
Binary files a/data/weapon/grapple/grapple_ico.png and b/data/weapon/grapple/grapple_ico.png differ
diff --git a/data/weapon/grapple/grapple_node.png b/data/weapon/grapple/grapple_node.png
index 1f420c9..a3de145 100644
Binary files a/data/weapon/grapple/grapple_node.png and b/data/weapon/grapple/grapple_node.png differ
diff --git a/data/weapon/grenade/grenade.png b/data/weapon/grenade/grenade.png
index d867e10..47c3b01 100644
Binary files a/data/weapon/grenade/grenade.png and b/data/weapon/grenade/grenade.png differ
diff --git a/data/weapon/grenade/grenade_ico.png b/data/weapon/grenade/grenade_ico.png
index 94903cb..946f8f6 100644
Binary files a/data/weapon/grenade/grenade_ico.png and b/data/weapon/grenade/grenade_ico.png differ
diff --git a/data/weapon/gun/gun.png b/data/weapon/gun/gun.png
index 1c9d460..918f402 100644
Binary files a/data/weapon/gun/gun.png and b/data/weapon/gun/gun.png differ
diff --git a/data/weapon/gun/gun_bullet.png b/data/weapon/gun/gun_bullet.png
index d72892e..345893c 100644
Binary files a/data/weapon/gun/gun_bullet.png and b/data/weapon/gun/gun_bullet.png differ
diff --git a/data/weapon/gun/gun_ico.png b/data/weapon/gun/gun_ico.png
index 42cdbd3..98f147f 100644
Binary files a/data/weapon/gun/gun_ico.png and b/data/weapon/gun/gun_ico.png differ
diff --git a/data/weapon/jet_pack/jet_pack_ico.png b/data/weapon/jet_pack/jet_pack_ico.png
index 2bc93ef..5ab764a 100644
Binary files a/data/weapon/jet_pack/jet_pack_ico.png and b/data/weapon/jet_pack/jet_pack_ico.png differ
diff --git a/data/weapon/lowgrav/lowgrav_ico.png b/data/weapon/lowgrav/lowgrav_ico.png
index 68df762..e749173 100644
Binary files a/data/weapon/lowgrav/lowgrav_ico.png and b/data/weapon/lowgrav/lowgrav_ico.png differ
diff --git a/data/weapon/m16/m16_ico.png b/data/weapon/m16/m16_ico.png
index 5c8f706..67a15a5 100644
Binary files a/data/weapon/m16/m16_ico.png and b/data/weapon/m16/m16_ico.png differ
diff --git a/data/weapon/mine/mine.png b/data/weapon/mine/mine.png
index bee123c..504547c 100644
Binary files a/data/weapon/mine/mine.png and b/data/weapon/mine/mine.png differ
diff --git a/data/weapon/mine/mine_anim.png b/data/weapon/mine/mine_anim.png
index 5e5dd16..034463f 100644
Binary files a/data/weapon/mine/mine_anim.png and b/data/weapon/mine/mine_anim.png differ
diff --git a/data/weapon/mine/mine_ico.png b/data/weapon/mine/mine_ico.png
index aff03b2..54877d4 100644
Binary files a/data/weapon/mine/mine_ico.png and b/data/weapon/mine/mine_ico.png differ
diff --git a/data/weapon/mine/mine_impact.png b/data/weapon/mine/mine_impact.png
index 4c1e383..3c78533 100644
Binary files a/data/weapon/mine/mine_impact.png and b/data/weapon/mine/mine_impact.png differ
diff --git a/data/weapon/parachute/parachute.png b/data/weapon/parachute/parachute.png
index eaaae84..9baa500 100644
Binary files a/data/weapon/parachute/parachute.png and b/data/weapon/parachute/parachute.png differ
diff --git a/data/weapon/parachute/parachute_ico.png b/data/weapon/parachute/parachute_ico.png
index 6a176ea..28562e8 100644
Binary files a/data/weapon/parachute/parachute_ico.png and b/data/weapon/parachute/parachute_ico.png differ
diff --git a/data/weapon/polecat/polecat.png b/data/weapon/polecat/polecat.png
index 11050df..efbedf5 100644
Binary files a/data/weapon/polecat/polecat.png and b/data/weapon/polecat/polecat.png differ
diff --git a/data/weapon/polecat/polecat_fart.png b/data/weapon/polecat/polecat_fart.png
index 178df62..af2e351 100644
Binary files a/data/weapon/polecat/polecat_fart.png and b/data/weapon/polecat/polecat_fart.png differ
diff --git a/data/weapon/polecat/polecat_ico.png b/data/weapon/polecat/polecat_ico.png
index 982dab0..fd36e51 100644
Binary files a/data/weapon/polecat/polecat_ico.png and b/data/weapon/polecat/polecat_ico.png differ
diff --git a/data/weapon/polecat/polecatlauncher.png b/data/weapon/polecat/polecatlauncher.png
index 11050df..c8df367 100644
Binary files a/data/weapon/polecat/polecatlauncher.png and b/data/weapon/polecat/polecatlauncher.png differ
diff --git a/data/weapon/riot_bomb/riot_ico.png b/data/weapon/riot_bomb/riot_ico.png
index 6d6d4c9..421a48f 100644
Binary files a/data/weapon/riot_bomb/riot_ico.png and b/data/weapon/riot_bomb/riot_ico.png differ
diff --git a/data/weapon/shotgun/buckshot.png b/data/weapon/shotgun/buckshot.png
index a21ed14..ee860e9 100644
Binary files a/data/weapon/shotgun/buckshot.png and b/data/weapon/shotgun/buckshot.png differ
diff --git a/data/weapon/shotgun/shotgun_ico.png b/data/weapon/shotgun/shotgun_ico.png
index db905f6..1d771ba 100644
Binary files a/data/weapon/shotgun/shotgun_ico.png and b/data/weapon/shotgun/shotgun_ico.png differ
diff --git a/data/weapon/skip_turn/skipturn.png b/data/weapon/skip_turn/skipturn.png
index 2488b60..cc583b6 100644
Binary files a/data/weapon/skip_turn/skipturn.png and b/data/weapon/skip_turn/skipturn.png differ
diff --git a/data/weapon/skip_turn/skipturn_ico.png b/data/weapon/skip_turn/skipturn_ico.png
index 3666c5c..cc4cb53 100644
Binary files a/data/weapon/skip_turn/skipturn_ico.png and b/data/weapon/skip_turn/skipturn_ico.png differ
diff --git a/data/weapon/slap/slap.png b/data/weapon/slap/slap.png
new file mode 100644
index 0000000..23ca4a4
Binary files /dev/null and b/data/weapon/slap/slap.png differ
diff --git a/data/weapon/slap/slap_ico.png b/data/weapon/slap/slap_ico.png
new file mode 100644
index 0000000..7138d41
Binary files /dev/null and b/data/weapon/slap/slap_ico.png differ
diff --git a/data/weapon/snipe_rifle/snipe_rifle_ico.png b/data/weapon/snipe_rifle/snipe_rifle_ico.png
index b091407..61ce25a 100644
Binary files a/data/weapon/snipe_rifle/snipe_rifle_ico.png and b/data/weapon/snipe_rifle/snipe_rifle_ico.png differ
diff --git a/data/weapon/snipe_rifle/snipe_rifle_laser.png b/data/weapon/snipe_rifle/snipe_rifle_laser.png
index ee37a04..eb6b0bf 100644
Binary files a/data/weapon/snipe_rifle/snipe_rifle_laser.png and b/data/weapon/snipe_rifle/snipe_rifle_laser.png differ
diff --git a/data/weapon/suicide/suicide.png b/data/weapon/suicide/suicide.png
index 7553569..b636ed8 100644
Binary files a/data/weapon/suicide/suicide.png and b/data/weapon/suicide/suicide.png differ
diff --git a/data/weapon/suicide/suicide_ico.png b/data/weapon/suicide/suicide_ico.png
index 95725d8..ba5c140 100644
Binary files a/data/weapon/suicide/suicide_ico.png and b/data/weapon/suicide/suicide_ico.png differ
diff --git a/data/weapon/supertux/superman.png b/data/weapon/supertux/superman.png
index 7c2cb7a..fa69549 100644
Binary files a/data/weapon/supertux/superman.png and b/data/weapon/supertux/superman.png differ
diff --git a/data/weapon/supertux/supertux.png b/data/weapon/supertux/supertux.png
index 6c68a79..52b4306 100644
Binary files a/data/weapon/supertux/supertux.png and b/data/weapon/supertux/supertux.png differ
diff --git a/data/weapon/supertux/supertux_ico.png b/data/weapon/supertux/supertux_ico.png
index 5ff3343..2fdaa65 100644
Binary files a/data/weapon/supertux/supertux_ico.png and b/data/weapon/supertux/supertux_ico.png differ
diff --git a/data/weapon/syringe/syringe.png b/data/weapon/syringe/syringe.png
index 53ef7bf..a96edc7 100644
Binary files a/data/weapon/syringe/syringe.png and b/data/weapon/syringe/syringe.png differ
diff --git a/data/weapon/syringe/syringe_ico.png b/data/weapon/syringe/syringe_ico.png
index 51a8b77..11922a6 100644
Binary files a/data/weapon/syringe/syringe_ico.png and b/data/weapon/syringe/syringe_ico.png differ
diff --git a/data/weapon/teleportation/teleportation_ico.png b/data/weapon/teleportation/teleportation_ico.png
index 798086b..6554b61 100644
Binary files a/data/weapon/teleportation/teleportation_ico.png and b/data/weapon/teleportation/teleportation_ico.png differ
diff --git a/data/weapons.xml b/data/weapons.xml
index 1f9c052..93a7026 100644
--- a/data/weapons.xml
+++ b/data/weapons.xml
@@ -9,7 +9,10 @@
   </sprite>
 
   <sprite name="smoke_explosion">
-    <image file="object/smoke3.png" />
+    <image file="object/smoke3.png">
+      <grid pos="0,0" size="150,150" array="4,1"/>
+    </image>
+    <animation speed="50"/>
   </sprite>
 
   <sprite name="ill_bubble">
@@ -54,7 +57,11 @@
     <image file="gfx/water/lava_drop.png" />
   </sprite>
 
-<!-- Air attack ressources -->
+  <sprite name="radioactive_drop">
+    <image file="gfx/water/radioactive_drop.png" />
+  </sprite>
+
+  <!-- Air attack ressources -->
 
   <surface name="air_attack_ico" file="weapon/air_attack/air_attack_ico.png" />
   <surface name="air_attack" file="weapon/air_attack/air_attack.png" />
@@ -191,8 +198,8 @@
 
   <surface name="gun_ico" file="weapon/gun/gun_ico.png" />
   <surface name="gun" file="weapon/gun/gun.png" />
-  <position name="gun" origin="hand" x="4" y="8" />
-  <hole name="gun" dx="18" dy="-5" />
+  <position name="gun" origin="hand" x="5" y="10" />
+  <hole name="gun" dx="18" dy="-6" />
   <surface name="gun_fire" file="weapon/gun/gun_fire.png" />
   <sprite name="gun_bullet">
     <image file="weapon/gun/gun_bullet.png" />
@@ -234,13 +241,13 @@
 
   <surface name="polecatlauncher_ico" file="weapon/polecat/polecat_ico.png" />
   <surface name="polecatlauncher" file="weapon/polecat/polecatlauncher.png" />
-  <position name="polecatlauncher" origin="hand" x="20" y="20" />
+  <position name="polecatlauncher" origin="hand" x="26" y="18" />
   <sprite name="polecat_fart">
     <image file="weapon/polecat/polecat_fart.png" />
   </sprite>
   <sprite name="polecat">
     <image file="weapon/polecat/polecat.png">
-      <grid pos="0,0" size="47,38" array="1,1" />
+      <grid pos="0,0" size="52,25" array="1,1" />
     </image>
     <animation speed="35" loop_mode="pingpong" />
   </sprite>
@@ -262,8 +269,9 @@
   <position name="minelauncher" origin="hand" x="4" y="4" />
   <sprite name="mine">
     <image file="weapon/mine/mine_anim.png">
-      <grid pos="0,0" size="16,8" array="2,1" />
+      <grid pos="0,0" size="16,16" array="2,1" />
     </image>
+    <animation speed="300" loop_mode="1" />
   </sprite>
   <surface name="mine_impact" file="weapon/mine/mine_impact.png" />
 
@@ -299,6 +307,12 @@
   <surface name="skip_turn" file="weapon/skip_turn/skipturn.png" />
   <position name="skip_turn" origin="over" x="0" y="5" />
 
+<!-- Slap resources -->
+
+  <surface name="slap_ico" file="weapon/slap/slap_ico.png" />
+  <surface name="slap" file="weapon/slap/slap.png" />
+  <position name="slap" origin="hand" x="4" y="7" />
+
 <!-- Suicide ressources -->
 
   <surface name="suicide_ico" file="weapon/suicide/suicide_ico.png" />
@@ -312,9 +326,9 @@
   <position name="tux" origin="hand" x="1" y="11" />
   <sprite name="supertux">
     <image file="weapon/supertux/superman.png">
-      <grid pos="0,0" size="23,37" array="2,1" />
+      <grid pos="0,0" size="23,38" array="2,1" />
     </image>
-    <animation speed="800"/>
+    <animation speed="80"/>
   </sprite>
 
 <!-- Teleportation ressources -->
diff --git a/data/wormux.desktop b/data/wormux.desktop
index 3743ae3..8034349 100644
--- a/data/wormux.desktop
+++ b/data/wormux.desktop
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
+Name=Wormux
 Type=Application
 Icon=wormux_128x128.png
 Exec=wormux
 Terminal=false
 StartupNotify=false
-
-Name=Wormux
 GenericName=Arcade Game
 GenericName[pl]=Gra zręcznościowa
 Comment=A 2D game where funny characters launch funny weapons
@@ -17,5 +16,5 @@ Comment[fr_FR]=Un jeu en 2D où de drôles de personnages s'étripent joyeusemen
 Comment[it]=Un gioco in 2D dove dei simpatici personaggi si sparano allegramente
 Comment[pl]=Gra 2D, w której zabawne postacie używają zabawnego uzbojenia
 Comment[ro]=Un joc în 2D în care personaje amuzante lansează arme amuzante
-
 Categories=Game;ArcadeGame;
+GenericName[fr_FR]=Arcade Game
diff --git a/data/wormux_default_config.xml b/data/wormux_default_config.xml
index be53d7a..888e424 100644
--- a/data/wormux_default_config.xml
+++ b/data/wormux_default_config.xml
@@ -2,7 +2,7 @@
 <resources>
 
 <section name="default_video_mode">
-  <int name="number_of_resolution_available" value="9" />
+  <int name="number_of_resolution_available" value="8" />
   <point name="1" x="1680" y="1050" />
   <point name="2" x="1600" y="1200" />
   <point name="3" x="1400" y="1050" />
@@ -11,7 +11,6 @@
   <point name="6" x="800"  y="600"  />
   <point name="7" x="800"  y="480"  />
   <point name="8" x="640"  y="480"  />
-  <point name="9" x="320"  y="240"  />
 </section>
 
 <section name="default_keyboard_layout">
@@ -23,5 +22,5 @@
   <language name="fa" file="terafik.ttf" relative="true" />
 </section>
 -->
-  
+
 </resources>
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0c3912a..caae2a9 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -51,27 +47,26 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 man6dir = $(mandir)/man6
 am__installdirs = "$(DESTDIR)$(man6dir)"
 NROFF = nroff
 MANS = $(man6_MANS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
-AUTOPACKAGE_FALSE = @AUTOPACKAGE_FALSE@
-AUTOPACKAGE_TRUE = @AUTOPACKAGE_TRUE@
 AWK = @AWK@
 BUILD_ENV = @BUILD_ENV@
 CC = @CC@
@@ -93,13 +88,10 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FONTFILE = @FONTFILE@
-GCC_FALSE = @GCC_FALSE@
-GCC_TRUE = @GCC_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-INCLUDEDINTL_FALSE = @INCLUDEDINTL_FALSE@
-INCLUDEDINTL_TRUE = @INCLUDEDINTL_TRUE@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -118,6 +110,7 @@ LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -137,23 +130,19 @@ SDL_GFX_PREFIX = @SDL_GFX_PREFIX@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STATIC_FALSE = @STATIC_FALSE@
-STATIC_TRUE = @STATIC_TRUE@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WIN32_FALSE = @WIN32_FALSE@
-WIN32_TRUE = @WIN32_TRUE@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 _libcurl_config = @_libcurl_config@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -165,6 +154,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cxx_present = @cxx_present@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -193,12 +183,15 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = .
 man6_MANS = wormux.man
 EXTRA_DIST = $(man6_MANS)
@@ -234,10 +227,9 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-man6: $(man6_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man6dir)" || $(mkdir_p) "$(DESTDIR)$(man6dir)"
+	test -z "$(man6dir)" || $(MKDIR_P) "$(DESTDIR)$(man6dir)"
 	@list='$(man6_MANS) $(dist_man6_MANS) $(nodist_man6_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -312,8 +304,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -357,8 +348,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -383,8 +374,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -394,13 +385,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -414,22 +404,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -443,7 +432,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -451,6 +440,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -461,7 +452,7 @@ all-am: Makefile $(MANS)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(man6dir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -507,12 +498,20 @@ info-am:
 
 install-data-am: install-man
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man: install-man6
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -531,24 +530,26 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-man
-
-uninstall-info: uninstall-info-recursive
+uninstall-am: uninstall-man
 
 uninstall-man: uninstall-man6
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-man6 install-strip installcheck installcheck-am \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man6 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-man uninstall-man6
+	uninstall-man uninstall-man6
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/howto_play/de.pdf b/doc/howto_play/de.pdf
index 5fbde65..f94debb 100644
Binary files a/doc/howto_play/de.pdf and b/doc/howto_play/de.pdf differ
diff --git a/doc/howto_play/en.pdf b/doc/howto_play/en.pdf
index 0054179..b9e8d01 100644
Binary files a/doc/howto_play/en.pdf and b/doc/howto_play/en.pdf differ
diff --git a/doc/howto_play/fr.pdf b/doc/howto_play/fr.pdf
index 9e3d682..2881645 100644
Binary files a/doc/howto_play/fr.pdf and b/doc/howto_play/fr.pdf differ
diff --git a/doc/howto_play/pl.pdf b/doc/howto_play/pl.pdf
index 8d99c57..a93304e 100644
Binary files a/doc/howto_play/pl.pdf and b/doc/howto_play/pl.pdf differ
diff --git a/doc/howto_play/sk.pdf b/doc/howto_play/sk.pdf
index bfc5775..ebbf7e1 100644
Binary files a/doc/howto_play/sk.pdf and b/doc/howto_play/sk.pdf differ
diff --git a/doc/howto_play/sv.pdf b/doc/howto_play/sv.pdf
index e661391..28e8f53 100644
Binary files a/doc/howto_play/sv.pdf and b/doc/howto_play/sv.pdf differ
diff --git a/mac/build_wormux_fink.sh b/mac/build_wormux_fink.sh
deleted file mode 100755
index 89871e0..0000000
--- a/mac/build_wormux_fink.sh
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/sh -e
-
-# script to build a Mac OS X clickable .app
-
-# To use this file, first install all the Wormux dependencies.
-# Using Fink is a good way to manage the various libraries.
-# You will need:
-# glib2-dev glib2-shlibs glibmm2.4-dev glibmm2.4 libcurl4 libcurl4-shlibs
-# libgettext3-dev libgettext3-shlibs gettext-tools libiconv-dev libiconv
-# libpng3 libpng3-shlibs libsigc++2 libsigc++2-shlibs libxml++2 libxml++2-shlibs
-# libxml2 libxml2-shlibs sdl sdl-shlibs sdl-gfx13 sdl-gfx13-shlibs
-# sdl-image sdl-image-shlibs sdl-mixer sdl-mixer-shlibs
-# sdl-net sdl-net-shlibs sdl-ttf sdl-ttf-shlibs
-#
-# There's a chance you might also need smpeg smpeg-shlibs libssh2.1
-# libssh2.1-shlibs, but only install them if the wormux build complains
-# about them.
-
-# The svn package is also needed in order to download the wormux source
-
-# To use, simply run this script from the parent directory where
-# the wormux source code is kept (eg /src).
-# cd /src
-# sh ./build_wormux_svn.sh
-
-export HERE=`pwd`
-
-export PROG_NAME=wormux
-export BUNDLE_NAME=Wormux
-export APP_VERSION=0.8
-
-export SOURCE_DIR=${HERE}/..
-export FINK_PATH=/sw/bin:/sw/sbin
-#export  OTHER_PATH=/src/usr/local-${ARCH}/bin
-export PATH=${FINK_PATH}:/bin:/sbin:/usr/bin:/usr/sbin
-export CONFIGURE_PARAMS="--disable-sdltest"
-
-export APP_DIR="${SOURCE_DIR}/${BUNDLE_NAME}.app"
-
-export CNT_TARGET=${APP_DIR}/Contents
-
-export MACOS_TARGET=${CNT_TARGET}/MacOS
-export RSC_TARGET=${CNT_TARGET}/Resources
-
-
-
-export CFLAGS=-I/sw/include 
-export LDFLAGS=-L/sw/lib 
-export CXXFLAGS=$CFLAGS 
-export CPPFLAGS=$CXXFLAGS 
-export ACLOCAL_FLAGS="-I /sw/share/aclocal"
-export PKG_CONFIG_PATH="/sw/lib/pkgconfig"
-export MACOSX_DEPLOYMENT_TARGET=10.4
-
-
-# Get the new source
-echo ""
-echo "Calling svn to fetch new/changed files."
-echo ""
-
-if [ ! -e ${SOURCE_DIR} ] ; then
-	echo "Could not find the wormux source code";
-	echo "I will download a new source tree using SVN";
-	export OLD_SVN=2456;
-#	svn co http://svn.gna.org/svn/wormux/trunk ${SOURCE_DIR};
-	cd ${SOURCE_DIR};
-	if [ ! -e data/wormux_128x128.icns ]; then
-		/usr/bin/curl -o ${SOURCE_DIR}/data/wormux_128x128.icns "http://snaggledworks.com/software/wormux/wormux_128x128.icns";
-		/usr/bin/curl -o ${SOURCE_DIR}/mac/Info.plist.in "http://snaggledworks.com/software/wormux/Info.plist.in";
-		/usr/bin/curl -o ${SOURCE_DIR}/mac/PkgInfo.in "http://snaggledworks.com/software/wormux/PkgInfo.in";
-	fi
-else
-	cd ${SOURCE_DIR};
-	export OLD_SVN=`svn info | grep Revision | cut -d ' ' -f 2`;
-	#svn up;
-fi
-
-export NEW_SVN=`svn info | grep Revision | cut -d ' ' -f 2`
-
-if [ ${OLD_SVN} = ${NEW_SVN} ] ; then
-	echo "The source has not changed since the last SVN build (revision ${OLD_SVN}).";
-	echo "A new binary will not be built.";
-#	exit 0;
-fi
-
-APP_VERSION=${APP_VERSION}-${NEW_SVN}
-
-#./build_wormux_perso.sh
-
-# configure the source
-
-#./autogen.sh
-
-echo ""
-echo "Configuring the build settings using " ${CONFIGURE_PARAMS}
-echo ""
-
-#./configure ${CONFIGURE_PARAMS}
-
-#/usr/bin/make -w clean
-#/usr/bin/make -w
-
-echo ""
-echo "Done building the source"
-echo "The .app bundle will now be created"
-echo ""
-
-# Build .app bundle
-echo "Creating application bundle       ${APP_DIR}"
-/bin/rm -rf ${APP_DIR}
-/usr/bin/install -d -m 755 "${APP_DIR}"
-
-# Contents 
-echo "Creating Contents target          ${CNT_TARGET}"
-/usr/bin/install -d -m 755 ${CNT_TARGET}
-
-echo "Installing Info.plist."
-/usr/bin/sed -e "s|%VERS%|${APP_VERSION}|g;s|%SERIAL%|${NEW_SVN}|g" mac/Info.plist.in > ${CNT_TARGET}/Info.plist
-
-echo "Installing PkgInfo."
-/usr/bin/install -m 644 mac/PkgInfo.in ${CNT_TARGET}/PkgInfo
-
-echo "Creating MacOS target             ${MACOS_TARGET}"
-/usr/bin/install -d -m 755 ${MACOS_TARGET}
-
-echo "Copying executable from           ${SOURCE_DIR}/src"
-/usr/bin/install -m 755 ${SOURCE_DIR}/src/${PROG_NAME} ${MACOS_TARGET}/${PROG_NAME}
-
-echo "Stripping executable              ${PROG_NAME}"
-/usr/bin/strip ${MACOS_TARGET}/${PROG_NAME}
-
-
-
-# Copy the .dylibs that are linked by the program
-echo "Copying the shared libraries to   ${MACOS_TARGET}"
-for i in `${OTOOL} -L ${MACOS_TARGET}/${PROG_NAME} | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-    ${CP} -p ${i} ${MACOS_TARGET};
-    echo "Copied `basename ${i}`";
-    ${INSTALL_NAME_TOOL} -change ${i} @executable_path/`basename ${i}` ${MACOS_TARGET}/${PROG_NAME};
-    echo "Changed `basename ${i}` in ${PROG_NAME}";
-    # now check paths for other libraries linked by the copied libraries.
-    for j in `${OTOOL} -L ${i} | grep version | cut -f 1 -d ' '| grep -v ${i} | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-        if [ ! -e ${MACOS_TARGET}/`basename ${j}` ] ; then
-            ${CP} -p ${j} ${MACOS_TARGET};
-            echo "  Copied `basename ${j}`";
-            for k in `${OTOOL} -L ${j} | grep version | cut -f 1 -d ' '| grep -v ${j} | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-                if [ ! -e ${MACOS_TARGET}/`basename ${k}` ] ; then
-                    ${CP} -p ${k} ${MACOS_TARGET};
-                    echo "    Copied `basename ${k}`";
-                    for l in `${OTOOL} -L ${j} | grep version | cut -f 1 -d ' '| grep -v ${j} | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-                        if [ ! -e ${MACOS_TARGET}/`basename ${l}` ] ; then
-                            ${CP} -p ${l} ${MACOS_TARGET};
-                            echo "      Copied `basename ${l}`";
-                        fi
-                    done
-                fi
-            done
-        fi
-    done
-done
-
-# Fix the install locations for the dylibs
-echo "Modifying the linked libraries in ${MACOS_TARGET}"
-for b in `${LS} -1 ${MACOS_TARGET}/*.dylib` ; do
-    echo "Modifying `basename ${b}`"
-    ${INSTALL_NAME_TOOL} -id @executable_path/`basename ${b}` ${MACOS_TARGET}/`basename ${b}`;
-    for c in `otool -L ${b} | grep version | cut -f 1 -d ' ' | grep -v \`basename ${b}\` | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-        ${INSTALL_NAME_TOOL} -change ${c} @executable_path/`basename ${c}` ${MACOS_TARGET}/`basename ${b}`;
-        echo "  Changed `basename ${c}` in `basename ${b}`";
-    done
-done
-
-
-
-
-# Create resources directory
-echo "Creating Resources target         ${RSC_TARGET}"
-/usr/bin/install -d -m 755 ${RSC_TARGET}
-
-# Install data files
-echo "Copying data files to             ${RSC_TARGET}/data"
-/usr/bin/make -w -C ${SOURCE_DIR}/data -e install-nobase_dist_pkgdataDATA pkgdatadir=${RSC_TARGET}/data
-#DESTDIR=${RSC_TARGET}/ pkgdatadir=data /usr/bin/make -w -C ${SOURCE_DIR}/data -e install
-
-# Install the locale files
-echo "Copying locale files to           ${RSC_TARGET}/locale"
-/usr/bin/make -w -C ${SOURCE_DIR}/po -e all-local-yes DESTDIR=${RSC_TARGET}
-/usr/bin/make -w -C ${SOURCE_DIR}/po -e install-data-local-yes localedir=${RSC_TARGET}/locale
-
-# Copy .APP Icon
-echo "Copying icon from                 ${SOURCE_DIR}/data"
-/usr/bin/install -m 644 ${SOURCE_DIR}/data/wormux_128x128.icns ${RSC_TARGET}/${BUNDLE_NAME}.icns
-
-echo ""
-echo "The final ${BUNDLE_NAME}.app bundle is now complete"
-echo ""
-
-echo ""
-echo "Creating the distributable disk image"
-echo ""
-DMG_TARGET="${BUNDLE_NAME} ${APP_VERSION}"
-
-/bin/rm -f ${SOURCE_DIR}/${BUNDLE_NAME}-${APP_VERSION}-`uname -p`.dmg
-/usr/bin/hdiutil create -type SPARSE -size 85m -fs HFS+ -volname "${DMG_TARGET}" -attach ${BUNDLE_NAME}-${APP_VERSION}.sparseimage
-/bin/cp -R ${APP_DIR} "/Volumes/${DMG_TARGET}"
-
-svn log -r ${OLD_SVN}:${NEW_SVN} > "/Volumes/${DMG_TARGET}/Changelog.txt"
-
-echo ""
-echo "All files have been copied to the disk image /Volumes/${DMG_TARGET}"
-echo ""
-
-/usr/bin/hdiutil unmount "/Volumes/${DMG_TARGET}"
-/usr/bin/hdiutil convert -imagekey zlib-level=9 -format UDZO ${BUNDLE_NAME}-${APP_VERSION}.sparseimage -o ${BUNDLE_NAME}-${APP_VERSION}-`uname -p`.dmg
-/bin/rm -f ${BUNDLE_NAME}-${APP_VERSION}.sparseimage
-
-echo ""
-echo "Done building a distributable disk image for ${BUNDLE_NAME} ${APP_VERSION}."
-echo "The disk image can be found at the root of the"
-echo "build directory `pwd`"
-echo "as '${BUNDLE_NAME}-${APP_VERSION}-`uname -p`.dmg'."
-
-exit 0
-
-#EOF
-
diff --git a/mac/build_wormux_first.sh b/mac/build_wormux_first.sh
deleted file mode 100755
index acb9601..0000000
--- a/mac/build_wormux_first.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-export CFLAGS=-I/sw/include 
-export LDFLAGS=-L/sw/lib 
-export CXXFLAGS=$CFLAGS 
-export CPPFLAGS=$CXXFLAGS 
-export ACLOCAL_FLAGS="-I /sw/share/aclocal"
-export PKG_CONFIG_PATH="/sw/lib/pkgconfig"
-export MACOSX_DEPLOYMENT_TARGET=10.4
-
-export CP=/bin/cp
-export HDIUTIL=/usr/bin/hdiutil
-export INSTALL=/usr/bin/install
-export INSTALL_NAME_TOOL=/usr/bin/install_name_tool
-export LS=/bin/ls
-export MAKE=/usr/bin/make
-export OTOOL=/usr/bin/otool
-export RM=/bin/rm
-
-#cd wormux
-cd ..
-svn up
-make clean
-./autogen.sh
-./configure --enable-debug
-make -w
-
-
-
-echo "*******************************************"
-echo "lauch build_wormux_(fink/macports) script !"
-echo "*******************************************"
-cd mac 
-# Macports / Fink
-# Fink : comment the second line
-# Macports : comment the first line
-./build_wormux_fink.sh
-#./build_wormux_macports.sh
diff --git a/mac/build_wormux_macports.sh b/mac/build_wormux_macports.sh
deleted file mode 100755
index 27a7a13..0000000
--- a/mac/build_wormux_macports.sh
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/bin/sh -e
-
-# script to build a Mac OS X clickable .app
-
-# To use this file, first install all the Wormux dependencies.
-# Using Fink is a good way to manage the various libraries.
-# You will need:
-# glib2-dev glib2-shlibs glibmm2.4-dev glibmm2.4 libcurl4 libcurl4-shlibs
-# libgettext3-dev libgettext3-shlibs gettext-tools libiconv-dev libiconv
-# libpng3 libpng3-shlibs libsigc++2 libsigc++2-shlibs libxml++2 libxml++2-shlibs
-# libxml2 libxml2-shlibs sdl sdl-shlibs sdl-gfx13 sdl-gfx13-shlibs
-# sdl-image sdl-image-shlibs sdl-mixer sdl-mixer-shlibs
-# sdl-net sdl-net-shlibs sdl-ttf sdl-ttf-shlibs
-#
-# There's a chance you might also need smpeg smpeg-shlibs libssh2.1
-# libssh2.1-shlibs, but only install them if the wormux build complains
-# about them.
-
-# The svn package is also needed in order to download the wormux source
-
-# To use, simply run this script from the parent directory where
-# the wormux source code is kept (eg /src).
-# cd /src
-# sh ./build_wormux_svn.sh
-
-export HERE=`pwd`
-
-export PROG_NAME=wormux
-export BUNDLE_NAME=Wormux
-export APP_VERSION=0.8svn
-
-if [ -d '/sw' ];
-then
-	EXTRA_PATH=/sw/bin:/sw/sbin
-	EXTRA_CFLAGS=-I/sw/include
-	EXTRA_LDFLAGS=-L/sw/lib
-	EXTRA_ACLOCAL_FLAGS="-I /sw/share/aclocal"
-	EXTRA_PKG_CONFIG_PATH="/sw/lib/pkgconfig"
-elif [ -d '/opt/local' ];
-then
-	EXTRA_PATH=/opt/local/bin:/opt/local/sbin
-	EXTRA_CFLAGS=-I/opt/local/include
-	EXTRA_LDFLAGS=-L/opt/local/lib
-	EXTRA_ACLOCAL_FLAGS="-I /opt/local/share/aclocal"
-	EXTRA_PKG_CONFIG_PATH="/opt/local/lib/pkgconfig"
-fi
-
-export SOURCE_DIR=${HERE}/..
-#export FINK_PATH=/sw/bin:/sw/sbin
-#export  OTHER_PATH=/src/usr/local-${ARCH}/bin
-#export MACPORTS_PATH=/opt/local/bin:/opt/local/sbin
-export PATH=${EXTRA_PATH}:/bin:/sbin:/usr/bin:/usr/sbin
-export CONFIGURE_PARAMS="--disable-sdltest"
-
-export APP_DIR="${SOURCE_DIR}/${BUNDLE_NAME}.app"
-
-export CNT_TARGET=${APP_DIR}/Contents
-
-export MACOS_TARGET=${CNT_TARGET}/MacOS
-export RSC_TARGET=${CNT_TARGET}/Resources
-
-
-
-export CFLAGS=${EXTRA_CFLAGS}
-export LDFLAGS=${EXTRA_LDFLAGS}
-export CXXFLAGS=$CFLAGS 
-export CPPFLAGS=$CXXFLAGS 
-export ACLOCAL_FLAGS=${EXTRA_ACLOCAL_FLAGS}
-export PKG_CONFIG_PATH=${EXTRA_PKG_CONFIG_PATH}
-export MACOSX_DEPLOYMENT_TARGET=10.4
-
-
-# Get the new source
-echo ""
-echo "Calling svn to fetch new/changed files."
-echo ""
-
-if [ ! -e ${SOURCE_DIR} ] ; then
-	echo "Could not find the wormux source code";
-	echo "I will download a new source tree using SVN";
-	export OLD_SVN=2456;
-#	svn co http://svn.gna.org/svn/wormux/trunk ${SOURCE_DIR};
-	cd ${SOURCE_DIR};
-	if [ ! -e data/wormux_128x128.icns ]; then
-		/usr/bin/curl -o ${SOURCE_DIR}/data/wormux_128x128.icns "http://snaggledworks.com/software/wormux/wormux_128x128.icns";
-		/usr/bin/curl -o ${SOURCE_DIR}/mac/Info.plist.in "http://snaggledworks.com/software/wormux/Info.plist.in";
-		/usr/bin/curl -o ${SOURCE_DIR}/mac/PkgInfo.in "http://snaggledworks.com/software/wormux/PkgInfo.in";
-	fi
-else
-	cd ${SOURCE_DIR};
-	export OLD_SVN=`svn info | grep Revision | cut -d ' ' -f 2`;
-	#svn up;
-fi
-
-export NEW_SVN=`svn info | grep Revision | cut -d ' ' -f 2`
-
-if [ ${OLD_SVN} = ${NEW_SVN} ] ; then
-	echo "The source has not changed since the last SVN build (revision ${OLD_SVN}).";
-	echo "A new binary will not be built.";
-#	exit 0;
-fi
-
-APP_VERSION=${APP_VERSION}-${NEW_SVN}
-
-#./build_wormux_perso.sh
-
-# configure the source
-
-#./autogen.sh
-
-echo ""
-echo "Configuring the build settings using " ${CONFIGURE_PARAMS}
-echo ""
-
-#./configure ${CONFIGURE_PARAMS}
-
-#/usr/bin/make -w clean
-#/usr/bin/make -w
-
-echo ""
-echo "Done building the source"
-echo "The .app bundle will now be created"
-echo ""
-
-# Build .app bundle
-echo "Creating application bundle       ${APP_DIR}"
-/bin/rm -rf ${APP_DIR}
-/usr/bin/install -d -m 755 "${APP_DIR}"
-
-# Contents 
-echo "Creating Contents target          ${CNT_TARGET}"
-/usr/bin/install -d -m 755 ${CNT_TARGET}
-
-echo "Installing Info.plist."
-/usr/bin/sed -e "s|%VERS%|${APP_VERSION}|g;s|%SERIAL%|${NEW_SVN}|g" mac/Info.plist.in > ${CNT_TARGET}/Info.plist
-
-echo "Installing PkgInfo."
-/usr/bin/install -m 644 mac/PkgInfo.in ${CNT_TARGET}/PkgInfo
-
-echo "Creating MacOS target             ${MACOS_TARGET}"
-/usr/bin/install -d -m 755 ${MACOS_TARGET}
-
-echo "Copying executable from           ${SOURCE_DIR}/src"
-/usr/bin/install -m 755 ${SOURCE_DIR}/src/${PROG_NAME} ${MACOS_TARGET}/${PROG_NAME}
-
-echo "Stripping executable              ${PROG_NAME}"
-/usr/bin/strip ${MACOS_TARGET}/${PROG_NAME}
-
-
-# Copy the .dylibs that are linked by the program
-echo "Copying the shared libraries to   ${MACOS_TARGET}"
-for i in `${OTOOL} -L ${MACOS_TARGET}/${PROG_NAME} | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-    ${CP} -p ${i} ${MACOS_TARGET};
-    echo "Copied `basename ${i}`";
-    ${INSTALL_NAME_TOOL} -change ${i} @executable_path/`basename ${i}` ${MACOS_TARGET}/${PROG_NAME};
-    echo "Changed `basename ${i}` in ${PROG_NAME}";
-    # now check paths for other libraries linked by the copied libraries.
-    for j in `${OTOOL} -L ${i} | grep version | cut -f 1 -d ' '| grep -v ${i} | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-        if [ ! -e ${MACOS_TARGET}/`basename ${j}` ] ; then
-            ${CP} -p ${j} ${MACOS_TARGET};
-            echo "  Copied `basename ${j}`";
-            for k in `${OTOOL} -L ${j} | grep version | cut -f 1 -d ' '| grep -v ${j} | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-                if [ ! -e ${MACOS_TARGET}/`basename ${k}` ] ; then
-                    ${CP} -p ${k} ${MACOS_TARGET};
-                    echo "    Copied `basename ${k}`";
-                    for l in `${OTOOL} -L ${j} | grep version | cut -f 1 -d ' '| grep -v ${j} | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-                        if [ ! -e ${MACOS_TARGET}/`basename ${l}` ] ; then
-                            ${CP} -p ${l} ${MACOS_TARGET};
-                            echo "      Copied `basename ${l}`";
-                        fi
-                    done
-                fi
-            done
-        fi
-    done
-done
-
-# Fix the install locations for the dylibs
-echo "Modifying the linked libraries in ${MACOS_TARGET}"
-for b in `${LS} -1 ${MACOS_TARGET}/*.dylib` ; do
-    echo "Modifying `basename ${b}`"
-    ${INSTALL_NAME_TOOL} -id @executable_path/`basename ${b}` ${MACOS_TARGET}/`basename ${b}`;
-    for c in `otool -L ${b} | grep version | cut -f 1 -d ' ' | grep -v \`basename ${b}\` | grep -v \/System\/Library | grep -v \/usr\/lib` ; do
-        ${INSTALL_NAME_TOOL} -change ${c} @executable_path/`basename ${c}` ${MACOS_TARGET}/`basename ${b}`;
-        echo "  Changed `basename ${c}` in `basename ${b}`";
-    done
-done
-
-
-
-# Create resources directory
-echo "Creating Resources target         ${RSC_TARGET}"
-/usr/bin/install -d -m 755 ${RSC_TARGET}
-
-# Install data files
-echo "Copying data files to             ${RSC_TARGET}/data"
-/usr/bin/make -w -C ${SOURCE_DIR}/data -e install-nobase_dist_pkgdataDATA pkgdatadir=${RSC_TARGET}/data
-#DESTDIR=${RSC_TARGET}/ pkgdatadir=data /usr/bin/make -w -C ${SOURCE_DIR}/data -e install
-
-# Install the locale files
-echo "Copying locale files to           ${RSC_TARGET}/locale"
-/usr/bin/make -w -C ${SOURCE_DIR}/po -e all-local-yes DESTDIR=${RSC_TARGET}
-/usr/bin/make -w -C ${SOURCE_DIR}/po -e install-data-local-yes localedir=${RSC_TARGET}/locale
-
-# Copy .APP Icon
-echo "Copying icon from                 ${SOURCE_DIR}/data"
-/usr/bin/install -m 644 ${SOURCE_DIR}/data/wormux_128x128.icns ${RSC_TARGET}/${BUNDLE_NAME}.icns
-
-echo ""
-echo "The final ${BUNDLE_NAME}.app bundle is now complete"
-echo ""
-
-echo ""
-echo "Creating the distributable disk image"
-echo ""
-DMG_TARGET="${BUNDLE_NAME} ${APP_VERSION}"
-
-/bin/rm -f ${SOURCE_DIR}/${BUNDLE_NAME}-${APP_VERSION}-`uname -p`.dmg
-/usr/bin/hdiutil create -type SPARSE -size 85m -fs HFS+ -volname "${DMG_TARGET}" -attach ${BUNDLE_NAME}-${APP_VERSION}.sparseimage
-/bin/cp -R ${APP_DIR} "/Volumes/${DMG_TARGET}"
-
-svn log -r ${OLD_SVN}:${NEW_SVN} > "/Volumes/${DMG_TARGET}/Changelog"
-
-echo ""
-echo "All files have been copied to the disk image /Volumes/${DMG_TARGET}"
-echo ""
-
-/usr/bin/hdiutil unmount "/Volumes/${DMG_TARGET}"
-/usr/bin/hdiutil convert -imagekey zlib-level=9 -format UDZO ${BUNDLE_NAME}-${APP_VERSION}.sparseimage -o ${BUNDLE_NAME}-${APP_VERSION}-`uname -p`.dmg
-/bin/rm -f ${BUNDLE_NAME}-${APP_VERSION}.sparseimage
-
-echo ""
-echo "Done building a distributable disk image for ${BUNDLE_NAME} ${APP_VERSION}."
-echo "The disk image can be found at the root of the"
-echo "build directory `pwd`"
-echo "as '${BUNDLE_NAME}-${APP_VERSION}-`uname -p`.dmg'."
-
-exit 0
-
-#EOF
-
diff --git a/mac/cmake_build.sh b/mac/cmake_build.sh
new file mode 100755
index 0000000..98cc0d8
--- /dev/null
+++ b/mac/cmake_build.sh
@@ -0,0 +1,267 @@
+#!/bin/sh
+
+#################################################
+#  Script for compile with cmake under MacOS X  #
+#           For     W O R M U X                 #
+#           done by Plorf, Auria,               #
+#         lynxlynxlynx and Snaggle              #
+#################################################
+
+
+#
+# Set environment for compile
+#
+
+MAC=`pwd`/
+ROOT=${MAC}../
+SRC=${ROOT}src/
+
+
+# Set up build flags
+# to build as universal, add 'universal' as the first
+# command line parameter when running this script
+# eg ./cmake_build.sh universal
+
+export MACOSX_DEPLOYMENT_TARGET=10.4
+export FAT_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 -I/Developer/SDKs/MacOSX10.4u.sdk/usr/include"
+export FAT_LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib"
+
+APP_VERSION=0.8.1
+BUNDLE_NAME=Wormux
+DMG_TARGET="${BUNDLE_NAME}-${APP_VERSION}"
+DMG_OUT=${BUNDLE_NAME}-${APP_VERSION}-`uname -p`
+
+
+if [ "$1" = "--help" ]
+then
+    echo "targets :"
+    echo "./cmake_build universal : build a universal app and his dmg file"
+    echo "./cmake_build -j<x> : launch make with x threads"
+    echo "./cmake_build universal -j<x> : launch make with x threads for build universal"
+    exit 1
+fi
+
+
+
+if [ $# = 1 ]
+then
+    if [ "$1" = "universal" ]
+    then
+        echo "*******************************"
+        echo ""
+        echo "Universal build mode enabled !"
+        echo ""
+        echo "*******************************"
+        export CFLAGS="${FAT_CFLAGS} ${CFLAGS}"
+        export CXXFLAGS="${CFLAGS}"
+        export LDFLAGS="${FAT_LDFLAGS} ${LDFLAGS}"
+        BUNDLE_NAME=Wormux
+        DMG_OUT=${BUNDLE_NAME}-${APP_VERSION}-Universal
+    else
+        NBTHREADS=$1
+        echo "Launch with ${NBTHREADS} !"
+    fi
+fi
+
+if [ $# = 2 ]
+then
+    if [ "$1" = "universal" ]
+    then
+        TMP1=${1}
+        TMP2=${2}
+    else
+        TMP2=${1}
+        TMP1=${2}
+    fi
+        echo "*******************************"
+        echo ""
+        echo "Universal build mode enabled !"
+        echo ""
+        echo "*******************************"
+        export CFLAGS="${FAT_CFLAGS} ${CFLAGS}"
+        export CXXFLAGS="${CFLAGS}"
+        export LDFLAGS="${FAT_LDFLAGS} ${LDFLAGS}"
+        BUNDLE_NAME=Wormux
+        DMG_OUT=${BUNDLE_NAME}-${APP_VERSION}-Universal
+
+        NBTHREADS=$TMP2
+        echo "Launch with ${NBTHREADS} !"
+fi
+
+
+#
+# Set files for CMake and compilation
+#
+
+# Copy the library libSDLmain_UB.a
+if [ -e libSDLmain_UB.a ]
+then
+    cp libSDLmain_UB.a ${ROOT}
+else
+    echo "*** ${MAC}libSDLmain_UB.a Not Found ***"
+    exit
+fi
+
+# Copy the librarie libintl.a
+if [ -e libintl.a ]
+then
+    cp libintl.a ${ROOT}
+else
+    echo "*** ${MAC}libintl.a Not Found ***"
+    exit
+fi
+
+
+#
+# Clean temps files, and create Folders
+#
+
+TMP=${MAC}tmpbuild/
+if [ -e ${TMP} ]
+then
+    echo "*****************"
+    echo "Clean tmpbuild"
+    rm -rf ${TMP}
+    echo "*****************"
+fi
+mkdir ${TMP}
+
+APP=${MAC}Wormux.app
+if [ -e ${APP} ]
+then
+    echo "******************"
+    echo "Clean package Wormux.app"
+    rm -rf ${APP}
+    echo "******************"
+fi
+
+if [ -e ${DMG_OUT}.app ]
+then
+    echo "******************"
+    echo "Clean package ${DMG_OUT}.app"
+    rm -rf ${DMG_OUT}.app
+    echo "******************"
+fi
+
+if [ -e ${DMG_OUT}.dmg ]
+then
+    echo "******************"
+    echo "Clean package ${DMG_OUT}.dmg"
+    rm -rf ${DMG_OUT}.dmg
+    echo "******************"
+fi
+
+echo "Create Wormux.app file"
+mkdir -p ${APP}
+mkdir -p ${APP}/Contents/MacOS/
+mkdir -p ${APP}/Contents/Frameworks/
+RES=${APP}/Contents/Resources/
+mkdir -p ${RES}data/
+mkdir -p ${RES}locale/
+
+# Add icon and info.plist and PkgInfo
+cp ${MAC}Info.plist.in ${APP}/Contents/Info.plist
+cp ${MAC}PkgInfo.in ${APP}/Contents/PkgInfo
+cp ${ROOT}data/wormux_128x128.icns ${RES}Wormux.icns
+
+
+#export CMAKE_INSTALL_PREFIX=${RES}
+
+#
+# Compile
+#
+
+cd ${TMP}
+
+if ! cmake ../.. --graphviz=viz.dot -DDATA_PATH=${RES} -DBIN_PATH=${APP}/Contents/MacOS/ -DBUILD=Release -DPREFIX=${RES}
+then
+    echo "CMake error"
+    exit 1
+fi
+
+if ! make ${NBTHREADS} 
+then
+    echo "make ${NBTHREADS} error"
+    exit 1
+fi
+if ! make install
+then
+    echo "make install error"
+    exit 1
+fi
+
+
+#
+# Generate .app File
+#
+
+
+mv ${RES}/share/locale ${RES}
+rm -rf ${RES}/share
+
+# Do a simple test for check if data is well copied
+if [ -e ${RES}/data/wormux_default_config.xml ]
+then
+    echo "Default_config ok"
+else
+    echo "*** ERROR : No Default_config ! : Probably no datas copied ***"
+    exit 2 
+fi
+
+
+#
+# Copy frameworks into package
+#
+
+echo "Copy all frameworks"
+cd ${MAC};
+
+# If frameworks are not available, they'll be download from this mirror
+MIRROR=http://plorf.homeip.net/wormux/lib/
+if [ ! -e "${MAC}frameworks.tar.bz2" ]
+then 
+    echo "Frameworks will be downloaded from ${MIRROR} (3MB)";
+    curl ${MIRROR}frameworks.tar.bz2 -o ${MAC}frameworks.tar.bz2;
+fi
+    tar xfj ${MAC}frameworks.tar.bz2 -C ${APP}/Contents/Frameworks;
+    echo "Frameworks copy done"
+
+
+#
+# Make .dmg file
+#
+
+echo ""
+echo "Creating the distributable disk image"
+echo ""
+
+/bin/mv ${APP} ${DMG_OUT}.app
+APP=${DMG_OUT}.app
+
+/usr/bin/hdiutil create -type SPARSE -size 85m -fs HFS+ -volname "${DMG_TARGET}" -attach ${BUNDLE_NAME}-${APP_VERSION}.sparseimage
+/bin/cp -R ${APP} "/Volumes/${DMG_TARGET}"
+
+/usr/bin/hdiutil unmount "/Volumes/${DMG_TARGET}"
+/usr/bin/hdiutil convert -imagekey zlib-level=9 -format UDZO ${BUNDLE_NAME}-${APP_VERSION}.sparseimage -o ${DMG_OUT}.dmg
+/bin/rm -f ${BUNDLE_NAME}-${APP_VERSION}.sparseimage
+
+
+#
+# Clean environment
+#
+
+# Remove copy of libSDLmain_UB.a
+if [ -e ${ROOT}libSDLmain_UB.a ]
+then
+    rm ${ROOT}libSDLmain_UB.a
+fi
+
+# Remove copy of libintl.a
+if [ -e ${ROOT}libintl.a ]
+then
+    rm ${ROOT}libintl.a
+fi
+
+echo "Build done"
+
+exit 0
diff --git a/po/Makefile.am b/po/Makefile.am
index 3738949..78c619b 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -25,6 +25,8 @@ POTFILES = \
         src/character/character.h \
         src/character/clothe.cpp \
         src/character/clothe.h \
+        src/character/damage_stats.cpp \
+        src/character/damage_stats.h \
         src/character/member.cpp \
         src/character/member.h \
         src/character/move.cpp \
@@ -34,9 +36,14 @@ POTFILES = \
         src/config.h \
         src/game/config.cpp \
         src/game/config.h \
+        src/game/game_blitz.cpp \
+        src/game/game_blitz.h \
+        src/game/game_classic.cpp \
+        src/game/game_classic.h \
         src/game/game.cpp \
         src/game/game.h \
         src/game/game_init.cpp \
+        src/game/game_init.h \
         src/game/game_mode.cpp \
         src/game/game_mode.h \
         src/game/time.cpp \
@@ -44,8 +51,11 @@ POTFILES = \
         src/graphic/color.cpp \
         src/graphic/color.h \
         src/graphic/colors.h \
+        src/graphic/composite_shape.cpp \
+        src/graphic/composite_shape.h \
         src/graphic/effects.cpp \
         src/graphic/effects.h \
+        src/graphic/fading_effect.h \
         src/graphic/font.cpp \
         src/graphic/font.h \
         src/graphic/fps.cpp \
@@ -71,6 +81,9 @@ POTFILES = \
         src/graphic/textured_polygon.h \
         src/graphic/video.cpp \
         src/graphic/video.h \
+        src/gui/abstract_spin_button.h \
+        src/gui/big/button_pic.cpp \
+        src/gui/big/button_pic.h \
         src/gui/box.cpp \
         src/gui/box.h \
         src/gui/button.cpp \
@@ -79,9 +92,13 @@ POTFILES = \
         src/gui/button_text.h \
         src/gui/check_box.cpp \
         src/gui/check_box.h \
+        src/gui/combo_box.cpp \
+        src/gui/combo_box.h \
         src/gui/container.h \
         src/gui/energy_bar.cpp \
         src/gui/energy_bar.h \
+        src/gui/file_list_box.cpp \
+        src/gui/file_list_box.h \
         src/gui/label.cpp \
         src/gui/label.h \
         src/gui/list_box.cpp \
@@ -105,8 +122,10 @@ POTFILES = \
         src/gui/spin_button.h \
         src/gui/spin_button_picture.cpp \
         src/gui/spin_button_picture.h \
-	src/gui/tabs.cpp \
-	src/gui/tabs.h \
+        src/gui/tabs.cpp \
+        src/gui/tabs.h \
+        src/gui/talk_box.cpp \
+        src/gui/talk_box.h \
         src/gui/text_box.cpp \
         src/gui/text_box.h \
         src/gui/widget.cpp \
@@ -122,17 +141,25 @@ POTFILES = \
         src/include/binreloc.h \
         src/include/constant.cpp \
         src/include/constant.h \
+        src/include/singleton.cpp \
+        src/include/singleton.h \
         src/interface/cursor.cpp \
         src/interface/cursor.h \
         src/interface/game_msg.cpp \
         src/interface/game_msg.h \
         src/interface/interface.cpp \
         src/interface/interface.h \
+        src/interface/joystick.cpp \
+        src/interface/joystick.h \
         src/interface/keyboard.cpp \
         src/interface/keyboard.h \
         src/interface/loading_screen.cpp \
         src/interface/loading_screen.h \
+        src/interface/man_machine_interface.cpp \
+        src/interface/man_machine_interface.h \
         src/interface/mouse.cpp \
+        src/interface/mouse_cursor.cpp \
+        src/interface/mouse_cursor.h \
         src/interface/mouse.h \
         src/interface/weapon_menu.cpp \
         src/interface/weapon_menu.h \
@@ -145,6 +172,8 @@ POTFILES = \
         src/map/map.h \
         src/map/maps_list.cpp \
         src/map/maps_list.h \
+        src/map/random_map.cpp \
+        src/map/random_map.h \
         src/map/sky.cpp \
         src/map/sky.h \
         src/map/tile.cpp \
@@ -159,6 +188,10 @@ POTFILES = \
         src/menu/credits_menu.h \
         src/menu/game_menu.cpp \
         src/menu/game_menu.h \
+        src/menu/game_mode_editor.cpp \
+        src/menu/game_mode_editor.h \
+        src/menu/help_menu.cpp \
+        src/menu/help_menu.h \
         src/menu/main_menu.cpp \
         src/menu/main_menu.h \
         src/menu/map_selection_box.cpp \
@@ -177,10 +210,16 @@ POTFILES = \
         src/menu/pause_menu.h \
         src/menu/results_menu.cpp \
         src/menu/results_menu.h \
+        src/menu/skin_menu.cpp \
+        src/menu/skin_menu.h \
         src/menu/team_box.cpp \
         src/menu/team_box.h \
         src/menu/teams_selection_box.cpp \
         src/menu/teams_selection_box.h \
+        src/msvc/config.h \
+        src/msvc/getopt.h \
+        src/network/admin_commands.cpp \
+        src/network/admin_commands.h \
         src/network/chat.cpp \
         src/network/chat.h \
         src/network/chatlogger.cpp \
@@ -192,12 +231,22 @@ POTFILES = \
         src/network/index_server.cpp \
         src/network/index_server.h \
         src/network/index_svr_msg.h \
+        src/network/irc.cpp \
+        src/network/irc.h \
         src/network/net_error_msg.cpp \
         src/network/net_error_msg.h \
+        src/network/network_client.cpp \
+        src/network/network_client.h \
         src/network/network.cpp \
         src/network/network.h \
+        src/network/network_local.cpp \
+        src/network/network_local.h \
+        src/network/network_server.cpp \
+        src/network/network_server.h \
         src/network/randomsync.cpp \
         src/network/randomsync.h \
+        src/network/socket.cpp \
+        src/network/socket.h \
         src/object/barrel.cpp \
         src/object/barrel.h \
         src/object/bonus_box.cpp \
@@ -242,8 +291,18 @@ POTFILES = \
         src/particles/star.h \
         src/particles/teleport_member.cpp \
         src/particles/teleport_member.h \
+        src/particles/water_drop.cpp \
+        src/particles/water_drop.h \
         src/sound/jukebox.cpp \
         src/sound/jukebox.h \
+        src/sound/sample_cache.cpp \
+        src/sound/sample_cache.h \
+        src/sound/sound_sample.cpp \
+        src/sound/sound_sample.h \
+        src/team/custom_team.cpp \
+        src/team/custom_team.h \
+        src/team/custom_teams_list.cpp \
+        src/team/custom_teams_list.h \
         src/team/macro.h \
         src/team/results.cpp \
         src/team/results.h \
@@ -256,6 +315,8 @@ POTFILES = \
         src/team/teams_list.h \
         src/tool/affine_transform.cpp \
         src/tool/affine_transform.h \
+        src/tool/copynpaste.cpp \
+        src/tool/copynpaste.h \
         src/tool/debug.cpp \
         src/tool/debug.h \
         src/tool/error.cpp \
@@ -266,6 +327,7 @@ POTFILES = \
         src/tool/file_tools.h \
         src/tool/i18n.cpp \
         src/tool/i18n.h \
+        src/tool/isnan.h \
         src/tool/math_tools.h \
         src/tool/point.h \
         src/tool/random.cpp \
@@ -277,6 +339,8 @@ POTFILES = \
         src/tool/stats.h \
         src/tool/string_tools.cpp \
         src/tool/string_tools.h \
+        src/tool/text_handling.cpp \
+        src/tool/text_handling.h \
         src/tool/vector2.h \
         src/tool/xml_document.cpp \
         src/tool/xml_document.h \
@@ -297,10 +361,10 @@ POTFILES = \
         src/weapon/blowtorch.h \
         src/weapon/bounce_ball.cpp \
         src/weapon/bounce_ball.h \
-        src/weapon/cluzooka.cpp src/weapon/cluzooka.h \
-        src/weapon/footbomb.cpp src/weapon/footbomb.h \
         src/weapon/cluster_bomb.cpp \
         src/weapon/cluster_bomb.h \
+        src/weapon/cluzooka.cpp \
+        src/weapon/cluzooka.h \
         src/weapon/construct.cpp \
         src/weapon/construct.h \
         src/weapon/crosshair.cpp \
@@ -313,6 +377,8 @@ POTFILES = \
         src/weapon/explosion.h \
         src/weapon/flamethrower.cpp \
         src/weapon/flamethrower.h \
+        src/weapon/footbomb.cpp \
+        src/weapon/footbomb.h \
         src/weapon/gnu.cpp \
         src/weapon/gnu.h \
         src/weapon/grapple.cpp \
@@ -337,6 +403,8 @@ POTFILES = \
         src/weapon/shotgun.h \
         src/weapon/skip_turn.cpp \
         src/weapon/skip_turn.h \
+        src/weapon/slap.cpp \
+        src/weapon/slap.h \
         src/weapon/snipe_rifle.cpp \
         src/weapon/snipe_rifle.h \
         src/weapon/submachine_gun.cpp \
@@ -357,6 +425,7 @@ POTFILES = \
         src/weapon/weapon_launcher.h \
         src/weapon/weapons_list.cpp \
         src/weapon/weapons_list.h \
+        src/weapon/weapon_strength_bar.h \
         tools/index_server/client.cpp \
         tools/index_server/client.h \
         tools/index_server/clock.cpp \
@@ -374,7 +443,7 @@ POTFILES = \
         tools/index_server/stat.cpp \
         tools/index_server/stat.h \
         tools/index_server/sync_slave.cpp \
-        tools/index_server/sync_slave.h
+        tools/index_server/sync_slave.h 
 
 DOMAIN = $(PACKAGE)
 
diff --git a/po/Makefile.in b/po/Makefile.in
index 3bd3257..c4f0b28 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,15 +20,11 @@
 #
 # Makefile configuration - processed by automake.
 #
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -58,14 +54,10 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
-AUTOPACKAGE_FALSE = @AUTOPACKAGE_FALSE@
-AUTOPACKAGE_TRUE = @AUTOPACKAGE_TRUE@
 AWK = @AWK@
 BUILD_ENV = @BUILD_ENV@
 CC = @CC@
@@ -87,13 +79,10 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FONTFILE = @FONTFILE@
-GCC_FALSE = @GCC_FALSE@
-GCC_TRUE = @GCC_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-INCLUDEDINTL_FALSE = @INCLUDEDINTL_FALSE@
-INCLUDEDINTL_TRUE = @INCLUDEDINTL_TRUE@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -112,6 +101,7 @@ LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -131,23 +121,19 @@ SDL_GFX_PREFIX = @SDL_GFX_PREFIX@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STATIC_FALSE = @STATIC_FALSE@
-STATIC_TRUE = @STATIC_TRUE@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WIN32_FALSE = @WIN32_FALSE@
-WIN32_TRUE = @WIN32_TRUE@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 _libcurl_config = @_libcurl_config@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -159,6 +145,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cxx_present = @cxx_present@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -187,12 +174,15 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #MAINTAINERCLEANFILES = Makefile.in
 MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
@@ -213,6 +203,8 @@ POTFILES = \
         src/character/character.h \
         src/character/clothe.cpp \
         src/character/clothe.h \
+        src/character/damage_stats.cpp \
+        src/character/damage_stats.h \
         src/character/member.cpp \
         src/character/member.h \
         src/character/move.cpp \
@@ -222,9 +214,14 @@ POTFILES = \
         src/config.h \
         src/game/config.cpp \
         src/game/config.h \
+        src/game/game_blitz.cpp \
+        src/game/game_blitz.h \
+        src/game/game_classic.cpp \
+        src/game/game_classic.h \
         src/game/game.cpp \
         src/game/game.h \
         src/game/game_init.cpp \
+        src/game/game_init.h \
         src/game/game_mode.cpp \
         src/game/game_mode.h \
         src/game/time.cpp \
@@ -232,8 +229,11 @@ POTFILES = \
         src/graphic/color.cpp \
         src/graphic/color.h \
         src/graphic/colors.h \
+        src/graphic/composite_shape.cpp \
+        src/graphic/composite_shape.h \
         src/graphic/effects.cpp \
         src/graphic/effects.h \
+        src/graphic/fading_effect.h \
         src/graphic/font.cpp \
         src/graphic/font.h \
         src/graphic/fps.cpp \
@@ -259,6 +259,9 @@ POTFILES = \
         src/graphic/textured_polygon.h \
         src/graphic/video.cpp \
         src/graphic/video.h \
+        src/gui/abstract_spin_button.h \
+        src/gui/big/button_pic.cpp \
+        src/gui/big/button_pic.h \
         src/gui/box.cpp \
         src/gui/box.h \
         src/gui/button.cpp \
@@ -267,9 +270,13 @@ POTFILES = \
         src/gui/button_text.h \
         src/gui/check_box.cpp \
         src/gui/check_box.h \
+        src/gui/combo_box.cpp \
+        src/gui/combo_box.h \
         src/gui/container.h \
         src/gui/energy_bar.cpp \
         src/gui/energy_bar.h \
+        src/gui/file_list_box.cpp \
+        src/gui/file_list_box.h \
         src/gui/label.cpp \
         src/gui/label.h \
         src/gui/list_box.cpp \
@@ -293,8 +300,10 @@ POTFILES = \
         src/gui/spin_button.h \
         src/gui/spin_button_picture.cpp \
         src/gui/spin_button_picture.h \
-	src/gui/tabs.cpp \
-	src/gui/tabs.h \
+        src/gui/tabs.cpp \
+        src/gui/tabs.h \
+        src/gui/talk_box.cpp \
+        src/gui/talk_box.h \
         src/gui/text_box.cpp \
         src/gui/text_box.h \
         src/gui/widget.cpp \
@@ -310,17 +319,25 @@ POTFILES = \
         src/include/binreloc.h \
         src/include/constant.cpp \
         src/include/constant.h \
+        src/include/singleton.cpp \
+        src/include/singleton.h \
         src/interface/cursor.cpp \
         src/interface/cursor.h \
         src/interface/game_msg.cpp \
         src/interface/game_msg.h \
         src/interface/interface.cpp \
         src/interface/interface.h \
+        src/interface/joystick.cpp \
+        src/interface/joystick.h \
         src/interface/keyboard.cpp \
         src/interface/keyboard.h \
         src/interface/loading_screen.cpp \
         src/interface/loading_screen.h \
+        src/interface/man_machine_interface.cpp \
+        src/interface/man_machine_interface.h \
         src/interface/mouse.cpp \
+        src/interface/mouse_cursor.cpp \
+        src/interface/mouse_cursor.h \
         src/interface/mouse.h \
         src/interface/weapon_menu.cpp \
         src/interface/weapon_menu.h \
@@ -333,6 +350,8 @@ POTFILES = \
         src/map/map.h \
         src/map/maps_list.cpp \
         src/map/maps_list.h \
+        src/map/random_map.cpp \
+        src/map/random_map.h \
         src/map/sky.cpp \
         src/map/sky.h \
         src/map/tile.cpp \
@@ -347,6 +366,10 @@ POTFILES = \
         src/menu/credits_menu.h \
         src/menu/game_menu.cpp \
         src/menu/game_menu.h \
+        src/menu/game_mode_editor.cpp \
+        src/menu/game_mode_editor.h \
+        src/menu/help_menu.cpp \
+        src/menu/help_menu.h \
         src/menu/main_menu.cpp \
         src/menu/main_menu.h \
         src/menu/map_selection_box.cpp \
@@ -365,10 +388,16 @@ POTFILES = \
         src/menu/pause_menu.h \
         src/menu/results_menu.cpp \
         src/menu/results_menu.h \
+        src/menu/skin_menu.cpp \
+        src/menu/skin_menu.h \
         src/menu/team_box.cpp \
         src/menu/team_box.h \
         src/menu/teams_selection_box.cpp \
         src/menu/teams_selection_box.h \
+        src/msvc/config.h \
+        src/msvc/getopt.h \
+        src/network/admin_commands.cpp \
+        src/network/admin_commands.h \
         src/network/chat.cpp \
         src/network/chat.h \
         src/network/chatlogger.cpp \
@@ -380,12 +409,22 @@ POTFILES = \
         src/network/index_server.cpp \
         src/network/index_server.h \
         src/network/index_svr_msg.h \
+        src/network/irc.cpp \
+        src/network/irc.h \
         src/network/net_error_msg.cpp \
         src/network/net_error_msg.h \
+        src/network/network_client.cpp \
+        src/network/network_client.h \
         src/network/network.cpp \
         src/network/network.h \
+        src/network/network_local.cpp \
+        src/network/network_local.h \
+        src/network/network_server.cpp \
+        src/network/network_server.h \
         src/network/randomsync.cpp \
         src/network/randomsync.h \
+        src/network/socket.cpp \
+        src/network/socket.h \
         src/object/barrel.cpp \
         src/object/barrel.h \
         src/object/bonus_box.cpp \
@@ -430,8 +469,18 @@ POTFILES = \
         src/particles/star.h \
         src/particles/teleport_member.cpp \
         src/particles/teleport_member.h \
+        src/particles/water_drop.cpp \
+        src/particles/water_drop.h \
         src/sound/jukebox.cpp \
         src/sound/jukebox.h \
+        src/sound/sample_cache.cpp \
+        src/sound/sample_cache.h \
+        src/sound/sound_sample.cpp \
+        src/sound/sound_sample.h \
+        src/team/custom_team.cpp \
+        src/team/custom_team.h \
+        src/team/custom_teams_list.cpp \
+        src/team/custom_teams_list.h \
         src/team/macro.h \
         src/team/results.cpp \
         src/team/results.h \
@@ -444,6 +493,8 @@ POTFILES = \
         src/team/teams_list.h \
         src/tool/affine_transform.cpp \
         src/tool/affine_transform.h \
+        src/tool/copynpaste.cpp \
+        src/tool/copynpaste.h \
         src/tool/debug.cpp \
         src/tool/debug.h \
         src/tool/error.cpp \
@@ -454,6 +505,7 @@ POTFILES = \
         src/tool/file_tools.h \
         src/tool/i18n.cpp \
         src/tool/i18n.h \
+        src/tool/isnan.h \
         src/tool/math_tools.h \
         src/tool/point.h \
         src/tool/random.cpp \
@@ -465,6 +517,8 @@ POTFILES = \
         src/tool/stats.h \
         src/tool/string_tools.cpp \
         src/tool/string_tools.h \
+        src/tool/text_handling.cpp \
+        src/tool/text_handling.h \
         src/tool/vector2.h \
         src/tool/xml_document.cpp \
         src/tool/xml_document.h \
@@ -485,10 +539,10 @@ POTFILES = \
         src/weapon/blowtorch.h \
         src/weapon/bounce_ball.cpp \
         src/weapon/bounce_ball.h \
-        src/weapon/cluzooka.cpp src/weapon/cluzooka.h \
-        src/weapon/footbomb.cpp src/weapon/footbomb.h \
         src/weapon/cluster_bomb.cpp \
         src/weapon/cluster_bomb.h \
+        src/weapon/cluzooka.cpp \
+        src/weapon/cluzooka.h \
         src/weapon/construct.cpp \
         src/weapon/construct.h \
         src/weapon/crosshair.cpp \
@@ -501,6 +555,8 @@ POTFILES = \
         src/weapon/explosion.h \
         src/weapon/flamethrower.cpp \
         src/weapon/flamethrower.h \
+        src/weapon/footbomb.cpp \
+        src/weapon/footbomb.h \
         src/weapon/gnu.cpp \
         src/weapon/gnu.h \
         src/weapon/grapple.cpp \
@@ -525,6 +581,8 @@ POTFILES = \
         src/weapon/shotgun.h \
         src/weapon/skip_turn.cpp \
         src/weapon/skip_turn.h \
+        src/weapon/slap.cpp \
+        src/weapon/slap.h \
         src/weapon/snipe_rifle.cpp \
         src/weapon/snipe_rifle.h \
         src/weapon/submachine_gun.cpp \
@@ -545,6 +603,7 @@ POTFILES = \
         src/weapon/weapon_launcher.h \
         src/weapon/weapons_list.cpp \
         src/weapon/weapons_list.h \
+        src/weapon/weapon_strength_bar.h \
         tools/index_server/client.cpp \
         tools/index_server/client.h \
         tools/index_server/clock.cpp \
@@ -562,7 +621,7 @@ POTFILES = \
         tools/index_server/stat.cpp \
         tools/index_server/stat.h \
         tools/index_server/sync_slave.cpp \
-        tools/index_server/sync_slave.h
+        tools/index_server/sync_slave.h 
 
 DOMAIN = $(PACKAGE)
 COPYRIGHT_HOLDER = Wormux Development Team
@@ -628,7 +687,6 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -637,22 +695,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -714,12 +771,20 @@ info-am:
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -738,17 +803,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am html html-am \
 	info info-am install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-local maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	pdf-am ps ps-am uninstall uninstall-am uninstall-local
 
 
 .po.gmo:
diff --git a/po/bg.po b/po/bg.po
index 45d7bd3..14ecf71 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bg\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2007-02-19 03:27+0100\n"
-"Last-Translator: Stefan Kachaunov <mindless at data.bg>\n"
-"Language-Team: Bulgarian <mindless at data.bg>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-08 19:18+0200\n"
+"Last-Translator: Dragomir Todorov <thedeadly91 at yahoo.com>\n"
+"Language-Team: Bulgarian <thedeadly91 at yahoo.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,92 +20,97 @@ msgstr ""
 "X-Poedit-Language: Bulgarian\n"
 "X-Poedit-Country: BULGARIA\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
-msgstr "! Не мога да намеря картата %s =("
+msgstr "! Не мога да намеря картата %s :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
-msgstr[0] "%i Spieler verbunden"
-msgstr[1] "%i Spieler verbunden"
+msgstr[0] "Играчът %i се свърза"
+msgstr[1] "Играчите %i се свързаха"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
-msgstr[0] "%i Spieler bereit"
-msgstr[1] "%i Spieler bereit"
+msgstr[0] "Играчът %i е готов"
+msgstr[1] "Играчите %i са готови"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s от %s си го отнесе..."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> познат и като %s от %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> от %s"
 
-#: src/menu/team_box.cpp:79
-#, fuzzy, c-format
+#: src/menu/team_box.cpp:217
+#, c-format
 msgid "%s Team"
-msgstr "Отбори"
+msgstr "%s Отбор"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
-msgstr ""
-
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s направи жестока жертва!"
+msgstr "Отбор  %s - Отдалечен"
 
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s от %s се самоуби!"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "%s от отбора %s умря."
+
+#: src/game/game.cpp:709
+#, c-format
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s от отбора %s падна във водата!"
+
+#: src/game/game.cpp:703
+#, c-format
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s от отбора %s изпадна извън картата!"
+
+#: src/game/game.cpp:724
 #, c-format
-msgid "%s has fallen in water."
-msgstr "Добър ден за плуване а, %s ?"
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s от отбора %s се удари в земята твърде силно!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:731
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s умело уцели въздуха."
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s от отбора %s умря заради несръчността си!"
 
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
 msgid_plural "%s has won %u points of energy!"
-msgstr[0] "%s hat %u Lebenspunkt gewonnen!"
-msgstr[1] "%s hat %u Lebenspunkte gewonnen!"
+msgstr[0] "%s спечели %u точка здраве!"
+msgstr[1] "%s спечели %u точки здраве!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s е опасен, избива хора от отбора на %s!!!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s проявява сапьорска предпазливост..."
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
-msgstr "%sе близко до мина!"
+msgstr "%s е близко до мина!"
 
 #: src/object/bonus_box.cpp:97
 #, c-format
@@ -116,30 +121,30 @@ msgstr "Ехее, %s вече си имат безкрайни муниции з
 #: src/weapon/skip_turn.cpp:57
 #, c-format
 msgid "%s team has skipped its turn."
-msgstr "Отборът на %s галантно отстъпва ход..."
+msgstr "Отборът %s галантно отстъпва ход..."
 
 #: src/weapon/cluzooka.cpp:396
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u Cluster bazookas!"
 msgid_plural "%s team has won %u Cluster bazookas!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Шрапнел РПГ!"
+msgstr[1] "Отборът %s спечели %u Шрапнел РПГ-та!"
 
-#: src/weapon/gnu.cpp:174
-#, fuzzy, c-format
+#: src/weapon/gnu.cpp:175
+#, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
-msgstr[0] "%s hat %u Baseballschläger gewonnen"
-msgstr[1] "%s hat %u Baseballschläger gewonnen"
+msgstr[0] "Отборът %s спечели %u Антилопохвъргачка!"
+msgstr[1] "Отборът %s спечели %u Антилопохвъргачки."
 
-#: src/weapon/air_attack.cpp:260
-#, fuzzy, c-format
+#: src/weapon/air_attack.cpp:272
+#, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
-msgstr[0] "%s hat %u Luftangriff gewonnen"
-msgstr[1] "%s hat %u Luftangriffe gewonnen"
+msgstr[0] "Отборът %s спечели %u Бомбен набег."
+msgstr[1] "Отборът %s спечели %u Бомбени набези."
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -148,35 +153,39 @@ msgid_plural ""
 "%s team has won %u airhammers! Don't make too much noise with them! Thanks, "
 "your neighbours."
 msgstr[0] ""
+"Отборът %s спечели %u Пневматичен чук! Не вдигай много шум с него! Благодаря,"
+"съседите ти."
 msgstr[1] ""
+"Отборът %s спечели %u Пневматични чукове! Не вдигай много шум с тях! "
+"Благодаря,съседите ти."
 
-#: src/weapon/anvil.cpp:188
-#, fuzzy, c-format
+#: src/weapon/anvil.cpp:189
+#, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
-msgstr[0] "%s hat %u Luftangriff gewonnen"
-msgstr[1] "%s hat %u Luftangriffe gewonnen"
+msgstr[0] "Отборът %s спечели %u Наковалня!"
+msgstr[1] "Отборът %s спечели %u Наковални!"
 
 #: src/weapon/auto_bazooka.cpp:329
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u automatic bazooka!"
 msgid_plural "%s team has won %u automatic bazookas!"
-msgstr[0] "Mannschaft %s hat %u Lenkrakete gewonnen!"
-msgstr[1] "Mannschaft %s hat %u Lenkraketen gewonnen!"
+msgstr[0] "Отборът %s спечели %u Автоматична Базука!"
+msgstr[1] "Отборът %s спечели %u Автоматични РПГ-та!"
 
 #: src/weapon/baseball.cpp:116
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u baseball bat!"
 msgid_plural "%s team has won %u baseball bats!"
-msgstr[0] "%s hat %u Baseballschläger gewonnen"
-msgstr[1] "%s hat %u Baseballschläger gewonnen"
+msgstr[0] "Отборът %s спечели %u ОМС (Особено Мощна Сопа)!"
+msgstr[1] "Отборът %s спечели %u ОМС-и (Особено Мощни Сопи)"
 
 #: src/weapon/bazooka.cpp:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u bazooka!"
 msgid_plural "%s team has won %u bazookas!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u РПГ!"
+msgstr[1] "Отборът %s спечели %u РПГ-та!"
 
 #: src/weapon/blowtorch.cpp:137
 #, c-format
@@ -186,204 +195,236 @@ msgid_plural ""
 "%s team has won %u blowtorchs! If you're under 18, ask your parents to use "
 "it."
 msgstr[0] ""
+"Отборът %s спечели %u Горелка! Ако нямаш 18, питай родителите си как да я "
+"иползваш."
 msgstr[1] ""
+"Отборът %s спечели %u Горелки! Ако нямаш 18, питай родителите си как да ги "
+"иползваш."
 
 #: src/weapon/bounce_ball.cpp:113
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u bounce ball! Boing!"
 msgid_plural "%s team has won %u bounce balls! Boing!"
-msgstr[0] "%s hat %u Baseballschläger gewonnen"
-msgstr[1] "%s hat %u Baseballschläger gewonnen"
+msgstr[0] "Отборът %s спечели %u Супер-топче!"
+msgstr[1] "Отборът %s спечели %u Супер-топче-та!"
 
 #: src/weapon/cluster_bomb.cpp:206
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u cluster bomb!"
 msgid_plural "%s team has won %u cluster bombs!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Шрапнелна граната!"
+msgstr[1] "Отборът %s спечели %u Шрапнелни гранати!"
 
-#: src/weapon/construct.cpp:81
-#, fuzzy, c-format
+#: src/weapon/construct.cpp:82
+#, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Конструкция! Не забравяй каската си."
+msgstr[1] "Отборът %s спечели %u Конструкции! Не забравяй каската си."
 
 #: src/weapon/disco_grenade.cpp:170
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u disco grenade! Shake your body when throwing it!"
 msgid_plural ""
 "%s team has won %u disco grenades! Shake your body when throwing them!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Диско-Граната! Разкърши се когато я хвърляш!"
+msgstr[1] "Отборът %s спечели %u Диско-Гранати! Разкърши се когато ги хвърляш!"
 
 #: src/weapon/dynamite.cpp:145
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u dynamite!"
 msgid_plural "%s team has won %u dynamites!"
-msgstr[0] "Mannschaft %s hat %u Stange Dynamit gewonnen!"
-msgstr[1] "Mannschaft %s hat %u Stangen Dynamit gewonnen!"
+msgstr[0] "Отборът %s спечели %u Шашка динамит!"
+msgstr[1] "Отборът %s спечели %u Шашки динамит!"
 
 #: src/weapon/flamethrower.cpp:178
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u flame-thrower!"
 msgid_plural "%s team has won %u flame-throwers!"
-msgstr[0] "Mannschaft %s hat %u Stange Dynamit gewonnen!"
-msgstr[1] "Mannschaft %s hat %u Stangen Dynamit gewonnen!"
+msgstr[0] "Отборът %s спечели %u Огнехвъргачка."
+msgstr[1] "Отборът %s спечели %u Огнехвъргачки!"
 
 #: src/weapon/footbomb.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Футбол-бомба!"
+msgstr[1] "Отборът %s спечели %u Футбол-бомби!"
 
-#: src/weapon/grapple.cpp:783
-#, fuzzy, c-format
+#: src/weapon/grapple.cpp:809
+#, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Кука !"
+msgstr[1] "Отборът %s спечели %u Куки!"
 
 #: src/weapon/grenade.cpp:90
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u grenade!"
 msgid_plural "%s team has won %u grenades!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Ръчна граната!"
+msgstr[1] "Отборът %s спечели %u Ръчни гранати!"
 
 #: src/weapon/gun.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u gun!"
 msgid_plural "%s team has won %u guns!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Пистолет!"
+msgstr[1] "Отборът %s спечели %u Пистолета!"
 
-#: src/weapon/jetpack.cpp:239
-#, fuzzy, c-format
+#: src/weapon/jetpack.cpp:247
+#, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
-msgstr[0] "%s hat %u Luftangriff gewonnen"
-msgstr[1] "%s hat %u Luftangriffe gewonnen"
+msgstr[0] "Отборът %s спечели %u Реактивна раница! Модерно!"
+msgstr[1] "Отборът %s спечели %u Реактивни раници! Модерно!"
 
-#: src/weapon/lowgrav.cpp:78
-#, fuzzy, c-format
+#: src/weapon/lowgrav.cpp:79
+#, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Ниска гравитация! Аз съм Нийл Армстронг!"
+msgstr[1] "Отборът %s спечели %u Ниски гравитации! Аз съм Нийл Армстронг!"
 
 #: src/weapon/mine.cpp:247
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u mine!"
 msgid_plural "%s team has won %u mines!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Противопехотна мина!"
+msgstr[1] "Отборът %s спечели %u Противопехотни мини!"
 
-#: src/weapon/parachute.cpp:165
-#, fuzzy, c-format
+#: src/weapon/parachute.cpp:166
+#, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Парашут!"
+msgstr[1] "Отборът %s спечели %u Парашута!"
 
-#: src/weapon/polecat.cpp:179
-#, fuzzy, c-format
+#: src/weapon/polecat.cpp:181
+#, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Скунксохвъргачка! Взе си противогаза,нали?"
+msgstr[1] "Отборът %s спечели %u Скунксохвъргачки! Взе си противогаза,нали?"
 
 #: src/weapon/riot_bomb.cpp:133
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u riot bomb!"
 msgid_plural "%s team has won %u riot bombs!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Звуков заряд!"
+msgstr[1] "Отборът %s спечели %u Звукови заряди!"
 
 #: src/weapon/shotgun.cpp:134
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u shotgun!"
 msgid_plural "%s team has won %u shotguns!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Помпа !"
+msgstr[1] "Отборът %s спечели %u Помпи!"
 
-#: src/weapon/snipe_rifle.cpp:246
-#, fuzzy, c-format
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Отборът %s спечели %u Шамарче !"
+msgstr[1] "Отборът %s спечели %u Шамарчета!"
+
+#: src/weapon/snipe_rifle.cpp:247
+#, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
 "%s team has won %u sniper rifles! Aim and shoot between the eyes!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Снайперистка пушка! Стреляй между очите!"
+msgstr[1] "Отборът %s спечели %u Снайперистки пушки! Стреляй между очите!"
 
 #: src/weapon/submachine_gun.cpp:144
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u submachine gun!"
 msgid_plural "%s team has won %u submachine guns!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Картечен пистолет !"
+msgstr[1] "Отборът %s спечели %u Картечни пистолети !"
 
 #: src/weapon/suicide.cpp:77
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u suicide!"
 msgid_plural "%s team has won %u suicides! Use them all for an extra bonus!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Самоубийство !"
+msgstr[1] ""
+"Отборът %s спечели %u самоубийства! Използвай ги всичките за екстра бонус!\v"
 
 #: src/weapon/syringe.cpp:115
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u syringe!"
 msgid_plural "%s team has won %u syringes!"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Спринцовка с отрова!"
+msgstr[1] "Отборът %s спечели %u Спринцовки с отрова!"
 
 #: src/weapon/teleportation.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u teleportation!"
 msgid_plural "%s team has won %u teleportations!"
-msgstr[0] "Mannschaft %s hat %u Teleporter gewonnen."
-msgstr[1] "Mannschaft %s hat %u Teleporter gewonnen."
+msgstr[0] "Отборът %s спечели %u Телепортация."
+msgstr[1] "Отборът %s спечели %u Телепорации."
 
 #: src/weapon/skip_turn.cpp:68
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u turn skip! I know you'll love it."
 msgid_plural "%s team has won %u turn skips! I know you'll love them."
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] "Отборът %s спечели %u Отстъпване на хода !"
+msgstr[1] "Отборът %s спечели %u Отстъпванета на ходове !"
 
-#: src/weapon/supertux.cpp:313
-#, fuzzy, c-format
+#: src/weapon/supertux.cpp:316
+#, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
-msgstr[0] "Отборът на %s спечели %u %s !"
-msgstr[1] "Отборът на %s спечели %u %sи !"
+msgstr[0] ""
+"Отборът %s спечели %u Супер-Tux! Какво - никога ли не си виждал летящ "
+"пингвин ?"
+msgstr[1] ""
+"Отборът %s спечели %u Супер-Tux-a! Какво - никога ли не си виждал летящ "
+"пингвин ?"
+
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "Всички от отбора %s са убити."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s завлече с него в гроба войник от %s!"
 
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(мъртъв)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
-msgstr ""
+msgstr "(системен език)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
-msgstr ""
+msgstr "(незнайно време)"
 
 #. Display number of ammo
 #: src/interface/interface.cpp:196
 msgid "(unlimited)"
 msgstr "(безкраен)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
+"Новата версия %s е достъпна, докато твоята версия %s. Може да провериш дали "
+"има и ъпдейт за твоята ОС!"
+
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Добави личен отбор"
 
-#: src/weapon/air_attack.cpp:209
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Бомбен набег"
 
@@ -391,9 +432,17 @@ msgstr "Бомбен набег"
 msgid "Airhammer"
 msgstr "Пневматичен чук"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
-msgstr "Alle Mannschaften"
+msgstr "Всички отбори"
+
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Винаги"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "И победителя е..."
 
 #: src/weapon/baseball.cpp:58
 msgid ""
@@ -401,26 +450,29 @@ msgid ""
 "Fire : space key\n"
 "a hit per turn"
 msgstr ""
+"Ъгъл : Нагоре/Надолу\n"
+"Огън : space\n"
+"един удар на ход"
 
 #: src/weapon/anvil.cpp:132
 msgid "Anvil"
 msgstr "Наковалня"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Автори:"
 
 #: src/weapon/auto_bazooka.cpp:220
 msgid "Automatic Bazooka"
-msgstr "Автоматичен РПГ"
+msgstr "Автоматична РПГ"
 
 #: src/menu/pause_menu.cpp:51
 msgid "Back to battle"
-msgstr ""
+msgstr "Обратно"
 
 #: src/network/net_error_msg.cpp:42
 msgid "Bad socket ..."
-msgstr ""
+msgstr "Лошо гнездо..."
 
 #: src/weapon/baseball.cpp:57
 msgid "Baseball Bat"
@@ -430,6 +482,14 @@ msgstr "ОМС (Особено Мощна Сопа)"
 msgid "Bazooka"
 msgstr "РПГ"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Преди действие"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Светкавичен"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Горелка"
@@ -442,84 +502,153 @@ msgstr "Супер-топче"
 msgid "Bye bye tux..."
 msgstr "Tux e свободен!!!"
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Не мога да намеря отборът на %s!"
 
 #: src/team/teams_list.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open personal teams directory (%s)!"
-msgstr "Не мога да отворя директорията на отбора (%s)!"
+msgstr "Не мога да отворя личната директория на отборите (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Не мога да отворя директорията на отбора (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Не мога да отворя личната директорията на отбора (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Центрирай войника"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Смени активен войник"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Смени ъгълът на насочване"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Смени категорията на оъжието"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Смени времето на обратно броене на оръжието"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Войник"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Избери друг войник"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
-msgstr ""
+msgstr "Да проверявам за нови версии онлайн?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
-msgstr ""
+msgstr "Избери случайно измежду картите"
+
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Класически"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Клик: Центрирай камерата на войникът"
 
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
-msgstr ""
+msgstr "Клиентски режим"
+
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Най-несръчният"
 
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Шрапнелна граната"
 
 #: src/weapon/cluzooka.cpp:389
-#, fuzzy
 msgid "Cluzooka"
-msgstr "РПГ"
+msgstr "Шрапнел РПГ"
 
 #: src/weapon/suicide.cpp:42
 msgid "Commit Suicide"
 msgstr "Последен опит"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Конфигурационно меню"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
-msgstr "Zum Spiel verbinden"
+msgstr "Свържи се към игра"
 
 #: src/network/net_error_msg.cpp:33
-#, fuzzy
 msgid "Connected !"
-msgstr "Verbinden !"
+msgstr "Свързан !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Конструкция"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
-msgstr ""
+msgstr "Контролиран от:"
 
 #: src/network/download.cpp:81
 #, c-format
 msgid "Couldn't fetch last version from %s"
-msgstr ""
+msgstr "Не може да добие последната версия от %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
-msgstr ""
+msgstr "Не мога да отворя файла %s"
 
 #: src/menu/main_menu.cpp:72
 msgid "Credits"
 msgstr "Благодарности на"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Вреди на ход до смъртта"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Изтрий личният отбор"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Диско-граната!"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Покажи това съобщение"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Влачи&Пусни: Движи камерата"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Време до смъртта"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Продължение на хода"
 
@@ -527,25 +656,35 @@ msgstr "Продължение на хода"
 msgid "Dynamite"
 msgstr "Шашка динамит"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
-msgstr ""
+msgstr "КРАЙ НА ИГРАТА"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
-msgstr ""
+msgstr "Сила на звуковите ефекти"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Здраве:"
+
+#: src/tool/error.cpp:63
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Грешка в %s:%lu"
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Грешка в %s:%lu (Wormux %s) : %s"
 
-#: src/team/teams_list.cpp:124
-#, fuzzy
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+"Грешка при стартиране на мрежата: Клиентът %s не е съгласен с теб!! - %s"
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
-msgstr "Грешка при зареждането на отбора %s:"
+msgstr "Грешка при зареждането на отбор %s:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -553,7 +692,21 @@ msgstr ""
 "Не мога да създам директорията \"%s\"! не мога да съхраня конфигурационните "
 "файлове!"
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Грешка при изтриване на папката \"%s\". Невъзможно изтриването на личния "
+"отбор."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Грешка при изтриване на файла \"%s\". Невъзможно изтриването на личния отбор."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -563,110 +716,127 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
-#, fuzzy, c-format
+#: src/menu/network_connection_menu.cpp:379
+#, c-format
 msgid "Error: Unable to connect to %s:%s"
-msgstr "Kann nicht verbinden"
+msgstr "Не може да се свърже към %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-#, fuzzy
-msgid "Error: Unable to contact index server to host a game"
-msgstr "Kann Indexserver nicht kontaktieren!"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
+msgstr "Не може да се свърже към Индекс сървъра за да създаде игра"
 
-#: src/menu/network_connection_menu.cpp:273
-#, fuzzy
-msgid "Error: Unable to contact index server to search an internet game"
-msgstr "Kann Indexserver nicht kontaktieren!"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
+msgstr "Не може да се свърже към Индекс сървъра за да търси и-нет игра"
 
-#: src/menu/network_connection_menu.cpp:337
-#, fuzzy
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
-msgstr "Kann Server nicht starten"
+msgstr "Не може да стартира сървър"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
+"Грешка: Твоят сървър не е достъпен от интернет. Провери конфигурацията на "
+"защитната стена: TCP Port %s трябва да приема връзки от вън. Ако не си "
+"свързан директно към интернет, провери конфигурацията на рутера си: TCP Port "
+"%s трябва да е be forwarded на твоя компютър."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Не мога да намеря телата на \"%s\" отбора \"%s\" !"
 
 #: src/weapon/flamethrower.cpp:134
 msgid "Flame Thrower"
-msgstr ""
+msgstr "Огнехвъргачки."
 
 #: src/weapon/footbomb.cpp:158
-#, fuzzy
 msgid "Football Bomb"
-msgstr "Звуков заряд"
+msgstr "Футбол-бомба"
+
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Цял екран/Прозорец"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Цял екран?"
 
-#: src/menu/game_menu.cpp:104
-#, fuzzy
+#: src/menu/game_menu.cpp:86
 msgid "Game"
-msgstr "Name:"
+msgstr "Игра"
 
-#: src/menu/network_connection_menu.cpp:119
-#, fuzzy
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Режим"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
-msgstr "Spiel Einstellungen:"
+msgstr "Име на играта:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Антилопохвъргачка"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
-msgstr ""
+msgstr "Графика"
 
 #: src/weapon/grapple.cpp:166
 msgid "Grapple"
-msgstr ""
+msgstr "Кука"
+
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Гравитация"
 
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Ръчна граната"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Инициализирам терена..."
 
 #: src/weapon/gun.cpp:74
 msgid "Gun"
-msgstr "Джандак"
+msgstr "Пистолет"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Не мога да намеря HOME директорията (или глобалната променлива $HOME)!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
-msgstr ""
+msgstr "Приятна игра!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
-msgstr "Hauptkommandant"
+msgstr "Главен Командир"
 
 #. Display player's name
 #: src/interface/interface.cpp:156
-#, fuzzy
 msgid "Head commander: "
-msgstr "Hauptkommandant"
+msgstr "Главен Командир:"
 
 #: src/menu/main_menu.cpp:69 src/menu/pause_menu.cpp:59
 msgid "Help"
-msgstr ""
+msgstr "Помощ"
+
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Висок скок"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
-msgstr "Spiel hosten"
+msgstr "Направи игра"
 
 #: src/weapon/blowtorch.cpp:63
 msgid ""
@@ -674,12 +844,17 @@ msgid ""
 "Angle : Up/Down\n"
 "an ammo per turn"
 msgstr ""
+"Как да го използваш: дръж space натиснат\n"
+"Ъгъл : Нагоре/Надоло\n"
+"муниция на ход"
 
 #: src/weapon/airhammer.cpp:75
 msgid ""
 "Howto use it : keep space key pressed\n"
 "an ammo per turn"
 msgstr ""
+"Как да се използва : дръж space натиснат\n"
+"муниция на ход"
 
 #: src/weapon/auto_bazooka.cpp:221
 msgid ""
@@ -688,14 +863,24 @@ msgid ""
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
+"Как да се използва : ляв клик на целта\n"
+"Първоначален ъгъл на изтрелване : Нагоре/Надолу\n"
+"Огън : дръж space до постигане на желаната сила\n"
+"муниция на ход"
 
 #: src/weapon/anvil.cpp:133
 msgid ""
 "Howto use it : left click on target\n"
 "an ammo per turn"
 msgstr ""
+"Как да се използва : ляв клик на целта\n"
+"муниция на ход"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Хабиш време за убиване за други неща!!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -703,7 +888,8 @@ msgstr ""
 "Ако намерите проблем с играта, или имате идея за това какво би я подобрила "
 "ни пишете на този адрес (на Английски):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Начално здраве"
 
@@ -714,43 +900,55 @@ msgid ""
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
+"Първоначален ъгъл на изтрелване : Нагоре/Надолу\n"
+"Огън : дръж space натиснат до достигане на желаната сила\n"
+"муниция на ход"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Инициализация..."
 
 #: src/game/game_init.cpp:106
-#, fuzzy
 msgid "Initialise map"
-msgstr "Инициализирам основни данни..."
+msgstr "Инициализирам карта..."
 
-#: src/game/game_init.cpp:142
-#, fuzzy
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
-msgstr "Инициализирам обектите..."
+msgstr "Инициализирам звук..."
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Инициализирам отборите..."
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
-msgstr ""
+msgstr "Подаръче..."
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Реактивна раница"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
-#, fuzzy
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
-msgstr "Komm nach #wormux auf irc.freenode.net"
+msgstr "Свържи се с #wormux на  irc.freenode.net за опоненти"
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Подскочи"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Задно салто"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Kick-ва играчите избрани от <nickname> от играта."
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
-msgstr ""
+msgstr "Език"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Карти които да заредя:"
 
@@ -758,26 +956,23 @@ msgstr "Карти които да заредя:"
 msgid "Load teams:"
 msgstr "Отбори които да заредя:"
 
-#: src/menu/teams_selection_box.cpp:42
-#, fuzzy
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
-msgstr "Lade Mannschaft:"
+msgstr "Лични отбори:"
 
 #: src/weapon/lowgrav.cpp:49
 msgid "LowGrav"
 msgstr "Ниска гравитация"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
-#, fuzzy
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
-msgstr "Verbindungsabbau beenden!"
+msgstr "Ръчна връзка"
 
-#: src/menu/game_menu.cpp:84
-#, fuzzy
+#: src/menu/game_menu.cpp:78
 msgid "Map"
-msgstr "Карти"
+msgstr "Карта"
 
 #: src/map/map.cpp:294
 #, c-format
@@ -788,11 +983,15 @@ msgstr "Картата %s е творение на: "
 msgid "Maps"
 msgstr "Карти"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Максимално здраве"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
-msgstr "Maximale Anzahl an Spielern:"
+msgstr "Максимален брой играчи:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Максимални FPS"
 
@@ -800,42 +999,43 @@ msgstr "Максимални FPS"
 msgid "Mine"
 msgstr "Противопехотна мина"
 
-#: src/menu/options_menu.cpp:133
-#, fuzzy
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
-msgstr "Музика?"
+msgstr "Разни"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
-msgstr ""
-
-#: src/menu/results_menu.cpp:366
-#, fuzzy
-msgid "Most clumsy"
-msgstr "Am nützlichsten"
+msgstr "Най-точен"
 
-#: src/menu/results_menu.cpp:362
-#, fuzzy
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
-msgstr "Am verräterischsten"
+msgstr "Най-Продавано"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
-msgstr "Am nützlichsten"
+msgstr "Най-Полезен"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
-msgstr "Am nutzlosesten"
+msgstr "Най-Безполезен"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
-msgstr "Am gewalttätigsten"
+msgstr "Най-Буен"
+
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Движи камерата с мишката или стрелкичките"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Премести войник"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
-msgstr ""
+msgstr "Сила на звука"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Музика?"
 
@@ -843,40 +1043,53 @@ msgstr "Музика?"
 msgid "Network Game"
 msgstr "Мрежова игра"
 
-#: src/network/network.cpp:261
-#, fuzzy
+#: src/network/network.cpp:298
 msgid "Network initialization"
-msgstr "Инициализирам терена..."
+msgstr "Инициализирам мрежата..."
+
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Никога"
 
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
-#, fuzzy
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
-msgstr "Мрежова игра"
+msgstr "Нова Мрежова игра в"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Предупреждение за нов играч?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Няма такъв елемент в XML-конфигурационния фаил! <%s>"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
-msgstr "Niemand!"
+msgstr "Никой!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
-msgstr "Anzahl der Figuren"
+msgstr "Войници"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
-msgstr "Anzahl der Mannschaften"
+msgstr "Отбори"
+
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "На войник: Сменя активният"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "На картата: Избери цел"
 
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Настройки"
 
 #: src/menu/pause_menu.cpp:55
-#, fuzzy
 msgid "Options menu"
 msgstr "Настройки"
 
@@ -884,72 +1097,86 @@ msgstr "Настройки"
 msgid "Parachute"
 msgstr "Парашут"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Парашутът се активира автоматично при падане!"
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
-msgstr ""
+msgstr "Парола:"
+
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Пауза"
 
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Играй!"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Играй няколко пъти"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
-msgstr "Spieler"
+msgstr "Играч"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Здраве?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Име на играча"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
-msgstr "Името ти?"
+msgstr "Името на играча?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
-msgstr "Скунксемет"
+msgstr "Скунксохвъргачка"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
-msgstr ""
+msgstr "Порт:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
-msgstr ""
+msgstr "Публични Битки"
 
 #: src/menu/main_menu.cpp:75
 msgid "Quit"
-msgstr "Вън!"
+msgstr "Излез!"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Излизане от Wormux"
 
 #: src/menu/pause_menu.cpp:63
 msgid "Quit battle"
-msgstr ""
+msgstr "Напусни"
 
-#: src/menu/map_selection_box.cpp:233
-#, fuzzy
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Напусни играта"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
-msgstr "Карти които да заредя:"
+msgstr "Случайна карта"
 
-#: src/game/config.cpp:346
-#, fuzzy
+#: src/game/config.cpp:349
 msgid "Reading default config file"
-msgstr "Чета персоналния конфигурационен фаил"
+msgstr "Чета първоначалния конфигурационен файл"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Чета персоналния конфигурационен фаил"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Разделителна способност"
 
@@ -957,77 +1184,107 @@ msgstr "Разделителна способност"
 msgid "Riot Bomb"
 msgstr "Звуков заряд"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Пусни играта"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
-msgstr ""
+msgstr "Кажи:"
 
-#: src/menu/options_menu.cpp:84
-#, fuzzy
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
-msgstr "Скролиране от краищата на екрана"
+msgstr "Скролиране на размера на границата"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Скролиране от краищата на екрана"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
-msgstr "Server Adresse:"
+msgstr "Адрес на Сървъра:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
-msgstr "Im Internert verfügbare Server"
+msgstr "Достъпен сървър в интернет"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
-#, fuzzy
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
-msgstr "Server Adresse:"
+msgstr "Сървъров режим"
 
 #: src/weapon/shotgun.cpp:91
 msgid "Shotgun"
 msgstr "Помпа"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Показване на менюто с оръжията"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Покажи/Скрий интерфейса"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Покажи/Скрий Картата"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Пропускане на ход"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Шамарче"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Зашлеви врага за да го накараш да подскочи малко."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "По-малък ъгъл на насочване и стъпка при вървене"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Снайперистка пушка"
 
 #: src/object/bonus_box.cpp:86
 msgid "Someone put a booby trap into the crate!"
-msgstr ""
+msgstr "Някой е сложил капан в съндъка!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
+msgstr "Съжалявам, в момента няма игра, която да изчаква за играчи"
+
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
 msgstr ""
+"Съжалявам, но твоята версия не е поддържана. Поддържаните версии са %s. Ти "
+"може да дръпнеш по-нова версия от  http://www.wormux.org/wiki/download.php"
 
-#: src/menu/options_menu.cpp:178
-#, fuzzy
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
-msgstr "Звуци"
+msgstr "Звук"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Звукови ефекти?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Честота на семплиране"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Звуци"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Стартирам нова игра"
 
@@ -1047,20 +1304,26 @@ msgstr "Супер-Tux!"
 msgid "Syringe"
 msgstr "Отрова"
 
-#: src/menu/results_menu.cpp:389
-#, fuzzy
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Говори в мрежова битка"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
-msgstr "Отбори"
+msgstr "Графика на Отбора"
 
-#: src/menu/results_menu.cpp:378
-#, fuzzy
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
-msgstr "Отбори"
+msgstr "Статистика на Отбора"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Отбори"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Редактор на отборите"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Телепортация"
@@ -1070,15 +1333,14 @@ msgid "The Cluster Bomb has left the battlefield before it could explode."
 msgstr "Шрапнелната граната е на по-безопасно място..."
 
 #: src/weapon/footbomb.cpp:111
-#, fuzzy
 msgid "The Football Bomb has left the battlefield before it could explode."
-msgstr "Шрапнелната граната е на по-безопасно място..."
+msgstr "Футбол-бомбаta излетя от терена..."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Антилопата избяга да пасе необезпокоявана..."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Скунксът ще мирише на някой друг, някъде другаде."
 
@@ -1090,25 +1352,34 @@ msgstr "Пазете се! Смарт-бомба на свобода!"
 msgid "The ball left the battlefield before exploding"
 msgstr "Топката може да попадне в детски ръчички!"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Клиентската и Сървърската версия са несъвместими (твоя=%s, на сървъра=%s). "
+"Моля опитай друг сървър."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
-msgstr ""
+msgstr "Връзката прекъсна. Виж дали има пречеща защитна стена."
 
 #: src/weapon/disco_grenade.cpp:127
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Диско гранатата си тръгна от партито..."
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
-msgstr ""
+msgstr "Играта беше прекъсната, защото ти излезе."
 
 #: src/weapon/grenade.cpp:58
 msgid "The grenade left the battlefield before exploding"
 msgstr "Ходи я търси..."
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
-msgstr ""
+msgstr "Другите те чакат! Събуди се :-)"
 
 #: src/weapon/bazooka.cpp:83 src/weapon/cluzooka.cpp:336
 #: src/weapon/riot_bomb.cpp:86
@@ -1117,26 +1388,35 @@ msgstr "Ехаааа...."
 
 #: src/network/net_error_msg.cpp:45
 msgid "The server rejected the connection."
-msgstr ""
+msgstr "Сървърът отказа връзката."
 
 #: src/network/net_error_msg.cpp:51
 msgid "The server rejected the connection: wrong password!"
-msgstr ""
+msgstr "Сървърът отказа връзката: Грешна парола!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Има само %i отбор."
+msgstr[1] "Има само %i отбора."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Време"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
+"Timeout : Скрол на мишката или Page Up/Down\n"
+"Ъгъл : Нагоре/Надолу\n"
+"Огън : дръж space натиснат до достигане на желаната сила\n"
+"муниция на ход"
 
 #: src/weapon/bounce_ball.cpp:90
 msgid ""
@@ -1145,203 +1425,218 @@ msgid ""
 "Fire : space key\n"
 "an ammo per turn"
 msgstr ""
+"Timeout : Скрол на мишката или Page Up/Down\n"
+"Ъгъл : Нагоре/Надолу\n"
+"Огън : space\n"
+"муниция на ход"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
-msgstr ""
+msgstr "Други"
 
 #: src/network/net_error_msg.cpp:36
-#, fuzzy
 msgid "Unable to contact host."
-msgstr "Kann Server nicht kontaktieren!"
+msgstr "Не може да се свърже!"
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Не мога да отворя директорията за карти! (%s)"
 
-#: src/map/maps_list.cpp:244
-#, fuzzy, c-format
+#: src/map/maps_list.cpp:250
+#, c-format
 msgid "Unable to open personal maps directory (%s)!"
-msgstr "Не мога да отворя директорията за карти! (%s)"
+msgstr "Не мога да отворя личната директорията за карти (%s) !"
 
 #: src/network/net_error_msg.cpp:39
-#, fuzzy
 msgid "Unable to use this port!"
-msgstr "Kann Server nicht starten!"
+msgstr "Не може да ползва този порт!"
+
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Непозната команда"
 
-#: src/network/network.cpp:110
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Безкраен"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
-msgstr ""
+msgstr "Неименуван"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "версия"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
-msgstr ""
+msgstr "Проверка на версията се провали заради: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
-msgstr[0] "Warte! %i Spieler ist noch nicht bereit!"
-msgstr[1] "Warte! %i Spieler sind noch nicht bereit!"
+msgstr[0] "Чакай! %i играч не е готов!"
+msgstr[1] "Чакай! %i играчи не са готови!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
+"Изчаквам за сървър, всичко което може да правиш е да откажеш или да си чатиш!"
+
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Оръжие: Огън / Бонус кутия: пада бързо"
 
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Оръжия"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Страница: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr ""
 "%s - човек може да умре от гъделичкане, но от патлак си е просто смешно..."
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Красотички носени от вятъра?"
 
-#: src/menu/results_menu.cpp:305
-#, fuzzy
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
-msgstr "Противопехотна мина"
+msgstr "Победител"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux се зарежда..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Версия на Wormux"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "Грешка при CRC на картата!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Грешно име на картата."
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Грешен отбор."
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
-msgstr ""
+msgstr "Ти си сам :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
-msgstr ""
+msgstr "Ти си сам..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Трябва ми поне една валидна карта!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Трябват ми поне два валидни отбора!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
-msgstr ""
+msgstr "Не може да играеш без отбор. Избери един!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Не точно там..."
 
 #: src/menu/credits_menu.cpp:75
-#, fuzzy
 msgid "aka"
-msgstr "РПГ"
+msgstr "известен и като"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
 "a bombing per turn"
 msgstr ""
+"Посока на атаката : Ляво/Дясно\n"
+"Bombing : Ляв клик на целта\n"
+"едно бомбиране на ход"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
-msgstr ""
+msgstr "не мога да заредя конфигурацията"
+
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "личен играч"
 
-#: src/map/ground.cpp:60
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "готово"
 
-#: src/map/maps_list.cpp:82
-#, fuzzy
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
-msgstr "Чета персоналния конфигурационен фаил"
+msgstr "грешка при четенето на персоналния конфигурационен файл"
 
 #: src/menu/credits_menu.cpp:79
 msgid "from"
-msgstr ""
+msgstr "от"
 
-#: src/map/maps_list.cpp:71
-#, fuzzy
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
-msgstr "Проблем при зареждането на конфигурацията: %s"
+msgstr "конфигурационният файл липсва!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
-msgstr ""
+msgstr "о Зареждам музика"
 
-#: src/sound/jukebox.cpp:337
-#, fuzzy, c-format
+#: src/sound/jukebox.cpp:343
+#, c-format
 msgid "o Loading sound profile: %s"
-msgstr "Проблем при зареждането на конфигурацията: %s"
+msgstr "o Зареждам звуков профил: %s"
 
 #: src/sound/jukebox.cpp:89
 #, c-format
 msgid "o Opened audio at %d Hz %d bit"
-msgstr ""
-
-#~ msgid "Connect !"
-#~ msgstr "Verbinden !"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Zu einem Internet Spiel verbinden"
+msgstr "o Отварям аудио на %d Hz %d бита"
 
-#~ msgid "Refresh"
-#~ msgstr "Aktualisieren"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Проблем при зареждането на данните за %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Проблем при зареждането на конфигурацията: %s"
+#~ msgid " "
+#~ msgstr " "
 
 #, fuzzy
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Проблем при зареждането на конфигурацията: %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Грешла при зареждането на режима %s (файл %s):"
+#~ msgid "  Most sold-out  :  "
+#~ msgstr "  Am verräterischsten  :  "
 
-#, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "XML грешка при зареждане на картата '%s ':"
+#~ msgid "  Most useful   :  "
+#~ msgstr "  Am nützlichsten   :  "
 
-#, fuzzy
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "Wormux Versionen sind verschieden : Client=%s, Server=%s."
+#~ msgid "  Most useless  :  "
+#~ msgstr "  Am nutzlosesten  :  "
 
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Хабиш време за убиване за други неща!!!"
+#~ msgid "  Most violent  :  "
+#~ msgstr "  Am gewalttätigsten  :  "
 
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Тръгваш ли си? (Y/N)"
+#~ msgid " has joined the party"
+#~ msgstr " hat das Spiel betreten"
 
-#, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Инициализирам терена..."
+#~ msgid " has left the party"
+#~ msgstr " hat das Spiel verlassen"
 
-#~ msgid "(current)"
-#~ msgstr "(на ход)"
+#~ msgid "%s has lost %u point of energy."
+#~ msgid_plural "%s has lost %u points of energy."
+#~ msgstr[0] "%s verliert %u Lebenspunkt."
+#~ msgstr[1] "%s verliert %u Lebenspunkte."
 
 #, fuzzy
 #~ msgid "%s team has won %u Gnu!"
@@ -1374,57 +1669,77 @@ msgstr ""
 #~ msgstr[1] "Отборът на %s спечели %u %sи !"
 
 #, fuzzy
-#~ msgid ""
-#~ "WARNING! Disconnections are not yet handled. So you have to restart "
-#~ "Wormux after each disconnection!"
-#~ msgstr "WARNUNG! Verbindungstrennungen werden noch nicht behandelt."
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "Wormux Versionen sind verschieden : Client=%s, Server=%s."
 
-#~ msgid "Ninjarope"
-#~ msgstr "Кьокетсу шоге"
+#~ msgid "'%s has won %u Anvil"
+#~ msgid_plural "'%s has won %u Anvil"
+#~ msgstr[0] "%s hat %u Amboss gewonnen"
+#~ msgstr[1] "%s hat %u Ambosse gewonnen"
 
-#, fuzzy
-#~ msgid "Error while exporting file %s:"
-#~ msgstr "Грешла при зареждането на режима %s (файл %s):"
+#~ msgid "'%s has won %u Holy grenade"
+#~ msgid_plural "'%s has won %u Holy grenades"
+#~ msgstr[0] "%s hat %u Heilige Granate gewonnen"
+#~ msgstr[1] "%s hat %u Heilige Granaten gewonnen"
 
-#, fuzzy
-#~ msgid "Error while loading game mode %s from memory:"
-#~ msgstr "Грешла при зареждането на режима %s (файл %s):"
+#~ msgid "'%s has won %u Low gravity"
+#~ msgid_plural "'%s has won %u Low gravity"
+#~ msgstr[0] "%s hat %u Niedrige Schwerkraft gewonnen"
+#~ msgstr[1] "%s hat %u Niedrige Schwerkraft gewonnen"
 
-#~ msgid "Unexpected exception caught..."
-#~ msgstr "Непредвидено изключение!"
+#~ msgid "(current)"
+#~ msgstr "(на ход)"
+
+#~ msgid "All teams results:\n"
+#~ msgstr "Alle Mannschaftsergebnisse:\n"
 
 #~ msgid "C++ exception caught:"
 #~ msgstr "Непредвидена операция в C++:"
 
-#~ msgid "Failed to initialize network library!"
-#~ msgstr "Kann Netzwerk-Bibliothek nicht initialisieren!"
+#~ msgid "Connect !"
+#~ msgstr "Verbinden !"
 
-#~ msgid "Initialisation of TTF library failed: %s"
-#~ msgstr "Не мога да заредя библиотеката за поддръжка на TTF шрифтове: %s !"
+#~ msgid "Connect to an internet game"
+#~ msgstr "Zu einem Internet Spiel verbinden"
 
-#~ msgid "Unable to initialize SDL library: %s"
-#~ msgstr "Не мога да заредя SDL библиотеката: %s"
+#~ msgid "Connected to "
+#~ msgstr "Verbunden zu "
 
-#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
-#~ msgstr "Трябват поне два отбора за игра! Промени настройките от менюто!"
+#~ msgid "Contacting main server..."
+#~ msgstr "Kontaktiere Hauptserver..."
 
-#~ msgid "general: "
-#~ msgstr "Общо: "
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Тръгваш ли си? (Y/N)"
 
-#~ msgid " has joined the party"
-#~ msgstr " hat das Spiel betreten"
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Проблем при зареждането на данните за %s:"
 
-#~ msgid " has left the party"
-#~ msgstr " hat das Spiel verlassen"
+#, fuzzy
+#~ msgid "Error while exporting file %s:"
+#~ msgstr "Грешла при зареждането на режима %s (файл %s):"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Проблем при зареждането на конфигурацията: %s"
+
+#, fuzzy
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Проблем при зареждането на конфигурацията: %s"
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Грешла при зареждането на режима %s (файл %s):"
+
+#, fuzzy
+#~ msgid "Error while loading game mode %s from memory:"
+#~ msgstr "Грешла при зареждането на режима %s (файл %s):"
+
+#~ msgid "Failed to initialize network library!"
+#~ msgstr "Kann Netzwerk-Bibliothek nicht initialisieren!"
 
 #~ msgid "Find a random position for characters"
 #~ msgstr "Разхвърлям малките гадове на произволни места..."
 
-#~ msgid "Is it a gift?"
-#~ msgstr "О! Подарък?"
-
-#~ msgid "Contacting main server..."
-#~ msgstr "Kontaktiere Hauptserver..."
+#~ msgid "Initialisation of TTF library failed: %s"
+#~ msgstr "Не мога да заредя библиотеката за поддръжка на TTF шрифтове: %s !"
 
 #~ msgid "Invalid index server adress!"
 #~ msgstr "Ungültige Indexserveradresse!"
@@ -1435,69 +1750,28 @@ msgstr ""
 #~ msgid "Invalid server adress!"
 #~ msgstr "Ungültige Serveradresse!"
 
-#~ msgid "It doesn't seem to be a valid Wormux server..."
-#~ msgstr "Das scheint kein gültiger Wormux server zu sein..."
-
-#~ msgid "Unable to contact an index server!"
-#~ msgstr "Kann Indexserver nicht kontaktieren!"
-
-#~ msgid "Unable to join the game..."
-#~ msgstr "Kann das Spiel nicht betreten..."
-
-#~ msgid " "
-#~ msgstr " "
-
 #, fuzzy
-#~ msgid "  Most sold-out  :  "
-#~ msgstr "  Am verräterischsten  :  "
-
-#~ msgid "  Most useful   :  "
-#~ msgstr "  Am nützlichsten   :  "
-
-#~ msgid "  Most useless  :  "
-#~ msgstr "  Am nutzlosesten  :  "
-
-#~ msgid "  Most violent  :  "
-#~ msgstr "  Am gewalttätigsten  :  "
-
-#~ msgid "%s has lost %u point of energy."
-#~ msgid_plural "%s has lost %u points of energy."
-#~ msgstr[0] "%s verliert %u Lebenspunkt."
-#~ msgstr[1] "%s verliert %u Lebenspunkte."
-
-#~ msgid "'%s has won %u Anvil"
-#~ msgid_plural "'%s has won %u Anvil"
-#~ msgstr[0] "%s hat %u Amboss gewonnen"
-#~ msgstr[1] "%s hat %u Ambosse gewonnen"
-
-#~ msgid "'%s has won %u Holy grenade"
-#~ msgid_plural "'%s has won %u Holy grenades"
-#~ msgstr[0] "%s hat %u Heilige Granate gewonnen"
-#~ msgstr[1] "%s hat %u Heilige Granaten gewonnen"
-
-#~ msgid "'%s has won %u Low gravity"
-#~ msgid_plural "'%s has won %u Low gravity"
-#~ msgstr[0] "%s hat %u Niedrige Schwerkraft gewonnen"
-#~ msgstr[1] "%s hat %u Niedrige Schwerkraft gewonnen"
-
-#~ msgid "All teams results:\n"
-#~ msgstr "Alle Mannschaftsergebnisse:\n"
+#~ msgid "Invalid top server adress!"
+#~ msgstr "Ungültige Hauptserveradresse!"
 
-#~ msgid "Connected to "
-#~ msgstr "Verbunden zu "
+#~ msgid "Is it a gift?"
+#~ msgstr "О! Подарък?"
 
-#~ msgid "Energy:"
-#~ msgstr "Energie:"
+#~ msgid "It doesn't seem to be a valid Wormux server..."
+#~ msgstr "Das scheint kein gültiger Wormux server zu sein..."
 
 #, fuzzy
-#~ msgid "Invalid top server adress!"
-#~ msgstr "Ungültige Hauptserveradresse!"
+#~ msgid "Network deinitialization"
+#~ msgstr "Инициализирам терена..."
+
+#~ msgid "Ninjarope"
+#~ msgstr "Кьокетсу шоге"
 
 #~ msgid "Only the server can set the map!"
 #~ msgstr "Nur der Server kann die Karte setzen!"
 
-#~ msgid "Select the teams:"
-#~ msgstr "Wähle die Mannschaften aus:"
+#~ msgid "Refresh"
+#~ msgstr "Aktualisieren"
 
 #~ msgid "Select the world:"
 #~ msgstr "Wähle die Welt aus:"
@@ -1511,6 +1785,24 @@ msgstr ""
 #~ msgid "Team %s results:\n"
 #~ msgstr "Ergebnisse Team %s:\n"
 
+#~ msgid "Unable to contact an index server!"
+#~ msgstr "Kann Indexserver nicht kontaktieren!"
+
+#~ msgid "Unable to initialize SDL library: %s"
+#~ msgstr "Не мога да заредя SDL библиотеката: %s"
+
+#~ msgid "Unable to join the game..."
+#~ msgstr "Kann das Spiel nicht betreten..."
+
+#~ msgid "Unexpected exception caught..."
+#~ msgstr "Непредвидено изключение!"
+
+#, fuzzy
+#~ msgid ""
+#~ "WARNING! Disconnections are not yet handled. So you have to restart "
+#~ "Wormux after each disconnection!"
+#~ msgstr "WARNUNG! Verbindungstrennungen werden noch nicht behandelt."
+
 #~ msgid "Wait! "
 #~ msgstr "Warte! "
 
@@ -1518,5 +1810,15 @@ msgstr ""
 #~ msgstr "Waffe:"
 
 #, fuzzy
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "XML грешка при зареждане на картата '%s ':"
+
+#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgstr "Трябват поне два отбора за игра! Промени настройките от менюто!"
+
+#~ msgid "general: "
+#~ msgstr "Общо: "
+
+#, fuzzy
 #~ msgid "some opponents."
 #~ msgstr "um Gegner zu finden."
diff --git a/po/bs.po b/po/bs.po
index 4eb96fc..4563573 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2007-11-10 21:40+0100\n"
 "Last-Translator: Adnan Hodzic <AbsintheSyringe at gmail.com>\n"
 "Language-Team: Bosnian <local at linux.org.ba>\n"
@@ -18,71 +18,81 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Mapa %s nije pronađena :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i igrač konektovan"
 msgstr[1] "%i igrač konektovan"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i igrač spreman"
 msgstr[1] "%i igrač konektovan"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s tim) je umro."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> aka %s iz %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> iz %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "%s Tim"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s Tim - Udaljenost"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s izvršava samoubistvo !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s izvršava samoubistvo !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s tim) je umro."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s je pao u vodu."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s je ispao sa mape!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s je mrtav zato Å¡to je smotan!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -90,16 +100,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s je dobio %u poena energije!"
 msgstr[1] "%s je dobio %u poena energije"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s je psihopata, ubio je člana %s tima!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s je mrtav zato Å¡to je smotan!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -123,21 +128,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "%s tim je dobio %u bazuka!"
 msgstr[1] "%s tim je dobio %u bazuka!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "%s tim je dobio %u Gnu! Raznesi ih sve!"
 msgstr[1] "%s tim je dobio %u Gnu! Raznesi ih sve!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "%s tim je dobio %u zračnog napada!"
 msgstr[1] "%s tim je dobio %u zračnog napada!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -152,7 +157,7 @@ msgstr[1] ""
 "%s tim je dobio %u zračnih čekića! Ne pravi previše buke sa njim! Hvala, "
 "tvoje komšije."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -208,7 +213,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "%s tim je dobio %u kasatnih bombi!"
 msgstr[1] "%s tim je dobio %u kasatnih bombi!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -244,7 +249,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "%s tim je dobio %u džumbus bombi!"
 msgstr[1] "%s tim je dobio %u džumbus bombi!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -265,14 +270,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "%s tim je dobio %u pištolj!"
 msgstr[1] "%s tim je dobio %u pištolj!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "%s tim je dobio %u jetpack! Extraa!"
 msgstr[1] "%s tim je dobio %u jetpack! Extraa!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -286,14 +291,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "%s tim je dobio %u mina!"
 msgstr[1] "%s tim je dobio %u mina!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "%s tim je dobio %u padobrana!"
 msgstr[1] "%s tim je dobio %u padobrana!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -314,7 +319,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "%s tim je dobio %u sačmu!"
 msgstr[1] "%s tim je dobio %u sačmu!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "%s tim je dobio %u kuke!"
+msgstr[1] "%s tim je dobio %u kuke!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -357,23 +369,33 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "%s tim je dobio %u preskoči red! Znam da to voliš."
 msgstr[1] "%s tim je dobio %u preskoči red! Znam da to voliš."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "%s tim je dobio %u tux lanser! Nikad nisi vidio pingvina koji leti?"
 msgstr[1] "%s tim je dobio %u tux lanser! Nikad nisi vidio pingvina koji leti?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(mrtav)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(sistemski jezik)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -382,14 +404,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(neograničeno)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Zračni napad"
 
@@ -397,10 +423,19 @@ msgstr "Zračni napad"
 msgid "Airhammer"
 msgstr "Zračni čekić"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Svi timovi"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Igraj"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "I pobjednik je ..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -415,7 +450,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Nakovanj"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autori:"
 
@@ -439,6 +474,15 @@ msgstr "Palija"
 msgid "Bazooka"
 msgstr "Bazuka"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleport"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Bacač plamena"
@@ -451,8 +495,9 @@ msgstr "Bomba odskočica"
 msgid "Bye bye tux..."
 msgstr "Ćao ćao tux ..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Ne može naći tim %s!"
@@ -462,24 +507,73 @@ msgstr "Ne može naći tim %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Ne mogu otvorit direktorij  (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Ne mogu otvorit direktorij tima  (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Ne mogu otvorit direktorij  (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Broj likova"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Padobran"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Padobran"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Nasumice izaberi druge mape"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Klijent mod"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+#, fuzzy
+msgid "Clumsiest"
+msgstr "Najkorisniji"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Kasetna bomba"
@@ -493,7 +587,12 @@ msgstr "Bazuka"
 msgid "Commit Suicide"
 msgstr "Ubij se"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "Greška tokom učitavanja konfiguracione datoteke: %s"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Konektuj se na igru"
 
@@ -501,11 +600,11 @@ msgstr "Konektuj se na igru"
 msgid "Connected !"
 msgstr "Konektovan !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Konstruiraj"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Kontroliran od strane:"
 
@@ -514,7 +613,7 @@ msgstr "Kontroliran od strane:"
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr ""
@@ -523,11 +622,32 @@ msgstr ""
 msgid "Credits"
 msgstr "Krediti"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Disko granata"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Trajanje reda"
 
@@ -535,24 +655,34 @@ msgstr "Trajanje reda"
 msgid "Dynamite"
 msgstr "Dinamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "KRAJ IGRE"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Greška u %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Greška kod očitavanja tima:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -560,7 +690,22 @@ msgstr ""
 "Greška tokom pravljenja direktorija \"%s\": nije u mogućnosti da spremi "
 "konfiguracionu datoteku."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Greška tokom pravljenja direktorija \"%s\": nije u mogućnosti da spremi "
+"konfiguracionu datoteku."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Greška tokom pravljenja direktorija \"%s\": nije u mogućnosti da spremi "
+"konfiguracionu datoteku."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -570,33 +715,39 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Greška: Nemoguće konektovat se na %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr ""
 "Greška: Nije u mogućnosti kontaktirati index server da bi se hostala igra"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Greška: Nije u mogućnosti kontaktirati index server da se potrazi internet "
 "igra"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Greška: Nemoguće startati server"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Greška: ne mogu pronaći skin \"%s\" za tim \"%s\"."
@@ -610,23 +761,33 @@ msgstr "Bacač Plamena"
 msgid "Football Bomb"
 msgstr "Džumbus bomba"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Pun ekran?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Pun ekran?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "Klijent mod"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr ""
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Lansiraj GNU-a"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -634,11 +795,15 @@ msgstr ""
 msgid "Grapple"
 msgstr "Kuka"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granata"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inicijalizacija zemljišta ..."
 
@@ -646,16 +811,16 @@ msgstr "Inicijalizacija zemljišta ..."
 msgid "Gun"
 msgstr "Pištolj"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "HOME direktor (okolina promjenjiva $HOME) nije mogla biti pronađena!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Uživaj u igri!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Vojskovođa"
 
@@ -668,7 +833,11 @@ msgstr "Vojskovođa:"
 msgid "Help"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Hostaj igru"
 
@@ -709,13 +878,18 @@ msgstr ""
 "Kako koristiti : lijevi klik na metu\n"
 "municija po redu"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Požuri, previše si spor !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
 msgstr "Ako si ponašao bug ili imaš prijedlog pošalji nam email (na engleskom)"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Početna energija"
 
@@ -730,7 +904,7 @@ msgstr ""
 "Pucaj : drži space do željene jačine\n"
 "municija po redu"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inicijalizacija"
 
@@ -738,31 +912,43 @@ msgstr "Inicijalizacija"
 msgid "Initialise map"
 msgstr "Inicijaliziranje mape"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inicijaliziranje zvuka"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inicijaliziranje timova"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Pa to je poklon!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Dođi na #wormux na irc.freenode.net da pronađeš protivnika"
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Jezik"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Učitaj mape:"
 
@@ -770,7 +956,7 @@ msgstr "Učitaj mape:"
 msgid "Load teams:"
 msgstr "Učitaj timove:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Lokalni timovi:"
 
@@ -778,13 +964,13 @@ msgstr "Lokalni timovi:"
 msgid "LowGrav"
 msgstr "LowGrav"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "Mape"
@@ -798,11 +984,16 @@ msgstr "Mapu %s, napravio je:"
 msgid "Maps"
 msgstr "Mape"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Početna energija"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Maximalan broj igrača:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maximalaan broj FPS"
 
@@ -810,41 +1001,45 @@ msgstr "Maximalaan broj FPS"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "Muzika?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Najprecizniji"
 
-#: src/menu/results_menu.cpp:366
-#, fuzzy
-msgid "Most clumsy"
-msgstr "Najkorisniji"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Najveća izdajica"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Najkorisniji"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Najučikovitiji"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Najagresivniji"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Padobran"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Muzika?"
 
@@ -852,34 +1047,50 @@ msgstr "Muzika?"
 msgid "Network Game"
 msgstr "Mrežna Igra"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 #, fuzzy
 msgid "Network initialization"
 msgstr "Initalaizacija baze ..."
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
 msgstr "Mrežna Igra"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Nijedan element  <%s> nije nađen u xml konfiguracionoj datoteci!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Niko!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Broj likova"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Broj timova:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opcije"
@@ -893,42 +1104,55 @@ msgstr "Opcije"
 msgid "Parachute"
 msgstr "Padobran"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Padobran se automatski aktivira."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Igraj"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Igrač"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Prikaži energiju igrača?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Prikaži ime igrača?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Prikaži ime igrača?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Lansiraj tvora"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr ""
 
@@ -936,7 +1160,7 @@ msgstr ""
 msgid "Quit"
 msgstr "Odustani"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Izađi iz Wormux-a"
 
@@ -944,21 +1168,26 @@ msgstr "Izađi iz Wormux-a"
 msgid "Quit battle"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Pokreni igru"
+
+#: src/menu/map_selection_box.cpp:228
 #, fuzzy
 msgid "Random map"
 msgstr "Učitaj mape:"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 #, fuzzy
 msgid "Reading default config file"
 msgstr "Čita lični konfiguracioni podatak"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Čita lični konfiguracioni podatak"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Rezolucija"
 
@@ -966,34 +1195,34 @@ msgstr "Rezolucija"
 msgid "Riot Bomb"
 msgstr "Džumbus bomba"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Pokreni igru"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Reci:"
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "Klizi po ivici"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Klizi po ivici"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Adresa servera"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Server dostupan na internetu"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Server mod"
 
@@ -1001,10 +1230,35 @@ msgstr "Server mod"
 msgid "Shotgun"
 msgstr "Sačma"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Opcije"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Preskoči red"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Snajper"
@@ -1013,29 +1267,36 @@ msgstr "Snajper"
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Sorry, trenutno nema igre koja čeka igrače"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "Zvučne opcije"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Zvučni efekti?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Zvučna frekvencija"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Zvučne opcije"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Pokreni novu igru"
 
@@ -1055,20 +1316,28 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Å prica"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr ""
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "Timovi"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "Timovi"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Timovi"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleport"
@@ -1082,11 +1351,11 @@ msgstr "Kasetna bomba je napustila bojište prije nego je stigla explodirat."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Kasetna bomba je napustila bojište prije nego je stigla explodirat."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Kasetna bomba je napustila bojište prije nego je explodirala"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Tvor je napustio bojište prije nego je explodirao"
 
@@ -1098,6 +1367,13 @@ msgstr "Automatksa rakete je napustila bojište..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Odskočica je napustila bojište prije nego je explodirala"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "Konekcija je istekla. Provjeri da firewall ne stoji na putu!"
@@ -1106,7 +1382,7 @@ msgstr "Konekcija je istekla. Provjeri da firewall ne stoji na putu!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Disko granata je napustila bojište prije nego je explodirala"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1114,7 +1390,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr "Granata napušta bojište prije explozije"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Drugi te čekaju! Probudi se :)"
 
@@ -1133,14 +1409,19 @@ msgstr "Server odbio konekciju."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Server odbio konekciju."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Postoji samo %i tim."
 msgstr[1] "Tu je samo %i tim."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1164,7 +1445,7 @@ msgstr ""
 "Pucaj : drži space\n"
 "municija po redu"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Alati"
 
@@ -1172,12 +1453,12 @@ msgstr "Alati"
 msgid "Unable to contact host."
 msgstr "Nije u stanju kontaktirati host."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Nije u stanju da otvori direktorij sa mapama (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, fuzzy, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Nije u stanju da otvori direktorij sa mapama (%s)!"
@@ -1186,85 +1467,110 @@ msgstr "Nije u stanju da otvori direktorij sa mapama (%s)!"
 msgid "Unable to use this port!"
 msgstr "Nije u mogućnosti koristit ovaj port!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(neograničeno)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Bezimeni"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Verzija"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Čekaj! %i igrač još nije spreman!"
 msgstr[1] "Čekaj! %i igrač nije još spreman!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Čekanje za server, sve što sad možeš uraditi je odustati ili chatati!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Oružje:"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Web stranica:"
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Koja sramota za %s - koji je ubijen najobičnijim pištoljem!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Prikazuj trunke vjetra?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 #, fuzzy
 msgid "Winner"
 msgstr "Mina"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux se učitava..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux verzija "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 #, fuzzy
 msgid "You are alone :-/"
 msgstr "Sami ste ..."
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Sami ste ..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Trebate barem jednu važeće mapu!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Trebate barem dva važeća tima !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Nećeš biti u stanju da igraš prije nego izabereš tim!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Vaš hitac je promašio!"
 
@@ -1273,7 +1579,7 @@ msgstr "Vaš hitac je promašio!"
 msgid "aka"
 msgstr "aka"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1283,15 +1589,20 @@ msgstr ""
 "Borbandovanje : lijevi klik na metu\n"
 "bombardovanja po redu"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr ""
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "gotov"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 #, fuzzy
 msgid "error parsing the config file"
 msgstr "Čita lični konfiguracioni podatak"
@@ -1301,16 +1612,16 @@ msgstr "Čita lični konfiguracioni podatak"
 msgid "from"
 msgstr "od"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 #, fuzzy
 msgid "no configuration file!"
 msgstr "Greška tokom učitavanja konfiguracione datoteke: %s"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Učitavam muziku"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Učitavam zvučne profile: %s"
@@ -1320,14 +1631,18 @@ msgstr "o Učitavam zvučne profile: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Otvoren audio na %d Hz %d bit"
 
+#, fuzzy
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "Wormux verzije su drugačije : klijent=%s, server=%s."
+
 #~ msgid "Connect !"
 #~ msgstr "Konektuj!"
 
 #~ msgid "Connect to an internet game"
 #~ msgstr "Konektuj se na internet igru"
 
-#~ msgid "Refresh"
-#~ msgstr "Osvježi"
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Da li želite da izađete? (Y/N)"
 
 #~ msgid "Error loading team's data %s:"
 #~ msgstr "Greška kod očitavanja podataka tima %s :"
@@ -1342,22 +1657,12 @@ msgstr "o Otvoren audio na %d Hz %d bit"
 #~ msgstr "Greška tokom učitavanja moda igre  %s (file %s):"
 
 #, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "XML greška tokom lodiranja mape '%s' :"
-
-#, fuzzy
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "Wormux verzije su drugačije : klijent=%s, server=%s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "I pobjednik je ..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Požuri, previše si spor !!"
+#~ msgid "Network deinitialization"
+#~ msgstr "Initalaizacija baze ..."
 
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Da li želite da izađete? (Y/N)"
+#~ msgid "Refresh"
+#~ msgstr "Osvježi"
 
 #, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Initalaizacija baze ..."
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "XML greška tokom lodiranja mape '%s' :"
diff --git a/po/ca.po b/po/ca.po
index 86dce47..f75b823 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,90 +1,102 @@
+# translation of wormux_ca.po to Catalan
+# Eduard BERMEJO <templer at iespana.es>, 2005?.
+# artefact <artefact at altern.org>, 2007.
+# Juan Pujol Rojas <jua56 at hotmail.com>, 2008.
+# Joan  <ca at li.org>, 2008.
 # Catalan translation of Wormux.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Wormux package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-# Eduard BERMEJO <templer at iespana.es>, 2005?
-# artefact <artefact at altern.org>, 2007
-# Juan Pujol Rojas <jua56 at hotmail.com>, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: Wormux\n"
+"Project-Id-Version: wormux_ca\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-05-04 09:39+0100\n"
-"Last-Translator: Juan <jua56 at hotmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-06 15:07+0100\n"
+"Last-Translator: Juan Pujol Rojas <konker69 at gmail.com>\n"
+"Language-Team: Catalan <ca at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
-msgstr "! Mape %s no trobat :-("
+msgstr "Mape %s no trobat :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i jugador connectat"
 msgstr[1] "%i jugadors connectats"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i jugador preparat"
 msgstr[1] "%i jugadors preparats"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (equip %s) ha mort."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> aka %s de %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> de %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Equip %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s Equip - Remot"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s es suicida!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s de l'equip %s és un suicida!"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "%s de l'equip %s ha mort."
+
+#: src/game/game.cpp:709
+#, c-format
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s de l'equip %s ha caigut dins l'aigua!"
+
+#: src/game/game.cpp:703
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s ha caigut dins l'aigua."
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s de l'equip %s ha caigut del mapa!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:724
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s ha caigut del mapa!"
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s de l'equip %s ha picat massa fort a terra!"
+
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s de l'equip %s s'ha mort per pocatraça!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -93,16 +105,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "¡El jugador '%s' ha augmentat %u punt de vida!"
 msgstr[1] "El jugador '%s' ha augmentat %u punts de vida!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s es un psicopata!!, ha mort un company del seu equip: %s"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s ha mort!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -126,21 +133,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "L'equip %s aconsegueix %u bazooka!"
 msgstr[1] "L'equip %s aconsegueix %u bazookas!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "L'equip %s aconsegueix %u Gnu!"
 msgstr[1] "L'equip %s aconsegueix %u Gnus!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "L'equip %s aconsegueix %u atac aeri!"
 msgstr[1] "L'equip %s aconsegueix %u atacs aeris!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -151,7 +158,7 @@ msgid_plural ""
 msgstr[0] "L'equip %s aconsegueix %u martell volador!"
 msgstr[1] "L'equip %s aconsegueix %u martells voladors!"
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -203,7 +210,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "L'equip %s aconsegueix %u bomba defragmentació!"
 msgstr[1] "L'equip %s aconsegueix %u bombes de fragmentació!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -239,7 +246,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "L'equip %s aconsegueix %u  football bomb!"
 msgstr[1] "L'equip %s aconsegueix %u football bombs!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -260,14 +267,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "L'equip %s aconsegueix %u gnu!"
 msgstr[1] "L'equip %s aconsegueix %u gnus!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "L'equip %s aconsegueix %u jetpack!"
 msgstr[1] "L'equip %s aconsegueix %u jetpacks!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -281,14 +288,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "L'equip %s aconsegueix %u mina!"
 msgstr[1] "L'equip %s aconsegueix %u minas!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "L'equip %s aconsegueix %u globus!"
 msgstr[1] "L'equip %s aconsegueix %u globus!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -309,7 +316,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "L'equip %s aconsegueix %u escopeta!"
 msgstr[1] "L'equip %s aconsegueix %u escopetes!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "L'equip %s aconsegueix %u manotada!"
+msgstr[1] "L'equip %s aconsegueix %u manotades!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -352,23 +366,33 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "L'equip %s aconsegueix %u perd torn!"
 msgstr[1] "L'equip %s aconsegueix %u perd torns!"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "L'equip %s aconsegueix %u llançador de tux!"
 msgstr[1] "L'equip %s aconsegueix %u llançador de tux!"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "L'equip %s ha guanyat."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s s'ha emportat un membre de %s a la tomba amb ell!"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(mort)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(idioma del sistema)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(temps desconegut)"
 
@@ -377,7 +401,7 @@ msgstr "(temps desconegut)"
 msgid "(unlimited)"
 msgstr "(ilimitat)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -386,7 +410,11 @@ msgstr ""
 "La versió %s està disponible, però tens la versió %s. Potser vols veure si "
 "hi ha una actualització disponible per al teu sistema operatiu. "
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Afegir equip personalitzat"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Atac aeri"
 
@@ -394,17 +422,25 @@ msgstr "Atac aeri"
 msgid "Airhammer"
 msgstr "Martell aeri"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Tots els equips "
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Sempre "
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "El guanyador és..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
 "Fire : space key\n"
 "a hit per turn"
 msgstr ""
-"Angulo: Dalt/Baix\n"
+"Angle: Dalt/Baix\n"
 "Foc: barra espaciadora\n"
 "un tir per torn "
 
@@ -412,7 +448,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Enclusa"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autors:"
 
@@ -436,6 +472,14 @@ msgstr "Baseball"
 msgid "Bazooka"
 msgstr "Bazooka"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Abans de començar"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Blitz"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Bufador"
@@ -448,8 +492,9 @@ msgstr "Bounce Ball"
 msgid "Bye bye tux..."
 msgstr "Fins ara tux... "
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Equip %s no disponible!"
@@ -459,24 +504,69 @@ msgstr "Equip %s no disponible!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "No es pot obrir el directori d'equips (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "No es pot obrir el directori d'equips (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "No es pot obrir el directori d'equips personalitzats (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Centrar la càmera al personatge"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Canvia el personatge actiu"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Canviar l'angle de tir"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Canviar la categoria d'arma "
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Cambiar el valor de algunas armas"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Personatge"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Canviar de personatge"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Comprovar actualitzacions a Internet? "
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Tria a l'atzar entre els diferents mapes"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Clàssica "
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Clic: Centra la càmera al personatge"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Client"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "El més maldestre"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Bomba de fragmentació"
@@ -489,7 +579,11 @@ msgstr "Bazooka"
 msgid "Commit Suicide"
 msgstr "Suïcidi"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Menú de configuració"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Connectar a una partida"
 
@@ -497,11 +591,11 @@ msgstr "Connectar a una partida"
 msgid "Connected !"
 msgstr "Connectat"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Construir"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Controlat per:"
 
@@ -510,7 +604,7 @@ msgstr "Controlat per:"
 msgid "Couldn't fetch last version from %s"
 msgstr "No s'ha pogut tornar a la versió %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "No es va poder obrir l'arxiu %s"
@@ -519,11 +613,32 @@ msgstr "No es va poder obrir l'arxiu %s"
 msgid "Credits"
 msgstr "Crèdits"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Energia per torn de la mort sobtada"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Elimina l'equip personalitzat "
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Disc explosiu"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Mostra aquest missatge"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Prémer i arrossegar: Mou la càmera"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Durada de la mort sobtada"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Duració del torn"
 
@@ -531,24 +646,34 @@ msgstr "Duració del torn"
 msgid "Dynamite"
 msgstr "Dinamita"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "Fi del joc"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Volum dels efectes"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Enemic"
+
+#: src/tool/error.cpp:63
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Error en %s:%lu"
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Error en %s:%lu (Wormux %s) : %s"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr "Error en iniciar la xarxa: Client %s no està d'acord amb vostè - %s "
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Error carregant l'equip:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -556,7 +681,22 @@ msgstr ""
 "Error mentre es creava el directori \"%s\": no es pot guardar el fitxer de "
 "configuració."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Error mentre s'esborrava el directori \"%s\". No es pot esborrar l'equip "
+"personalitzat."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Error mentre s'esborrava l'arxiu \"%s\". No es pot esborrar l'equip "
+"personalitzat."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -566,34 +706,40 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Error: No es pot connectar a %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Error: No es pot contactar amb el servidor on s'allotja la partida"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Error: No es pot contactar amb el servidor per a trobar una partida a "
 "internet"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Error: Imposible iniciar servidor"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Error: El teu servidor no es pot connectar a internet. Comprova la "
-"configuració del teu tallafoc. "
+"Error: El servidor no és accessible des de la Internet. Mira la configuració "
+"del firewall: El Port TCP %s ha d'acceptar connexió des de l'exterior. Si no "
+"està directament connectat a Internet, comprova la configuració de la teva "
+"router: Port TCP %s ha de ser dirigit al teu ordinador."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Error: no es pot trobar el skin \"%s\" per l'equip \"%s\"."
@@ -606,23 +752,31 @@ msgstr "Llançaflames"
 msgid "Football Bomb"
 msgstr "Pantalla completa?"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Pantalla completa / finestra"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Pantalla completa?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Joc"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Estil de joc"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Nom de joc:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Llançador de Gnu"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr "Opcions gràfiques"
 
@@ -630,11 +784,15 @@ msgstr "Opcions gràfiques"
 msgid "Grapple"
 msgstr "Atac"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Gravetat"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granada"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inicialització..."
 
@@ -642,16 +800,16 @@ msgstr "Inicialització..."
 msgid "Gun"
 msgstr "Pistola"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "El directori HOME (la variable d'entorn $HOME) no pot ser trobat!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Que tinguis una bona partida!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Comandant cap"
 
@@ -664,7 +822,11 @@ msgstr "Comandant cap:"
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Salt gran"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Allotjar una partida"
 
@@ -694,7 +856,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 "Com usar-lo: clic esquerre sobre l'objectiu\n"
-"Angulo de foc inicial: Dalt/Baix\n"
+"Angle de foc inicial: Dalt/Baix\n"
 "Foc: mantingues premuda la barra espaciadora fins a arribar a la força "
 "desitjada\n"
 "un arma per torn "
@@ -707,7 +869,11 @@ msgstr ""
 "Com usar-lo: botó dret sobre l'objectiu\n"
 " un arma per torn "
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Apressa't, ets massa lent"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -715,7 +881,8 @@ msgstr ""
 "Si trobes un bug o tens una petició de funcionalitat, envia'ns un email (amb "
 "engles, per favor): "
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Energia inicial"
 
@@ -731,7 +898,7 @@ msgstr ""
 "desitjada\n"
 " un arma per torn "
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inicialització"
 
@@ -739,31 +906,43 @@ msgstr "Inicialització"
 msgid "Initialise map"
 msgstr "Inicialització de mapes"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inicialització de sons"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inicialització d'equips"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Això és un regal! "
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Entra #en wormux en irc.freenode.net per a trobar algun contrincant."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Salt"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Salt d'esquena"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Treu els jugadors designats per <nickname> fora del joc"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Idioma"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Carrega els mapas:"
 
@@ -771,7 +950,7 @@ msgstr "Carrega els mapas:"
 msgid "Load teams:"
 msgstr "Carrega els equips:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Equips locals:"
 
@@ -779,13 +958,13 @@ msgstr "Equips locals:"
 msgid "LowGrav"
 msgstr "Baixa gravetat"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "Connexió manual"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Mapa"
 
@@ -798,11 +977,15 @@ msgstr "Mapa %s, fet per:"
 msgid "Maps"
 msgstr "Mapes"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Energia màxima"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Nombre de jugadors màxim per equip:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Numero màxim de FPS"
 
@@ -810,39 +993,43 @@ msgstr "Numero màxim de FPS"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr "Miscel·lània"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "El més precís"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "El més maldestre"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "El més traïdor"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "El més útil"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "El més inutil"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "El més violent"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Mou la càmera amb el ratolí o amb les fletxes "
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Moure el personatge"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Volum de la música"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Música?"
 
@@ -850,32 +1037,48 @@ msgstr "Música?"
 msgid "Network Game"
 msgstr "Joc en xarxa"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Inicialització de la xarxa"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Mai"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Nou joc de la xarxa en"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Avís de nou jugador?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Cap element <%s> trobat en el arxiu de configuració xml!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Ningú!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Nombre de jugadors"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Nombre de equips:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "En el personatge: Canvia el jugador actiu "
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "En el mapa: Selecciona un personatge "
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opcions"
@@ -888,42 +1091,54 @@ msgstr "Menú de opcions"
 msgid "Parachute"
 msgstr "Paracaigudes"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "El paracaigudes s'activa automàticament."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr "Clau:"
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pausa"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Jugar"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Jugar diverses partides"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Jugador"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Energia del jugador?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Nom del jugador"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "¿Nom del jugador?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Llançador de mofetas "
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr "Batalla publica "
 
@@ -931,7 +1146,7 @@ msgstr "Batalla publica "
 msgid "Quit"
 msgstr "Sortí"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Sortir de Wormux"
 
@@ -939,19 +1154,23 @@ msgstr "Sortir de Wormux"
 msgid "Quit battle"
 msgstr "Sortir de la batalla"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Sortir del joc "
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Mapa aleatori"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Llegint fitxer de configuració"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Llegint fitxer de configuració personal"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Resolució"
 
@@ -959,33 +1178,33 @@ msgstr "Resolució"
 msgid "Riot Bomb"
 msgstr "Bomba antidisturbis"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Arrenca el joc"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Parla:"
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr "Desplaçament en les vores"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Desplaçament en les vores"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Adreça del servidor:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Servidor disponible a internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Servidor"
 
@@ -993,10 +1212,36 @@ msgstr "Servidor"
 msgid "Shotgun"
 msgstr "Escopeta"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Veure el menú d'armes "
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Veure/ocultar la informació"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Veure/ocultar minimapa "
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Saltar torn"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Manotada"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Manotada a l'enemic per fer-li donar un petit salt. "
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+"Angle lent\n"
+"Salt petit"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Fusell de franctirador"
@@ -1005,28 +1250,38 @@ msgstr "Fusell de franctirador"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Algú va posar un parany explosiu camuflat a caixa! "
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Lo siento, actualmente, ningún juego está esperando a jugadores"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Ho sentim, però la seva versió no té suport. La versió amb suport és %s. Pot "
+"descarregar una versió actualitzada en http://www.wormux.org/wiki/download."
+"php "
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "So"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Efectes sonors?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Freqüència del so"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Començant un nou joc"
 
@@ -1046,18 +1301,26 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Xeringa"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Parla en la batalla en xarxa"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr "gràfics d'equips"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr "estat dels equips"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Equips"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Editor d'equips"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teletransportació"
@@ -1074,11 +1337,11 @@ msgstr ""
 "La bomba de fragmentació ha abandonat es camp de batalla abans de poder "
 "explota."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "El Gnu va abandonar el camp de batalla abans d'explotar. T'enyorarem"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr ""
 "La mofeta va abandonar el camp de batalla abans d'explotar. Que el seu pudor "
@@ -1092,6 +1355,15 @@ msgstr "El coet automàtic ha anat a altre món... "
 msgid "The ball left the battlefield before exploding"
 msgstr "La pilota ha abandonat el camp de batalla abans d'explotar."
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"El client i el servidor tenen la versió incompatible (client=%s, servidor=%"
+"s). Porfavor escull un altre servidor. "
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "Ha passat el temps de connexió. Mira si no hi ha algun firewall."
@@ -1100,7 +1372,7 @@ msgstr "Ha passat el temps de connexió. Mira si no hi ha algun firewall."
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "El disc bomba ha abandonat la pista de ball abans d'explotar. "
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "El joc es va interrompre per que t'has desconnectat. "
 
@@ -1108,7 +1380,7 @@ msgstr "El joc es va interrompre per que t'has desconnectat. "
 msgid "The grenade left the battlefield before exploding"
 msgstr "La granada ha abandonat el camp de batalla abans d'explotar. "
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Tots estan esperant! Venja que tots estan per tu :-) "
 
@@ -1125,14 +1397,19 @@ msgstr "El servidor ha rebutjat la connexió."
 msgid "The server rejected the connection: wrong password!"
 msgstr "El servidor ha rebutjat la connexió: password erroni"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Solament hi ha %i equip."
 msgstr[1] "Solament hi ha %i equips."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Temps"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1156,7 +1433,7 @@ msgstr ""
 " Foc: barra espaciadora\n"
 "un arma per torn"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Eines"
 
@@ -1164,12 +1441,12 @@ msgstr "Eines"
 msgid "Unable to contact host."
 msgstr "Impossible contactar amb el servidor! "
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Imposible obrir el directori dels mapas (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Impossible obrir el directori dels mapes (%s)!"
@@ -1178,83 +1455,109 @@ msgstr "Impossible obrir el directori dels mapes (%s)!"
 msgid "Unable to use this port!"
 msgstr "Impossible usar aquest port!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Comando desconegut"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Il·limitat"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Sense nom"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versió"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "La verificació de versió ha fallat per: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Espera! %i jugador no està preparat encara! "
 msgstr[1] "Espera! %i jugadors no estan preparats encara! "
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Esperant al servidor, tot el que pots fer és cancel·lar o xerrar!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+"Arma: Dispara\n"
+" Caixes: Accelera la caiguda"
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Armes"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Pagina web: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Quina vergonya per %s: ha estat mort per una simple pistola!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Mostra les particulas del vent?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Guanyador"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Arrencant Wormux..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Versió Wormux"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "Mapa incorrecte CRC!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Nom de mapa incorrecte!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Equip incorrecte!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Estàs solament..."
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Estàs solament... "
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Tu necesites almenys un mapa vàlid!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Tu necesites almenys dos equips vàlids!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "No podràs jugar abans de seleccionar un equip!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Has fallat el tir!"
 
@@ -1262,7 +1565,7 @@ msgstr "Has fallat el tir!"
 msgid "aka"
 msgstr "aqui "
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1272,15 +1575,20 @@ msgstr ""
 "Per a bombardejar: clic dret sobre l'objectiu\n"
 "un atac per torn"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "No es pot carregar el fitxer de configuració"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "jugador personalitzat"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "Acabat"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "Llegint fitxer de configuració"
 
@@ -1288,15 +1596,15 @@ msgstr "Llegint fitxer de configuració"
 msgid "from"
 msgstr "de"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "no hi ha un fitxer de configuració"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Carregant musica"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Carregant perfil de so: %s "
@@ -1306,32 +1614,22 @@ msgstr "o Carregant perfil de so: %s "
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Obert àudio a %d Hz %d bit "
 
-#~ msgid "Connect !"
-#~ msgstr "Connexió!"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Connectat a una partida a internet"
+#~ msgid "Automatically join a game"
+#~ msgstr "Unir-se automàticament a la partida"
 
-#~ msgid "Refresh"
-#~ msgstr "Actualitzar"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Error carregant dades de l'equip %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Error carregant el fitxer de configuració: %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Error carregant el fitxer de configuració: %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Error carregant la manera de joc %s (fitxer %s):"
-
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "Error XML durant la carrega del mapa '%s':"
+#~ msgid ""
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
+#~ msgstr ""
+#~ "No hi ha servidors públics disponibles i la connexió manual està mal "
+#~ "configurada. Prova connectant-te manualment."
 
-#~ msgid "%s team was fragged down."
-#~ msgstr "L'equip %s ha guanyat."
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Error: El teu servidor no es pot connectar a internet. Comprova la "
+#~ "configuració del teu tallafoc. "
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: opció il·legal -- %c\n"
@@ -1365,91 +1663,3 @@ msgstr "o Obert àudio a %d Hz %d bit "
 
 #~ msgid "%s: unrecognized option `--%s'\n"
 #~ msgstr "%s: opció no reconeguda`--%s'\n"
-
-#~ msgid "And the winner is..."
-#~ msgstr "El guanyador és..."
-
-#~ msgid "Displays this message"
-#~ msgstr "Mostra aquest missatge"
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Apressa't, ets massa lent"
-
-#~ msgid "Kicks the players designated by <nickname> out of the game"
-#~ msgstr "Treu els jugadors designats per <nickname> fora del joc"
-
-#~ msgid ""
-#~ "The client and server versions are incompatible (local=%s, server=%s). "
-#~ "Please try another server."
-#~ msgstr ""
-#~ "El client i el servidor tenen la versió incompatible (client=%s, servidor="
-#~ "%s). Porfavor escull un altre servidor. "
-
-#~ msgid "Unknown command"
-#~ msgstr "Comando desconegut"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr ""
-#~ "%s intenta a connectar-se amb una version diferent: client=%s, servidor=%"
-#~ "s. "
-
-#~ msgid "C++ exception caught:"
-#~ msgstr "Excepció C++ interceptada :"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Estar segur que vol sortir? (Y/N)"
-
-#~ msgid "Duration of the end of a turn:"
-#~ msgstr "Duracio del temps despres del torn:"
-
-#~ msgid "End of the game!\n"
-#~ msgstr "Final de la partida !\n"
-
-#~ msgid "Energy:"
-#~ msgstr "Energia :"
-
-#~ msgid "Error during loading skin %s:"
-#~ msgstr "Error durant la carrega del skin %s :"
-
-#~ msgid "Info"
-#~ msgstr "Informació"
-
-#~ msgid "Load game data..."
-#~ msgstr "Carregant les dades del joc ..."
-
-#~ msgid "Load weapon %s"
-#~ msgstr "Carregant l'arma %s"
-
-#, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Inicialització..."
-
-#~ msgid "Number of players per team:"
-#~ msgstr "Nombre de jugadors per equip:"
-
-#~ msgid "Pause"
-#~ msgstr "Pausa"
-
-#~ msgid "Please tell us your opinion of Wormux via email:"
-#~ msgstr "Siusplau dona'ns la teva opinió de Wormux per correu electrónic:"
-
-#~ msgid "Sound error :"
-#~ msgstr "Error de so :"
-
-#~ msgid "The game has ended as a draw.\n"
-#~ msgstr "El joc ha acabat en empat.\n"
-
-#~ msgid "Use sound?"
-#~ msgstr "Utilitza so?"
-
-#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
-#~ msgstr ""
-#~ "Necesites almenys dos equips per jugar, canvia això en 'Opcions del menú'!"
-
-#, fuzzy
-#~ msgid "[Music] Error : file %s does not exist"
-#~ msgstr "Arxiu \"%s\" no existeix !"
-
-#, fuzzy
-#~ msgid "[Sound] Error: File %s does not exist"
-#~ msgstr "Arxiu \"%s\" no existeix !"
diff --git a/po/cpf.po b/po/cpf.po
index 3dd87ab..a89de0d 100644
--- a/po/cpf.po
+++ b/po/cpf.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2008-01-22 18:12+0100\n"
 "Last-Translator: GG <jeronimo974_ at _gmail.com>\n"
 "Language-Team:  <fr at li.org>\n"
@@ -20,71 +20,81 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Scuse à moins, mais y gaingne pas trouve terrain là : %s"
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i marmaille lé en train de jouer"
 msgstr[1] "%i marmailles lé en train de jouer"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] " na na %i joueur que lé prêt"
 msgstr[1] " na na %i joueurs que lé prêts"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) lé mort."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> y dit %s de %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> de %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "%s Équipes"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s équipe - loin là bas"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s la jette son corps la mer !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s i/s"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s la jette son corps la mer !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s) lé mort."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s la tombe dans l'eau."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s la sorte du terrain !"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s lé mort à koz son 2 mains gauches..."
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -92,16 +102,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "Marmaille %s la gagné %u point d'vie !"
 msgstr[1] "Marmaille %s la gagné %u points d'vie !"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s l'est gazé ça !! Boug là, la kine son camarades (%s) !"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s lé mort à koz son 2 mains gauches..."
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -125,21 +130,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "L'équipe %s a gagné %u !!"
 msgstr[1] "L'équipe %s a gagné %u !"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "Le joueur %s a gagné %u batte de baseball !!"
 msgstr[1] "Le joueur %s a gagné %u battes de baseball !"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "Le joueur %s a gagné %u attaque aérienne !!"
 msgstr[1] "Le joueur %s a gagné %u attaques aériennes !"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -154,7 +159,7 @@ msgstr[1] ""
 "bande %s la gagne %u marteaux pneumatiques! Fé pas trop désorde avec ça "
 "sinon oute bandes voisins y ça totoshe à ou."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -210,7 +215,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "L'équipe %s a gagné %u !"
 msgstr[1] "L'équipe %s a gagné %u  !"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -246,7 +251,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "L'équipe %s a gagné %u !"
 msgstr[1] "L'équipe %s a gagné %u !!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -267,14 +272,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "L'équipe %s a gagné %u !!"
 msgstr[1] "L'équipe %s a gagné %u !"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "Le joueur %s a gagné %u attaque aérienne !!"
 msgstr[1] "Le joueur %s a gagné %u attaques aériennes !"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -288,14 +293,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "L'équipe %s a gagné %u !!"
 msgstr[1] "L'équipe %s a gagné %u !"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "L'équipe %s a gagné %u !!"
 msgstr[1] "L'équipe %s a gagné %u !!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -316,7 +321,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "L'équipe %s a gagné %u !"
 msgstr[1] "L'équipe %s a gagné %u !"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "L'équipe %s a gagné %u !!"
+msgstr[1] "L'équipe %s a gagné %u !"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -359,23 +371,33 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "L'équipe %s a gagné %u !"
 msgstr[1] "L'équipe %s a gagné %u !"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "L'équipe %s a gagné %u !"
 msgstr[1] "L'équipe %s a gagné %u !"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(kapoute)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "ça c'est la langue du système"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -384,14 +406,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(illimitées)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Zot y attaque par lo ciel !"
 
@@ -399,10 +425,19 @@ msgstr "Zot y attaque par lo ciel !"
 msgid "Airhammer"
 msgstr "Marteau piqueur"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Toutes bandes marmailles"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Jouer"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Voilà quissa la gagné..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -416,7 +451,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Enclume"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Zoteurs :"
 
@@ -440,6 +475,15 @@ msgstr "Batte de Base-ball"
 msgid "Bazooka"
 msgstr "Bazooka"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Téléportation"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Chalumeau"
@@ -452,8 +496,9 @@ msgstr "Balle y rebondi"
 msgid "Bye bye tux..."
 msgstr "Nartrouvé tux!!"
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Gaingne pas trouver l'équipe %s !"
@@ -463,24 +508,72 @@ msgstr "Gaingne pas trouver l'équipe %s !"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Gaingne pas ouvrir le répertoire des équipes (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Gaingne pas ouvrir le répertoire des équipes (%s) !"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Gaingne pas ouvrir le répertoire des équipes (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Nombre de joueurs par équipe"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Parachute"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Parachute"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "choisi une carte n'importe comment"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Mode client"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Sa ki lé le moins doué."
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Grenade lé fragmenté"
@@ -494,7 +587,12 @@ msgstr "Bazooka"
 msgid "Commit Suicide"
 msgstr "Suicide"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "Gaingne pas charge lo fichier de configuration!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Connecte a moins"
 
@@ -502,11 +600,11 @@ msgstr "Connecte a moins"
 msgid "Connected !"
 msgstr "Moins lé connecté !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Construction"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "ça c'est controllé par:"
 
@@ -515,7 +613,7 @@ msgstr "ça c'est controllé par:"
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, fuzzy, c-format
 msgid "Couldn't open file %s"
 msgstr "* Na un n'affaire y s'ar pas ek le son:"
@@ -524,11 +622,33 @@ msgstr "* Na un n'affaire y s'ar pas ek le son:"
 msgid "Credits"
 msgstr "Crédits"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+#, fuzzy
+msgid "Delete custom team"
+msgstr "Choisissez les équipes :"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Grenade boite de nuit"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Durée d'un tour"
 
@@ -536,24 +656,35 @@ msgstr "Durée d'un tour"
 msgid "Dynamite"
 msgstr "Dynamite"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "LE JEU LA FINI"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+#, fuzzy
+msgid "Energy"
+msgstr "Énergie :"
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Erreur dans %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Pas gagné charger l'équipe %s:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -561,7 +692,22 @@ msgstr ""
 "La création du répertoire \"%s\" la échoué : gaingne pas sauvegarde la "
 "configuration du jeu."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"La création du répertoire \"%s\" la échoué : gaingne pas sauvegarde la "
+"configuration du jeu."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"La création du répertoire \"%s\" la échoué : gaingne pas sauvegarde la "
+"configuration du jeu."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -571,30 +717,36 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "La connection à %s y marche pa: %s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Gaigne pas koze ek lo serveur d'index pou créer une partie"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "Gainge pas koze ek lo serveur d'index pou rode une partie sur internet"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Tééé, le serveur y veut pas démarrer."
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Erreur : le skin \"%s\" pour l'équipe \"%s\" la fané ça..."
@@ -608,25 +760,35 @@ msgstr "lance-flammes"
 msgid "Football Bomb"
 msgstr "Bombe lacrimogène"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Plein écran ?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Plein écran ?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 #, fuzzy
 msgid "Game"
 msgstr "Nom :"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "Options du jeu"
+
+#: src/menu/network_connection_menu.cpp:187
 #, fuzzy
 msgid "Game name:"
 msgstr "Options du jeu"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Lance Gnu"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -634,11 +796,15 @@ msgstr ""
 msgid "Grapple"
 msgstr "grappin"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Grenade"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "En train'e prépare lo terrain"
 
@@ -646,17 +812,17 @@ msgstr "En train'e prépare lo terrain"
 msgid "Gun"
 msgstr "Pistolet"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr ""
 "Gaingne pas trouve le répertoire HOME (variable d'environnement $HOME) !"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Bonne partie !"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Lo chef"
 
@@ -669,7 +835,11 @@ msgstr "Lo chef:"
 msgid "Help"
 msgstr "de l'aide !"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Créer une partie"
 
@@ -708,7 +878,11 @@ msgstr ""
 "Comment utilises à lu: pese ek le bouton gauche de oute souris sur la cible."
 "une munition par tour"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Grouille oute calbasse !"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -716,7 +890,8 @@ msgstr ""
 "Si ou trouve n'a na un bug, ou un nafaire y s'ar pas ek Wormux, envoye un "
 "mail (en anglais seulement) si ou plait :"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Énergie initiale"
 
@@ -730,7 +905,7 @@ msgstr ""
 "angle de tir: en haut/en bastir: pèse dessu la barre espace jusqu'à la force "
 "que ou veutune munition par tour"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Initialisation"
 
@@ -738,34 +913,46 @@ msgstr "Initialisation"
 msgid "Initialise map"
 msgstr "En train'e prépare lo terrain"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Initialisation du sond"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Initialisation des équipes"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Trape kado là pou ou !"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 "Venez sur #wormux-fr à irc.freenode.net pour trouver des adversaires.Vien a "
 "ou su #wormux-fr a irc.freenode.net pou rode d'autres camarades pou jouer "
 "avec."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "la langue"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Terrains lé en train de charger :"
 
@@ -773,7 +960,7 @@ msgstr "Terrains lé en train de charger :"
 msgid "Load teams:"
 msgstr "Chargement des équipes :"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Equipes local :"
 
@@ -781,14 +968,14 @@ msgstr "Equipes local :"
 msgid "LowGrav"
 msgstr "Anti-gravité"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 #, fuzzy
 msgid "Manual connection"
 msgstr "déconnection!"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "Terrains"
@@ -802,11 +989,16 @@ msgstr "Terrain %s, une création de :"
 msgid "Maps"
 msgstr "Terrains"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Énergie initiale"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Nombre de joueurs maximum :"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Nbr. max. d'images/sec"
 
@@ -814,40 +1006,45 @@ msgstr "Nbr. max. d'images/sec"
 msgid "Mine"
 msgstr "Mine"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "Musique ?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "plus précis"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Sa ki lé le moins doué."
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "le plus macro"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Sa ki serve le plus"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Sa ki serve le moins"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Le plus violent"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Parachute"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Musique ?"
 
@@ -855,33 +1052,49 @@ msgstr "Musique ?"
 msgid "Network Game"
 msgstr "Jeu en réseau"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Prépare lo rézo"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
 msgstr "Jeu en réseau"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Pas trouve rien (<%s>) dans oute fichier de configuration XML !"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Personne!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Nombre de joueurs par équipe"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Nombre d'équipe :"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Options"
@@ -894,42 +1107,55 @@ msgstr "Options du menu"
 msgid "Parachute"
 msgstr "Parachute"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Parachute là y ouvre tout seul."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Jouer"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Joueur"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Affiche l'énergie des joueurs ?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Affiche le ti'nom des joueurs ?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Affiche le ti'nom des joueurs ?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Lance putois"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port :"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 #, fuzzy
 msgid "Public battles"
 msgstr "Allons barer"
@@ -938,7 +1164,7 @@ msgstr "Allons barer"
 msgid "Quit"
 msgstr "Barré"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Quitte Wormux"
 
@@ -946,19 +1172,24 @@ msgstr "Quitte Wormux"
 msgid "Quit battle"
 msgstr "Allons barer"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Lancement du jeu"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "carte choisi n'importe comment"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "An train'e lire ou'te fichier de configuration"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "An train'e lire oute fichier de configuration a ou même"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Résolution"
 
@@ -966,34 +1197,34 @@ msgstr "Résolution"
 msgid "Riot Bomb"
 msgstr "Bombe lacrimogène"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Lancement du jeu"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "y dit:"
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "Scrolling actif sur les bords"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Scrolling actif sur les bords"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Adresse du serveur :"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Serveur ok sur Internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Mode serveur"
 
@@ -1001,10 +1232,35 @@ msgstr "Mode serveur"
 msgid "Shotgun"
 msgstr "Fusil à pompe"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Options du menu"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Passer son tour"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Fusil sniper"
@@ -1013,30 +1269,37 @@ msgstr "Fusil sniper"
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr ""
 "Scuze, seulement, là, na point personne y attende pour d'autres joueurs"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "Options sonores"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Effets sonores ?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Fréquence d'échantillonage ?"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Options sonores"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Démarrage d'une nouvelle partie"
 
@@ -1056,20 +1319,29 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Seringue"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+#, fuzzy
+msgid "Talk in network battle"
+msgstr "Allons bataille"
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "Équipes"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "Équipes"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Équipes"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Téléportation"
@@ -1085,11 +1357,11 @@ msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr ""
 "La grenade à fragmentation la barré du champs de bataille avant lu pête."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Le Gnu la barré du champs de bataille avant lu pête."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Le putois la barré avant lu pête."
 
@@ -1101,6 +1373,13 @@ msgstr "La roquette que lé automatique la barré ailleurs ..."
 msgid "The ball left the battlefield before exploding"
 msgstr "La balle ki rebondi la sorte du champs de bataille avant lu pête."
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "La connexion terminé. Vérifi na point de firewall !"
@@ -1109,7 +1388,7 @@ msgstr "La connexion terminé. Vérifi na point de firewall !"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "La grenade boite de nuit la barré de la piste avant lu pête."
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1117,7 +1396,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr "La grenade la vole chemin avant lu pête."
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Hého, band'na y attendent a ou! alors, grouille oute calbasse !"
 
@@ -1135,14 +1414,19 @@ msgstr "Le serveur la envoy'e chié oute connexion"
 msgid "The server rejected the connection: wrong password!"
 msgstr "Le serveur la envoy'e chié oute connexion"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Na n'a que %i équipe."
 msgstr[1] "Na n'a que %i équipes."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1164,7 +1448,7 @@ msgstr ""
 "page en en haut/page en basangle: en haut/en bastir: pèse dessus bar espace "
 "jusqu'à ce avoir la force que ou veut.une action par tour"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Z'outils"
 
@@ -1172,12 +1456,12 @@ msgstr "Z'outils"
 msgid "Unable to contact host."
 msgstr "Gaingne pas contact le serveur"
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Impossible d'ouvrir le répertoire des terrains (%s) !"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Impossible d'ouvrir le répertoire des terrains (%s)!"
@@ -1186,85 +1470,110 @@ msgstr "Impossible d'ouvrir le répertoire des terrains (%s)!"
 msgid "Unable to use this port!"
 msgstr "Impossible d'utiliser ce port !"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(illimitées)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "pas de nom"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Version"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Attend tééééé ! %i joueur lé pas encore prêt !"
 msgstr[1] "Attend à zot tééééé ! %i joueurs lé pas encore prêt !"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 "Nous y attende lo server. Alors reste trankil. La seule chose ou gaingne fé "
 "c'est koze ek de moune, ou quitter le zaffaire."
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Armes"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Site internet : "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Trop la honte pour %s : un simple pistolet la kine à lu !"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Particules du vent ?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "ça que la gagné"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux y démarre ..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux version "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Ou lé tout seul."
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Ou lé sur vouloir jouer tout seul ?!"
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Ou na na besoin d'au moins un terrain correct..."
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Il faut au minimum deux équipes correctes !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Gaingne pas joué avant de prendre une équipe !"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Tir dans le vide..."
 
@@ -1272,7 +1581,7 @@ msgstr "Tir dans le vide..."
 msgid "aka"
 msgstr "ti nom gaté"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1280,15 +1589,20 @@ msgid ""
 msgstr ""
 "direction de l'attaque: gauche/droitebombe: clik gaucheune bombe par tour"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "Téééé, gaingne pas charge la configuration là..."
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "Lé bon"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "An train'e lire ou'te fichier de configuration"
 
@@ -1296,15 +1610,15 @@ msgstr "An train'e lire ou'te fichier de configuration"
 msgid "from"
 msgstr "de"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "Gaingne pas charge lo fichier de configuration!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Music en train'e charger"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Profile son en train'e charger : %s"
@@ -1314,69 +1628,31 @@ msgstr "o Profile son en train'e charger : %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Démarrage du son à %d Hz %d bit"
 
-#~ msgid "Connect !"
-#~ msgstr "Connecté !"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Connect une partie internet"
-
-#~ msgid "Refresh"
-#~ msgstr "Rafraîchir"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Pas gagné charger l'équipe %s :"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Gaingne pas charge lo fichier de configuration : %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Gaingne pas charge lo fichier de configuration : %s "
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Gaingne pas charge lo mode de jeu %s (fichier %s) :"
-
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "Erreur XML pendant que lété en train'e charge lo terrain '%s':"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr ""
-#~ "%s... Hein, ou'te client et serveur na point la même version de Wormux : "
-#~ "client=%s, serveur=%s."
+#~ msgid " "
+#~ msgstr " "
 
-#~ msgid "And the winner is..."
-#~ msgstr "Voilà quissa la gagné..."
+#~ msgid "  Most sold-out  :  "
+#~ msgstr "  Le plus traitre : "
 
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Grouille oute calbasse !"
+#~ msgid "  Most useful   :  "
+#~ msgstr " Le plus utile :  "
 
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Ou lé sur vouloit allé ? (O/N)"
+#~ msgid "  Most useless  :  "
+#~ msgstr "  Le plus inutile  :  "
 
-#, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Prépare lo rézo"
+#~ msgid "  Most violent  :  "
+#~ msgstr "  Le plus violent  :  "
 
-#~ msgid "(current)"
-#~ msgstr "(actuel)"
+#~ msgid " has joined the party"
+#~ msgstr "boug là la arrivé"
 
-#, fuzzy
-#~ msgid ""
-#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
-#~ "blowtorch, submachine gun) and surely many other things don't work either!"
-#~ msgstr ""
-#~ "Certaines armes sont désactivées car elles sont à l'origine de bugs "
-#~ "connus (corde ninja, attaque aérienne, mitrailleuse) mais il y'en a "
-#~ "sûrement d'autre !Na na 2, 3 armes y marche pas, a koz que zot y cré de "
-#~ "bugs que nou connai (ficelle tortue, attaque par le ciel, mitrailleuse), "
-#~ "mais kiette pas, na na surement encore d'autre !"
+#~ msgid " has left the party"
+#~ msgstr "lé parti"
 
-#~ msgid ""
-#~ "WARNING!! Network is still under developement and therefore a little "
-#~ "experimental."
-#~ msgstr ""
-#~ "Attention !! Le jeu en réseau est encore en développement et est de se "
-#~ "fait très expérimental.Tention ! Toute la partie réseau lé encore en "
-#~ "train d'être développé, alors du coup, y risk de pas être très stable..."
+#~ msgid "%s has lost %u point of energy."
+#~ msgid_plural "%s has lost %u points of energy."
+#~ msgstr[0] "Le joueur %s a perdu %u point d'énergie."
+#~ msgstr[1] "Le joueur %s a perdu %u points d'énergie."
 
 #, fuzzy
 #~ msgid "%s team has won %u Gnu!"
@@ -1408,105 +1684,10 @@ msgstr "o Démarrage du son à %d Hz %d bit"
 #~ msgstr[0] "L'équipe %s a gagné %u %s !"
 #~ msgstr[1] "L'équipe %s a gagné %u %ss !"
 
-#~ msgid ""
-#~ "WARNING! Disconnections are not yet handled. So you have to restart "
-#~ "Wormux after each disconnection!"
-#~ msgstr ""
-#~ "ATTENTION! Les déconnections ne sont pas gérées. Vous devez donc "
-#~ "redémarrer Wormux après chaque déconnexion !Tention ! Na point de reprise "
-#~ "de connection automatique dans le jeu. Donc, si vi perde oute connection "
-#~ "pendant le jeu, ben, vi doit redémarre Wormux après !"
-
-#~ msgid "Remote"
-#~ msgstr "Distant"
-
-#~ msgid "Ninjarope"
-#~ msgstr "ficelle tortue"
-
-#, fuzzy
-#~ msgid "Error while exporting file %s:"
-#~ msgstr "Gaingne pas charge le mode de jeu %s (fichier %s) :"
-
-#~ msgid "Error while loading game mode %s from memory:"
-#~ msgstr "Gaingne pas charge lo mode de jeu %s ek la mémoire :"
-
-#~ msgid "Unexpected exception caught..."
-#~ msgstr "Ah, nous la trapé une exception non attendu"
-
-#~ msgid "C++ exception caught:"
-#~ msgstr "N'a une execption C++ que la été trapé:"
-
-#~ msgid "Failed to initialize network library!"
-#~ msgstr ""
-#~ "Tééé, ko ça l'a fé dont... y gaingne pas initialise la bibliothèque "
-#~ "SDL_net : %s"
-
-#~ msgid "Initialisation of TTF library failed: %s"
-#~ msgstr "Gaingne pas initialise la bibliothèque SDL_ttf : %s"
-
-#~ msgid "Unable to initialize SDL library: %s"
-#~ msgstr "Gaingne pas initialise la bibliothèque SDL : %s"
-
-#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
 #~ msgstr ""
-#~ "Téééé, ou n'a besoin d'au moins deux équipes, allez change ça dans le "
-#~ "menu Options !"
-
-#~ msgid "general: "
-#~ msgstr "Lo grand chef"
-
-#~ msgid " has joined the party"
-#~ msgstr "boug là la arrivé"
-
-#~ msgid " has left the party"
-#~ msgstr "lé parti"
-
-#~ msgid "* Couldn't initialize SDL: "
-#~ msgstr "* Aie, lé pa bon... SDL la reste en plan:"
-
-#~ msgid "Find a random position for characters"
-#~ msgstr "Nous lé en train'e place toute bande personnage"
-
-#~ msgid "[Music] Error : Unable to load music file: %s"
-#~ msgstr "[Musique] Erreur: gaingne pas charger le fichier pou le son: %s"
-
-#~ msgid "[Music] Error : file %s does not exist"
-#~ msgstr "[Musique] Erreur: fichier %s  y existe pas"
-
-#~ msgid "[Music] Error : file %s not found"
-#~ msgstr "[Musique] Erreur: trouve pas le fichier %s"
-
-#~ msgid "[Music] Unable to find music file: %s"
-#~ msgstr "[Musique] Trouve pas lo fichier son: %s"
-
-#~ msgid "[Music] Unable to find profile: %s"
-#~ msgstr "[Musique] Trouve pas lo profile: %s"
-
-#~ msgid "[Sound] Error : file %s not found"
-#~ msgstr "[Son] Problème: la pas trouvé lo fichier %s"
-
-#~ msgid "[Sound] Error: File %s does not exist"
-#~ msgstr "[Son] Erreur: Fichier %s y existe pas ça"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "  Most sold-out  :  "
-#~ msgstr "  Le plus traitre : "
-
-#~ msgid "  Most useful   :  "
-#~ msgstr " Le plus utile :  "
-
-#~ msgid "  Most useless  :  "
-#~ msgstr "  Le plus inutile  :  "
-
-#~ msgid "  Most violent  :  "
-#~ msgstr "  Le plus violent  :  "
-
-#~ msgid "%s has lost %u point of energy."
-#~ msgid_plural "%s has lost %u points of energy."
-#~ msgstr[0] "Le joueur %s a perdu %u point d'énergie."
-#~ msgstr[1] "Le joueur %s a perdu %u points d'énergie."
+#~ "%s... Hein, ou'te client et serveur na point la même version de Wormux : "
+#~ "client=%s, serveur=%s."
 
 #~ msgid "'%s has won %u Anvil"
 #~ msgid_plural "'%s has won %u Anvil"
@@ -1523,17 +1704,62 @@ msgstr "o Démarrage du son à %d Hz %d bit"
 #~ msgstr[0] "Le joueur %s a gagné %u anti-gravité !"
 #~ msgstr[1] "Le joueur %s a gagné %u anti-gravité !"
 
+#~ msgid "(current)"
+#~ msgstr "(actuel)"
+
+#~ msgid "* Couldn't initialize SDL: "
+#~ msgstr "* Aie, lé pa bon... SDL la reste en plan:"
+
 #~ msgid "All teams results:\n"
 #~ msgstr "Statistiques toutes équipes confondues:\n"
 
+#~ msgid "C++ exception caught:"
+#~ msgstr "N'a une execption C++ que la été trapé:"
+
+#~ msgid "Connect !"
+#~ msgstr "Connecté !"
+
+#~ msgid "Connect to an internet game"
+#~ msgstr "Connect une partie internet"
+
 #~ msgid "Connected to "
 #~ msgstr "Connecté à "
 
 #~ msgid "Contacting main server..."
 #~ msgstr "Contact du serveur principal ..."
 
-#~ msgid "Energy:"
-#~ msgstr "Énergie :"
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Ou lé sur vouloit allé ? (O/N)"
+
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Pas gagné charger l'équipe %s :"
+
+#, fuzzy
+#~ msgid "Error while exporting file %s:"
+#~ msgstr "Gaingne pas charge le mode de jeu %s (fichier %s) :"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Gaingne pas charge lo fichier de configuration : %s"
+
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Gaingne pas charge lo fichier de configuration : %s "
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Gaingne pas charge lo mode de jeu %s (fichier %s) :"
+
+#~ msgid "Error while loading game mode %s from memory:"
+#~ msgstr "Gaingne pas charge lo mode de jeu %s ek la mémoire :"
+
+#~ msgid "Failed to initialize network library!"
+#~ msgstr ""
+#~ "Tééé, ko ça l'a fé dont... y gaingne pas initialise la bibliothèque "
+#~ "SDL_net : %s"
+
+#~ msgid "Find a random position for characters"
+#~ msgstr "Nous lé en train'e place toute bande personnage"
+
+#~ msgid "Initialisation of TTF library failed: %s"
+#~ msgstr "Gaingne pas initialise la bibliothèque SDL_ttf : %s"
 
 #~ msgid "Invalid index server adress!"
 #~ msgstr "Adresse du serveur d'index invalide !"
@@ -1554,11 +1780,21 @@ msgstr "o Démarrage du son à %d Hz %d bit"
 #~ msgid "It doesn't seem to be a valid Wormux server..."
 #~ msgstr "Il semble que ce serveur Wormux ne soit valide ..."
 
+#, fuzzy
+#~ msgid "Network deinitialization"
+#~ msgstr "Prépare lo rézo"
+
+#~ msgid "Ninjarope"
+#~ msgstr "ficelle tortue"
+
 #~ msgid "Only the server can set the map!"
 #~ msgstr "Seul le serveur peut choisir la carte!"
 
-#~ msgid "Select the teams:"
-#~ msgstr "Choisissez les équipes :"
+#~ msgid "Refresh"
+#~ msgstr "Rafraîchir"
+
+#~ msgid "Remote"
+#~ msgstr "Distant"
 
 #~ msgid "Select the world:"
 #~ msgstr "Choisissez le terrain :"
@@ -1569,6 +1805,17 @@ msgstr "o Démarrage du son à %d Hz %d bit"
 #~ msgid "So you have to restart Wormux after each"
 #~ msgstr "Vous devez redémarrer Wormux après chaque"
 
+#, fuzzy
+#~ msgid ""
+#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
+#~ "blowtorch, submachine gun) and surely many other things don't work either!"
+#~ msgstr ""
+#~ "Certaines armes sont désactivées car elles sont à l'origine de bugs "
+#~ "connus (corde ninja, attaque aérienne, mitrailleuse) mais il y'en a "
+#~ "sûrement d'autre !Na na 2, 3 armes y marche pas, a koz que zot y cré de "
+#~ "bugs que nou connai (ficelle tortue, attaque par le ciel, mitrailleuse), "
+#~ "mais kiette pas, na na surement encore d'autre !"
+
 #~ msgid "Team %s results:\n"
 #~ msgstr "Statistiques de l'équipe %s:\n"
 
@@ -1579,15 +1826,70 @@ msgstr "o Démarrage du son à %d Hz %d bit"
 #~ msgid "Unable to contact top server!"
 #~ msgstr "Impossible de contacter le serveur!"
 
+#~ msgid "Unable to initialize SDL library: %s"
+#~ msgstr "Gaingne pas initialise la bibliothèque SDL : %s"
+
 #~ msgid "Unable to join the game..."
 #~ msgstr "Impossible de rejoindre la partie ..."
 
+#~ msgid "Unexpected exception caught..."
+#~ msgstr "Ah, nous la trapé une exception non attendu"
+
+#~ msgid ""
+#~ "WARNING! Disconnections are not yet handled. So you have to restart "
+#~ "Wormux after each disconnection!"
+#~ msgstr ""
+#~ "ATTENTION! Les déconnections ne sont pas gérées. Vous devez donc "
+#~ "redémarrer Wormux après chaque déconnexion !Tention ! Na point de reprise "
+#~ "de connection automatique dans le jeu. Donc, si vi perde oute connection "
+#~ "pendant le jeu, ben, vi doit redémarre Wormux après !"
+
+#~ msgid ""
+#~ "WARNING!! Network is still under developement and therefore a little "
+#~ "experimental."
+#~ msgstr ""
+#~ "Attention !! Le jeu en réseau est encore en développement et est de se "
+#~ "fait très expérimental.Tention ! Toute la partie réseau lé encore en "
+#~ "train d'être développé, alors du coup, y risk de pas être très stable..."
+
 #~ msgid "Wait! "
 #~ msgstr "Attendez! "
 
 #~ msgid "Weapon:"
 #~ msgstr "Arme :"
 
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "Erreur XML pendant que lété en train'e charge lo terrain '%s':"
+
+#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgstr ""
+#~ "Téééé, ou n'a besoin d'au moins deux équipes, allez change ça dans le "
+#~ "menu Options !"
+
+#~ msgid "[Music] Error : Unable to load music file: %s"
+#~ msgstr "[Musique] Erreur: gaingne pas charger le fichier pou le son: %s"
+
+#~ msgid "[Music] Error : file %s does not exist"
+#~ msgstr "[Musique] Erreur: fichier %s  y existe pas"
+
+#~ msgid "[Music] Error : file %s not found"
+#~ msgstr "[Musique] Erreur: trouve pas le fichier %s"
+
+#~ msgid "[Music] Unable to find music file: %s"
+#~ msgstr "[Musique] Trouve pas lo fichier son: %s"
+
+#~ msgid "[Music] Unable to find profile: %s"
+#~ msgstr "[Musique] Trouve pas lo profile: %s"
+
+#~ msgid "[Sound] Error : file %s not found"
+#~ msgstr "[Son] Problème: la pas trouvé lo fichier %s"
+
+#~ msgid "[Sound] Error: File %s does not exist"
+#~ msgstr "[Son] Erreur: Fichier %s y existe pas ça"
+
+#~ msgid "general: "
+#~ msgstr "Lo grand chef"
+
 #, fuzzy
 #~ msgid "some opponents."
 #~ msgstr "pour trouver des adversaires"
diff --git a/po/cs.po b/po/cs.po
index 637de61..148f4cb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,28 +1,29 @@
-# translation of wormux.po to czech
+# translation of cs.po to Čeština
 # Copyright (C) YEAR Wormux Development Team
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Marek Stopka <marekstopka at gmail.com>, 2008.
+# Vojtěch Gondžala <vojtech.gondzala at gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: wormux\n"
+"Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-01-16 21:53+0100\n"
-"Last-Translator: Marek Stopka <marekstopka at gmail.com>\n"
-"Language-Team: czech <cs at li.org>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-05-19 18:09+0200\n"
+"Last-Translator: Vojtěch Gondžala <vojtech.gondzala at gmail.com>\n"
+"Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Mapa %s nebyla nalezena :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
@@ -30,7 +31,7 @@ msgstr[0] "%i hráč připojen"
 msgstr[1] "%i hráči připojeni"
 msgstr[2] "%i hráčů připojeno"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
@@ -38,52 +39,62 @@ msgstr[0] "%i hráč připraven"
 msgstr[1] "%i hráči připraveni"
 msgstr[2] "%i hráčů připraveno"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) zemřel"
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> jako %s z %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> z %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "%s Tým"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s Tým - Vzdálený"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s spáchal sebevraždu !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s spáchal sebevraždu !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s) zemřel."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s se utopil."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s zmizel z mapy!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s je mrtvý, protože je trdlo!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -92,20 +103,15 @@ msgstr[0] "%s získal %u život!"
 msgstr[1] "%s získal %u životy!"
 msgstr[2] "%s získal %u životů!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s je psychouš, zabil člena týmu %s!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s je mrtvý, protože je trdlo!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
-msgstr "%s šlápl na minu."
+msgstr "%s šlápl na minu!"
 
 #: src/object/bonus_box.cpp:97
 #, c-format
@@ -119,14 +125,14 @@ msgid "%s team has skipped its turn."
 msgstr "Tým %s se vzdal tahu."
 
 #: src/weapon/cluzooka.cpp:396
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u Cluster bazookas!"
 msgid_plural "%s team has won %u Cluster bazookas!"
-msgstr[0] "Tým %s získal %u bazuku!"
-msgstr[1] "Tým %s získal %u bazuky!"
+msgstr[0] "Tým %s získal %u tříštivou bazuku!"
+msgstr[1] "Tým %s získal %u tříštivé bazuky!"
 msgstr[2] "Tým %s získal %u bazuk!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
@@ -134,7 +140,7 @@ msgstr[0] "Tým %s získal %u Gnu! Rozmeťte je všechny!"
 msgstr[1] "Tým %s získal %u Gnu! Rozmeťte je všechny!"
 msgstr[2] "Tým %s získal %u Gnu! Rozmeťte je všechny!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
@@ -142,7 +148,7 @@ msgstr[0] "Tým %s získal %u vzdušný útok!"
 msgstr[1] "Tým %s vyhrál %u vzdušné útoky!"
 msgstr[2] "Tým %s vyhrál %u vzdušných útoků!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -160,7 +166,7 @@ msgstr[2] ""
 "Tým %s získal %u pneumatických kladiv. Nedělejte s nimi moc hluku! Vaši "
 "sousedé vám poděkují."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -213,17 +219,19 @@ msgstr[2] ""
 #, c-format
 msgid "%s team has won %u bounce ball! Boing!"
 msgid_plural "%s team has won %u bounce balls! Boing!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tým %s získal %u skákací kuličku! Ping, ping, bum!"
+msgstr[1] "Tým %s získal %u skákací kuličky! Ping, ping, bum!"
+msgstr[2] "Tým %s získal %u skákacích kuliček! Ping, ping, bum!"
 
 #: src/weapon/cluster_bomb.cpp:206
 #, c-format
 msgid "%s team has won %u cluster bomb!"
 msgid_plural "%s team has won %u cluster bombs!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tým %s získal %u tříštivou bombu!"
+msgstr[1] "Tým %s získal %u tříštivé bomby!"
+msgstr[2] "Tým %s získal %u tříštivých bomb!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -236,8 +244,9 @@ msgstr[2] "Tým %s získal %u stavitelských součástí! Nezapomeňte svou helm
 msgid "%s team has won %u disco grenade! Shake your body when throwing it!"
 msgid_plural ""
 "%s team has won %u disco grenades! Shake your body when throwing them!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tým %s získal %u disco granát! Rozvlň své tělo až ho budeš házet!"
+msgstr[1] "Tým %s získal %u disco granáty! Rozvlň své tělo až je budeš házet!"
+msgstr[2] "Tým %s získal %u disco granátů! Rozvlň své tělo až je budeš házet!"
 
 #: src/weapon/dynamite.cpp:145
 #, c-format
@@ -256,19 +265,20 @@ msgstr[1] "Tým %s získal %u plamenomety!"
 msgstr[2] "Tým %s získal %u plamenometů!"
 
 #: src/weapon/footbomb.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
-msgstr[0] "Tým %s získal %u baseballovou pálku!"
-msgstr[1] "Tým %s získal %u baseballové pálky!"
+msgstr[0] "Tým %s získal %u ragbyovou bombu!"
+msgstr[1] "Tým %s získal %u ragbyové bomby!"
 msgstr[2] "Tým %s získal %u baseballových pálek!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tým %s získal %u lodní hák!"
+msgstr[1] "Tým %s získal %u lodní háky!"
+msgstr[2] "Tým %s získal %u lodních háků!"
 
 #: src/weapon/grenade.cpp:90
 #, c-format
@@ -286,7 +296,7 @@ msgstr[0] "Tým %s získal %u pistoli!"
 msgstr[1] "Tým %s získal %u pistole!"
 msgstr[2] "Tým %s získal %u pistolí!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
@@ -294,12 +304,13 @@ msgstr[0] "Tým %s získal %u tryskový batoh! Hop, hop a letím!"
 msgstr[1] "Tým %s získal %u tryskové batohy! Hop, hop a letím!"
 msgstr[2] "Tým %s získal %u tryskových batohů! Hop, hop a letím!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tým %s získal %u nízkou gravitaci! Jsem Neil Armstrong!"
+msgstr[1] "Tým %s získal %u nízké gravitace! Jsem Neil Armstrong!"
+msgstr[2] "Tým %s získal %u nízkých gravitací! Jsem Neil Armstrong!"
 
 #: src/weapon/mine.cpp:247
 #, c-format
@@ -309,7 +320,7 @@ msgstr[0] "Tým %s získal %u minu!"
 msgstr[1] "Tým %s získal %u miny!"
 msgstr[2] "Tým %s získal %u min!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
@@ -317,19 +328,21 @@ msgstr[0] "Tým %s získal %u padák!"
 msgstr[1] "Tým %s získal %u padáky!"
 msgstr[2] "Tým %s získal %u padáků!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tým %s získal %u tchoře! Máte připravené svoje plynové masky?"
+msgstr[1] "Tým %s získal %u tchoře! Máte připravené svoje plynové masky?"
+msgstr[2] "Tým %s získal %u tchořů! Máte připravené svoje plynové masky?"
 
 #: src/weapon/riot_bomb.cpp:133
 #, c-format
 msgid "%s team has won %u riot bomb!"
 msgid_plural "%s team has won %u riot bombs!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tým %s získal %u minomet!"
+msgstr[1] "Tým %s získal %u minomety!"
+msgstr[2] "Tým %s získal %u minometů!"
 
 #: src/weapon/shotgun.cpp:134
 #, c-format
@@ -339,8 +352,16 @@ msgstr[0] "Tým %s získal %u brokovnici!"
 msgstr[1] "Tým %s získal %u brokovnice!"
 msgstr[2] "Tým %s získal %u brokovnic!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
 #, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Tým %s získal %u lodní hák!"
+msgstr[1] "Tým %s získal %u lodní háky!"
+msgstr[2] "Tým %s získal %u lodních háků!"
+
+#: src/weapon/snipe_rifle.cpp:247
+#, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
 "%s team has won %u sniper rifles! Aim and shoot between the eyes!"
@@ -368,8 +389,9 @@ msgstr[2] "Tým %s získal %u sebevražd!"
 #, c-format
 msgid "%s team has won %u syringe!"
 msgid_plural "%s team has won %u syringes!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tým %s získal %u stříkačku!"
+msgstr[1] "Tým %s získal %u stříkačky!"
+msgstr[2] "Tým %s získal %u stříkaček!"
 
 #: src/weapon/teleportation.cpp:120
 #, c-format
@@ -387,39 +409,59 @@ msgstr[0] "Tým %s získal %u vynechání tahu! Já vím, že si jej zamilujete.
 msgstr[1] "Tým %s získal %u vynechání tahu! Já vím, že si jej zamilujete."
 msgstr[2] "Tým %s získal %u vynechání tahu! Já vím, že si jej zamilujete."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] ""
+"Tým %s získal %u odpalovač tučňáků! Nikdo neviděl jak tučňáci létají?"
 msgstr[1] ""
+"Tým %s získal %u odpalovače tučňáků! Nikdo neviděl jak tučňáci létají?"
+msgstr[2] ""
+"Tým %s získal %u odpalovačů tučňáků! Nikdo neviděl jak tučňáci létají?"
+
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
 
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(mrtvý)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(systémový jazyk)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
-msgstr ""
+msgstr "(neznámý čas)"
 
 #. Display number of ammo
 #: src/interface/interface.cpp:196
 msgid "(unlimited)"
 msgstr "(neomezenÄ›)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
+"Je dostupná nová verze %s, pokud je vaše verze %s. Můžete zjistit, zda je "
+"dostupná aktualizace pro Váš operační systém!"
+
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Vzdušný útok"
 
@@ -427,12 +469,20 @@ msgstr "Vzdušný útok"
 msgid "Airhammer"
 msgstr "Pneumatické kladivo"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Všechny týmy"
 
-#: src/weapon/baseball.cpp:58
+#: src/menu/game_mode_editor.cpp:58
 #, fuzzy
+msgid "Always"
+msgstr "Hrát"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr ""
+
+#: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
 "Fire : space key\n"
@@ -440,13 +490,13 @@ msgid ""
 msgstr ""
 "Úhel: Nahoru/Dolů\n"
 "Střelba: mezerník\n"
-"a hit per turn"
+"zásah obloukem"
 
 #: src/weapon/anvil.cpp:132
 msgid "Anvil"
 msgstr "Kovadlina"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autoři:"
 
@@ -456,7 +506,7 @@ msgstr "Automatická bazuka"
 
 #: src/menu/pause_menu.cpp:51
 msgid "Back to battle"
-msgstr ""
+msgstr "Zpět do hry"
 
 #: src/network/net_error_msg.cpp:42
 msgid "Bad socket ..."
@@ -470,6 +520,15 @@ msgstr "Baseballová pálka"
 msgid "Bazooka"
 msgstr "Bazuka"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleport"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Plamenomet"
@@ -482,49 +541,102 @@ msgstr "Skákací kulička"
 msgid "Bye bye tux..."
 msgstr "Pá pá tuxi..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
-msgstr "Nemůžu najít tým %s!"
+msgstr "Nelze najít tým %s!"
 
 #: src/team/teams_list.cpp:160
 #, c-format
 msgid "Cannot open personal teams directory (%s)!"
-msgstr ""
+msgstr "Nepodařilo se otevřít osobní adresář týmů (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
+msgstr "Nepodařilo se otevřít adresář týmů (%s)!"
+
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Nepodařilo se otevřít osobní adresář týmů (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Počet hráčů"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
 msgstr ""
 
-#: src/menu/options_menu.cpp:129
-msgid "Check updates online?"
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Padák"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Padák"
+
+#: src/menu/options_menu.cpp:193
+msgid "Check updates online?"
+msgstr "Zjistit online aktualizace?"
+
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Vyber náhodně mezi mapami"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Klientský režim"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Největší trdlo"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
-msgstr ""
+msgstr "Tříštivá bomba"
 
 #: src/weapon/cluzooka.cpp:389
-#, fuzzy
 msgid "Cluzooka"
-msgstr "Bazuka"
+msgstr "Cluzuka"
 
 #: src/weapon/suicide.cpp:42
 msgid "Commit Suicide"
 msgstr "Spáchat sebevraždu"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "žádný konfigurační soubor!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Připojit ke hře"
 
@@ -532,33 +644,54 @@ msgstr "Připojit ke hře"
 msgid "Connected !"
 msgstr "Připojeno !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Stavba"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
-msgstr "Řízeno:"
+msgstr "Řízeno: "
 
 #: src/network/download.cpp:81
 #, c-format
 msgid "Couldn't fetch last version from %s"
-msgstr ""
+msgstr "Nepodařilo se získat poslední verzi z %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
-#, fuzzy, c-format
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
+#, c-format
 msgid "Couldn't open file %s"
-msgstr "nepodařilo se načíst konfigurační soubor"
+msgstr "Nepodařilo otevřít soubor %s"
 
 #: src/menu/main_menu.cpp:72
 msgid "Credits"
 msgstr "Zásluhy"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Disco granát"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Délka tahu"
 
@@ -566,31 +699,54 @@ msgstr "Délka tahu"
 msgid "Dynamite"
 msgstr "Dynamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "KONEC HRY"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
-msgstr ""
+msgstr "Hlasitost efektů"
+
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Zdraví"
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Chyba v %s:%lu"
 
-#: src/tool/error.cpp:82
+#: src/include/action_handler.cpp:210
 #, c-format
-msgid "Error in %s:%lu"
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
 msgstr ""
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
-msgstr "Chyba při nahrávání týmu:"
+msgstr "Chyba při nahrávání týmu :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr ""
 "Chyba při vytváření adresáře \"%s\": nebylo možné uložit konfigurační soubor."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Chyba při vytváření adresáře \"%s\": nebylo možné uložit konfigurační soubor."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Chyba při vytváření adresáře \"%s\": nebylo možné uložit konfigurační soubor."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -600,34 +756,40 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Chyba: Nepodařilo se připojit k %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Chyba: Nepodařilo se kontaktovat index server k hostování hry"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Chyba: Nepodařilo se kontaktovat index server pro vyhledání internetové hry"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
-msgstr "Chyba: Nepovedlo se spustit herní server"
+msgstr "Chyba: Nepodařilo se spustit herní server"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
-msgstr ""
+msgstr "Chyba: Nepodařilo se najít tělo \"%s\" pro tým \"%s\"."
 
 #: src/weapon/flamethrower.cpp:134
 msgid "Flame Thrower"
@@ -635,67 +797,85 @@ msgstr "Plamenomet"
 
 #: src/weapon/footbomb.cpp:158
 msgid "Football Bomb"
-msgstr ""
+msgstr "Ragbyová bomba"
+
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Celá obrazovka?"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Celá obrazovka?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
-msgstr ""
+msgstr "Hra"
+
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "Jméno hry:"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
-msgstr ""
+msgstr "Jméno hry:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
-msgstr ""
+msgstr "Odpalovač GNU"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
-msgstr ""
+msgstr "Grafika"
 
 #: src/weapon/grapple.cpp:166
 msgid "Grapple"
 msgstr "Lodní hák"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granát"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
-msgstr ""
+msgstr "Inicializace teréhu..."
 
 #: src/weapon/gun.cpp:74
 msgid "Gun"
 msgstr "Pistole"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
-msgstr "Nemůžu nalézt domovský adresář (proměnná prostředí $HOME)! "
+msgstr "Nemůžu nalézt domovský adresář (proměnná prostředí $HOME)!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Přeji dobrou hru!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Velitel"
 
 #. Display player's name
 #: src/interface/interface.cpp:156
 msgid "Head commander: "
-msgstr "Velitel:"
+msgstr "Velitel: "
 
 #: src/menu/main_menu.cpp:69 src/menu/pause_menu.cpp:59
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Hostovat hru"
 
@@ -705,12 +885,17 @@ msgid ""
 "Angle : Up/Down\n"
 "an ammo per turn"
 msgstr ""
+"Použití : držet stisknutý mezerník\n"
+"Úhel : Nahoru/Dolů\n"
+"munice letí obloukem"
 
 #: src/weapon/airhammer.cpp:75
 msgid ""
 "Howto use it : keep space key pressed\n"
 "an ammo per turn"
 msgstr ""
+"Použití : držet stisknutý mezerník\n"
+"munice letí obloukem"
 
 #: src/weapon/auto_bazooka.cpp:221
 msgid ""
@@ -719,22 +904,35 @@ msgid ""
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
+"Použití : kliknout levým tlačítkem na cíl\n"
+"Počáteční úhel střely : Nahoru/Dolů\n"
+"Odpálení : držet mezerník až na požadovanou sílu\n"
+"munice letí obloukem"
 
 #: src/weapon/anvil.cpp:133
 msgid ""
 "Howto use it : left click on target\n"
 "an ammo per turn"
 msgstr ""
+"Použití: kliknout levým tlačítkem na cíl\n"
+"munice letí obloukem"
+
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr ""
 
-#: src/main.cpp:243
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
 msgstr ""
+"Pokud naleznete chybu, nebo máte nápad na zlepšení, pošlete nám email (v "
+"angličtine):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
-msgstr ""
+msgstr "Počáteční energie"
 
 #: src/weapon/bazooka.cpp:124 src/weapon/cluzooka.cpp:390
 #: src/weapon/riot_bomb.cpp:121
@@ -743,40 +941,55 @@ msgid ""
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
+"Počáteční úhel střely : Nahoru/Dolů\n"
+"Odpálení : držet mezerník až na požadovanou sílu\n"
+"munice letí obloukem"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
-msgstr ""
+msgstr "Inicializace"
 
 #: src/game/game_init.cpp:106
 msgid "Initialise map"
-msgstr ""
+msgstr "Inicializovat mapu"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
-msgstr ""
+msgstr "Inicializovat zvuky"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
-msgstr ""
+msgstr "Inicializovat týmy"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
-msgstr ""
+msgstr "To je dáreček!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
-msgstr ""
+msgstr "Tryskový batoh"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
+msgstr "Připojte se k #wormux na irc.freenode.net a najděte protihráče."
+
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
 msgstr ""
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Jazyk"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Nahrát mapy:"
 
@@ -784,39 +997,43 @@ msgstr "Nahrát mapy:"
 msgid "Load teams:"
 msgstr "Nahrát týmy:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Místní týmy:"
 
 #: src/weapon/lowgrav.cpp:49
 msgid "LowGrav"
-msgstr ""
+msgstr "Nízká gravitace"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
-msgstr ""
+msgstr "Připojit se ručně"
 
-#: src/menu/game_menu.cpp:84
-#, fuzzy
+#: src/menu/game_menu.cpp:78
 msgid "Map"
-msgstr "Mapy"
+msgstr "Mapa"
 
 #: src/map/map.cpp:294
 #, c-format
 msgid "Map %s, a creation of: "
-msgstr ""
+msgstr "Mapu %s vytvořil: "
 
 #: src/game/game_init.cpp:109
 msgid "Maps"
 msgstr "Mapy"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Počáteční energie"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Maximální počet hráčů:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maximum FPS"
 
@@ -824,40 +1041,44 @@ msgstr "Maximum FPS"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
-#, fuzzy
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
-msgstr "Hudba?"
+msgstr "Ostatní"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Nejpřesnější"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Největší trdlo"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
-msgstr ""
+msgstr "Největší zrádce"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Nejužitečnější"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Nejzbytečnější"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Nejnásilnější"
 
-#: src/menu/options_menu.cpp:143
-msgid "Music volume"
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Padák"
+
+#: src/menu/options_menu.cpp:207
+msgid "Music volume"
+msgstr "Hlasitost hudby"
+
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Hudba?"
 
@@ -865,144 +1086,176 @@ msgstr "Hudba?"
 msgid "Network Game"
 msgstr "Síťová hra"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
+msgstr "Inicializace sítě"
+
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
 msgstr ""
 
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
-#, fuzzy
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
-msgstr "Síťová hra"
+msgstr "Nová síťová hra na "
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
-msgstr ""
+msgstr "V konfiguračním xml souboru nebyl nalezen žádný element <%s>!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Nikdo!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Počet hráčů"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Počet týmů:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Volby"
 
 #: src/menu/pause_menu.cpp:55
-#, fuzzy
 msgid "Options menu"
-msgstr "Volby"
+msgstr "Volby menu"
 
 #: src/weapon/parachute.cpp:68
 msgid "Parachute"
 msgstr "Padák"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Padák je aktivován automaticky."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
+msgstr "Heslo:"
+
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
 msgstr ""
 
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Hrát"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Hráč"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Životy hráče?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Jméno hráče?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Jméno hráče?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Odpalovač tchořů"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
-msgstr ""
+msgstr "Veřejné hry"
 
 #: src/menu/main_menu.cpp:75
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Ukončit Wormux"
 
 #: src/menu/pause_menu.cpp:63
 msgid "Quit battle"
-msgstr ""
+msgstr "Ukončit hru"
+
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Spustit hru"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Náhodná mapa"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Čtu výchozí konfigurační soubor"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Čtu osobní konfigurační soubor"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Rozlišení"
 
 #: src/weapon/riot_bomb.cpp:120
 msgid "Riot Bomb"
-msgstr ""
+msgstr "Minomet"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Spustit hru"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
-msgstr "Řekni:"
+msgstr "Řekni: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
-msgstr ""
+msgstr "Velikost posuvníků"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
-msgstr ""
+msgstr "Posuvníky na okrajích"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Adresa serveru:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Server přístupný z Internetu"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Serverový režim"
 
@@ -1010,47 +1263,78 @@ msgstr "Serverový režim"
 msgid "Shotgun"
 msgstr "Brokovnice"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Volby menu"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Přeskočit tah"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Ostřelovací puška"
 
 #: src/object/bonus_box.cpp:86
 msgid "Someone put a booby trap into the crate!"
-msgstr ""
+msgstr "Někdo dal dítě do bedny!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Promiňte, zrovna není hra, které chybějí hráči"
 
-#: src/menu/options_menu.cpp:178
-#, fuzzy
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
-msgstr "Brokovnice"
+msgstr "Zvuk"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Zvukové efekty?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
-msgstr ""
+msgstr "Kvalita zvuku"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
-msgstr ""
+msgstr "Zvuky"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Spouštím novou hru"
 
 #: src/interface/interface.cpp:196
 msgid "Stock:"
-msgstr ""
+msgstr "Zásoby:"
 
 #: src/weapon/submachine_gun.cpp:99
 msgid "Submachine Gun"
@@ -1064,96 +1348,119 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Stříkačka"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
 #, fuzzy
+msgid "Talk in network battle"
+msgstr "Zpět do hry"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
-msgstr "Týmy"
+msgstr "Týmový graf"
 
-#: src/menu/results_menu.cpp:378
-#, fuzzy
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
-msgstr "Týmy"
+msgstr "Týmová statistika"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Týmy"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
-msgstr "Teleportace"
+msgstr "Teleport"
 
 #: src/weapon/cluster_bomb.cpp:146
 msgid "The Cluster Bomb has left the battlefield before it could explode."
-msgstr ""
+msgstr "Tříštivá bomba opustila bitevní pole předtím, než explodovala."
 
 #: src/weapon/footbomb.cpp:111
-#, fuzzy
 msgid "The Football Bomb has left the battlefield before it could explode."
-msgstr "Gnu opustil bitevní pole předtím, než explodoval"
+msgstr "Gnu opustil bitevní pole předtím, než explodoval."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnu opustil bitevní pole předtím, než explodoval"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
-msgstr ""
+msgstr "Tchoř opustil bitevní pole předtím, než explodoval"
 
 #: src/weapon/auto_bazooka.cpp:175
 msgid "The automatic rocket has left the battlefield..."
-msgstr ""
+msgstr "Naváděná raketa opustila bitevní pole..."
 
 #: src/weapon/bounce_ball.cpp:72
 msgid "The ball left the battlefield before exploding"
+msgstr "Míč opustil bitevní pole předtím, než explodoval"
+
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
 msgstr ""
 
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
-msgstr ""
+msgstr "Vypršel limit spojení. Zkontrolujte, zda není v cestě firewall!"
 
 #: src/weapon/disco_grenade.cpp:127
 msgid "The disco grenade has left the dance floor before exploding"
-msgstr ""
+msgstr "Disco granát opustil bitevní pole předtím, než explodoval"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
-msgstr ""
+msgstr "Hra byla ukončena, protože jste byl odpojen."
 
 #: src/weapon/grenade.cpp:58
 msgid "The grenade left the battlefield before exploding"
-msgstr ""
+msgstr "Granát opustil bitevní pole předtím, než explodoval"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
-msgstr ""
+msgstr "Ostatní na vás čekají! Vstávat :-)"
 
 #: src/weapon/bazooka.cpp:83 src/weapon/cluzooka.cpp:336
 #: src/weapon/riot_bomb.cpp:86
 msgid "The rocket has left the battlefield..."
-msgstr ""
+msgstr "Raketa opustila bitevní pole..."
 
 #: src/network/net_error_msg.cpp:45
 msgid "The server rejected the connection."
-msgstr ""
+msgstr "Server odmítl spojení."
 
 #: src/network/net_error_msg.cpp:51
 msgid "The server rejected the connection: wrong password!"
-msgstr ""
+msgstr "Server odmítl spojení: špatné heslo!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Zde je jen %i tým."
+msgstr[1] "Zde jsou jen %i týmy."
+msgstr[2] "Zde je jen %i týmů."
+
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "ÄŒas"
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
+"Zpoždění : Kolečko myši nebo Page Up/Down\n"
+"Úhel : Nahoru/Dolů\n"
+"Odpálení : držet mezerník až na požadovanou sílu\n"
+"munice letí obloukem"
 
 #: src/weapon/bounce_ball.cpp:90
 msgid ""
@@ -1162,129 +1469,167 @@ msgid ""
 "Fire : space key\n"
 "an ammo per turn"
 msgstr ""
+"Zpoždění : Kolečko myši nebo Page Up/Down\n"
+"Úhel : Nahoru/Dolů\n"
+"Odpálení : Mezerník\n"
+"munice letí obloukem"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
-msgstr ""
+msgstr "Nástroje"
 
 #: src/network/net_error_msg.cpp:36
 msgid "Unable to contact host."
-msgstr ""
+msgstr "Nepodařilo kontaktovat hostitele."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
-msgstr ""
+msgstr "Nepodařilo se otevřít adresář s mapami (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
-msgstr ""
+msgstr "Nepodařilo se otevřít osobní adresář s mapami (%s)!"
 
 #: src/network/net_error_msg.cpp:39
 msgid "Unable to use this port!"
+msgstr "Tento port nelze použít!"
+
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
 msgstr ""
 
-#: src/network/network.cpp:110
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(neomezenÄ›)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
-msgstr ""
+msgstr "Nepojmenovaný"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
-msgstr ""
+msgstr "Verze"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
-msgstr ""
+msgstr "Kontrola verze selhala: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Počkejte! %i hráč ještě není připraven!"
+msgstr[1] "Počkejte! %i hráči ještě nejsou připraveni!"
+msgstr[2] "Počkejte! %i hráčů ještě není připraveno!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
+msgstr "Čeká se na server, jediné co můžete je zrušit to, nebo chatovat!"
+
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
 msgstr ""
 
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
-msgstr ""
+msgstr "ZbranÄ›"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
-msgstr ""
+msgstr "Webová stránka: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
-msgstr ""
+msgstr "Jaká hanba pro %s - zabil se tak hloupou zbraní!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
-msgstr ""
+msgstr "Poletující částice?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Vítěz"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
-msgstr ""
+msgstr "Spouští se Wormux..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux verze"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Jste sám :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Jste sám..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
-msgstr ""
+msgstr "Potřebujete nejméně jednu použitelnou mapu!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
-msgstr ""
+msgstr "Potřebujete nejméně dva použitelné týmy!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Nebudete schopen hrát, dokud si nevyberete tým!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Vaše střela minula!"
 
 #: src/menu/credits_menu.cpp:75
 msgid "aka"
-msgstr ""
+msgstr "jako"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
 "a bombing per turn"
 msgstr ""
+"směr útoku : Vpravo/Vlevo\n"
+"Bombardování : kliknout levým tlačítkem na cíl\n"
+"bombardování letí obloukem"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "nepodařilo se načíst konfigurační soubor"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "hotovo"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "chyba při zpracovávání konfiguračního souboru"
 
@@ -1292,15 +1637,15 @@ msgstr "chyba při zpracovávání konfiguračního souboru"
 msgid "from"
 msgstr "z"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
-msgstr "žádný konfigurační soubor"
+msgstr "žádný konfigurační soubor!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Nahrávám hudbu"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Načítám hudební profil: %s"
@@ -1310,26 +1655,9 @@ msgstr "o Načítám hudební profil: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Otevřena hudba o %d Hz %d bitech"
 
-#~ msgid "Connect !"
-#~ msgstr "Připojit !"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Připojit se k internetové hře"
-
-#~ msgid "Refresh"
-#~ msgstr "Obnovit"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Chyba při nahrávání dat týmu %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Chyba při načítání konfiguračního souboru: %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Chyba při načítání výchozího konfiguračního souboru: %s"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s se zkoušel připojit s různou verzí: klient=%s, já=%s"
-
-#~ msgid "And the winner is..."
-#~ msgstr "A vítězem se stává..."
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Chyba: Váš server není dostupný z internetu. Zkontrolujte nastavení "
+#~ "vašeho firewallu"
diff --git a/po/da.po b/po/da.po
index 8c1cc2c..1d3ba97 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-05-06 23:44+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-05 18:21+0200\n"
 "Last-Translator: Janus Troelsen <ysangkok at gmail.com>\n"
 "Language-Team: danish <da at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,70 +17,80 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Banen %s blev ikke fundet :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "Spiller %i er forbundet"
 msgstr[1] "Spillere %i er forbundet"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "Spiller %i er klar"
 msgstr[1] "Spillere %i er klar"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) døde."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> også kendt som %s fra %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> fra %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Hold %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Hold %s – Fjernt"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s begår selvmord!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s FPS"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s (%s) begik selvmord!"
+
+#: src/game/game.cpp:751
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s faldt i vandet."
+msgid "%s from %s team has died."
+msgstr "%s (%s) døde."
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:709
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s faldt ud af banen!"
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s (%s) faldt i vandet."
+
+#: src/game/game.cpp:703
+#, c-format
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s (%s) faldt ud af banen!"
+
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s (%s) ramte jorden for hårdt!"
+
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s (%s) døde fordi han var klodset!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -89,16 +99,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s har fået %u point ekstra energi!"
 msgstr[1] "%s har fået %u point ekstra energi!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s er en psykopat; han dræbte en fra holdet %s!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s døde fordi han var klodset!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -122,21 +127,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "Holdet %s har fået %u klyngebazooka!"
 msgstr[1] "Holdet %s har fået %u klyngebazookaer!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "Holdet %s har fået %u gnu! Spræng dem alle i luften, cowboy!"
 msgstr[1] "Holdet %s har fået %u gnuer! Spræng dem alle i luften, cowboy!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "Holdet %s har fået %u luftangreb!"
 msgstr[1] "Holdet %s har fået %u luftangreb!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -151,7 +156,7 @@ msgstr[1] ""
 "Holdet %s har fået %u tryklufthammere! Lav ikke for meget larm med dem! På "
 "forhånd tak. Hilsen, dine naboer."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -207,7 +212,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "Holdet %s har fået %u klyngebombe!"
 msgstr[1] "Holdet %s har fået %u klyngebomber!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -244,7 +249,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "Holdet %s har fået %u fodboldbombe!"
 msgstr[1] "Holdet %s har fået %u fodboldbomber!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -265,14 +270,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "Holdet %s har fået %u pistol!"
 msgstr[1] "Holdet %s har fået %u pistoler!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "Holdet %s har fået %u jetpack! Svedigt!"
 msgstr[1] "Holdet %s har fået %u jetpacks! Svedigt!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -288,14 +293,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "Holdet %s har fået %u mine!"
 msgstr[1] "Holdet %s har fået %u miner!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "Holdet %s har fået %u faldskærm!"
 msgstr[1] "Holdet %s har fået %u faldskærme!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -316,12 +321,19 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "Holdet %s har fået %u haglgevær!"
 msgstr[1] "Holdet %s har fået %u haglgeværer!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Holdet %s har fået %u slag!"
+msgstr[1] "Holdet %s har fået %u slag! Smag lidt på den her!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
 "%s team has won %u sniper rifles! Aim and shoot between the eyes!"
-msgstr[0] "Holdet %s har fået %u sniper-riffel! Skyd dem mellem øjnene!"
+msgstr[0] "Holdet %s har fået %u sniper-riffel! Sigt og skyd mellem øjnene!"
 msgstr[1] "Holdet %s har fået %u sniper-rifler! Skyd dem mellem øjnene!"
 
 #: src/weapon/submachine_gun.cpp:144
@@ -359,7 +371,7 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "Holdet %s har fået %u \"spring turen over\"! Jeg ved du elsker dem."
 msgstr[1] "Holdet %s har fået %u \"spring turen over\"! Jeg ved du elsker dem."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -368,16 +380,26 @@ msgstr[0] ""
 msgstr[1] ""
 "Holdet %s har fået %u Tux-affyringer! Har du aldrig set en flyvende pingvin?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "Holdet %s blev udryddet."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s tog et medlem af holdet %s med i graven!"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(død)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(systemsprog)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(ukendt tid)"
 
@@ -386,7 +408,7 @@ msgstr "(ukendt tid)"
 msgid "(unlimited)"
 msgstr "(ubegrænset)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -395,7 +417,11 @@ msgstr ""
 "En ny version (%s) er tilgængelig. Din nuværende version er %s. Du kan "
 "chekke om der er en ny version tilgængelig for dit operativsystem."
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Tilføj brugerdefineret hold"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Luftangreb"
 
@@ -403,10 +429,18 @@ msgstr "Luftangreb"
 msgid "Airhammer"
 msgstr "Tryklufthammer"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Alle hold"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Altid"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Og vinderen er..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -421,7 +455,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Ambolt"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Forfattere:"
 
@@ -445,6 +479,14 @@ msgstr "Baseballbat"
 msgid "Bazooka"
 msgstr "Bazooka"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Før action"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Blitz"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Blæselampe"
@@ -457,8 +499,9 @@ msgstr "Hoppebold"
 msgid "Bye bye tux..."
 msgstr "Faaarvel Tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Kan ikke finde holdet %s!"
@@ -468,24 +511,69 @@ msgstr "Kan ikke finde holdet %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Kan ikke åbne det personlige holdkatalog (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Kan ikke åbne holdkataloget (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Kan ikke åbne det brugerdefinerede holdkatalog (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Centrér kamera på kriger"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Ændr aktiv kriger"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Ændr sigtevinkel"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Ændr våbenkatalog"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Ændr våbennedtælling"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Kriger"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Skift kriger"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Check for opdateringer på nettet?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Skift tilfældigt rundt mellem de forskellige baner"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Klassisk"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Klik: Centrér kamera på kriger"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Klientmodus"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Mest klodset"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Klyngebombe"
@@ -498,7 +586,11 @@ msgstr "Cluzooka"
 msgid "Commit Suicide"
 msgstr "Begå selvmord"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Konfigurationsmenu"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Forbind til spil"
 
@@ -506,11 +598,11 @@ msgstr "Forbind til spil"
 msgid "Connected !"
 msgstr "Forbundet!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Konstruér"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Kontrolleret af: "
 
@@ -519,7 +611,7 @@ msgstr "Kontrolleret af: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Kunne ikke checkke efter ny version på %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Kunne ikke åbne filen %s"
@@ -528,11 +620,32 @@ msgstr "Kunne ikke åbne filen %s"
 msgid "Credits"
 msgstr "Udviklere"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Skade per tur under dødsmodus"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Slet brugerdefineret hold"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Diskogranat"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Vis denne meddelelse"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Træk og slip: Panorér kamera"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Tid før dødsmodus"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Længden af en tur"
 
@@ -540,31 +653,57 @@ msgstr "Længden af en tur"
 msgid "Dynamite"
 msgstr "Dynamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "SLUT PÃ… SPILLET"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Lydeffekt volume"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energi"
+
+#: src/tool/error.cpp:63
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Fejl i %s: %lu"
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Fejl i %s: %lu (Wormux %s) : %s"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+"Fejl under initialisering af netværk: Klienten %s er ikke enig med dig! - %s"
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Fejl under indlæsning af hold:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr ""
 "Fejl under dannelse af kataloget \"%s\": kan ikke gemme konfigurationsfilen."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Fejl under sletning af kataloget \"%s\". Kan ikke slette det "
+"brugerdefinerede hold."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Fejl under sletning af filen \"%s\". Kan ikke slette det brugerdefinerede "
+"hold."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -574,32 +713,38 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Fejl: Kan ikke forbinde til %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Fejl: Kan ikke kontakte indeksserveren for at starte et spil"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "Fejl: Kan ikke kontakte indeksserveren for at søge efter internetspil"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Fejl: Kan ikke starte server"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Fejl: Din server er ikke tilgængelig fra internettet. Check din firewall-"
-"konfiguration"
+"Fejl: Din server er ikke tilgængelig fra internettet. Check at din firewall-"
+"konfiguration: TCP-port %s skal acceptere forbindelser udefra. Hvis du ikke "
+"er forbundet direkte til internettet, så check din routerkonfiguration i "
+"stedet. I så fald skal du forwarde TCP-port %s til din computer."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Fejl: Kan ikke finde kroppen \"%s\" for holdet \"%s\"."
@@ -612,23 +757,31 @@ msgstr "Flammekaster"
 msgid "Football Bomb"
 msgstr "Fodboldbombe"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Fuld skærm/vindue"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Fuld skærm?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Spil"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Spilmodus"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Spil navn:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnukaster"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr "Grafik"
 
@@ -636,11 +789,15 @@ msgstr "Grafik"
 msgid "Grapple"
 msgstr "Klo"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Tyngdekraft"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granat"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Banen klargøres..."
 
@@ -648,16 +805,16 @@ msgstr "Banen klargøres..."
 msgid "Gun"
 msgstr "Pistol"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Hjemme katalog (miljøvariabelen $HOME) blev ikke fundet!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Hav et godt spil!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Hovedkommandør"
 
@@ -670,7 +827,11 @@ msgstr "Hovedkommandør: "
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Højt hop"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Vær vært for et spil"
 
@@ -712,7 +873,11 @@ msgstr ""
 "Hvordan man bruger det: Venstreklik på målet\n"
 "Et stykke ammunition per tur"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Skynd dig, du er for langsom!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -720,7 +885,8 @@ msgstr ""
 "Hvis du har fundet en fejl eller du har en idé til nye ting, så send os en e-"
 "mail (på engelsk, tak):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Energi som udgangspunkt"
 
@@ -735,7 +901,7 @@ msgstr ""
 "Affyr: Hold mellemrum nede indtil den ønskede styrke er nået\n"
 "Et stykke ammunition per tur"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Klargører"
 
@@ -743,31 +909,43 @@ msgstr "Klargører"
 msgid "Initialise map"
 msgstr "Klargører banen"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Klargører lyde"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Klargører hold"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Det er en gave!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Besøg #wormux på irc.freenode.net for at finde nogle modstandere."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Hop"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Hop baglæns"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Fjerner spilleren under navnet <nickname> fra spillet"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Sprog"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Indlæser baner:"
 
@@ -775,7 +953,7 @@ msgstr "Indlæser baner:"
 msgid "Load teams:"
 msgstr "Indlæser hold:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Lokale hold:"
 
@@ -783,13 +961,13 @@ msgstr "Lokale hold:"
 msgid "LowGrav"
 msgstr "Svag tyngdekraft"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "Manuel forbindelse"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Bane"
 
@@ -802,11 +980,15 @@ msgstr "Banen %s, en kreation af: "
 msgid "Maps"
 msgstr "Baner"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Maksimum energi"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Maksimum antal spillere:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maksimum FPS"
 
@@ -814,39 +996,43 @@ msgstr "Maksimum FPS"
 msgid "Mine"
 msgstr "Mine"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr "Andet"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Mest præcis"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Mest klodset"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Mest udsolgt"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Mest brugbar"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Mest ubrugelig"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Mest voldelig"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Flyt kameraet med mus eller piletaster"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Flyt kriger"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Musik volume"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Musik?"
 
@@ -854,32 +1040,48 @@ msgstr "Musik?"
 msgid "Network Game"
 msgstr "Netværksspil"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Netværksinitialisation"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Aldrig"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Nyt netværksspil på"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Ny spiller notifikation?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Intet <%s> element fundet i XML-konfigurationsfilen!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Ingen!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Antal krigere"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Antal hold:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "Med en kriger: Skifter aktiv kriger"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "Med kortet: Vælger et mål"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Instillinger"
@@ -892,42 +1094,54 @@ msgstr "Instillinger menu"
 msgid "Parachute"
 msgstr "Faldskærm"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Faldskærmen er automatisk aktiveret."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr "Kodeord:"
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pause"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Spil"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Spil flere gange"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Spiller"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Vis krigernes energi?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Spillernavn"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Vis krigernes navne?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Stinkdyrskaster"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr "Offentlige kampe"
 
@@ -935,7 +1149,7 @@ msgstr "Offentlige kampe"
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Afslut Wormux"
 
@@ -943,19 +1157,23 @@ msgstr "Afslut Wormux"
 msgid "Quit battle"
 msgstr "Forlad kampen"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Afslut spillet"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Tilfældig bane"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Læser standard konfigureringsfil"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Læser personlig konfigureringsfil"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Opløsning"
 
@@ -963,33 +1181,33 @@ msgstr "Opløsning"
 msgid "Riot Bomb"
 msgstr "Oprørsbombe"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Kører spillet"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Sig: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr "Scroll-kant-størrelse"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Rul ved kanten"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Serveradresse:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Server tilgængelig på internettet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Servermodus"
 
@@ -997,10 +1215,34 @@ msgstr "Servermodus"
 msgid "Shotgun"
 msgstr "Haglgevær"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Vis våbenmenu"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Vis/skjul interface"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Vis/skjul minimap"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Spring denne tur over"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Slå"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Slå fjenden for at få ham til at flytte sig lidt."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Mindre sigtevinkel og skridt"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Sniper-riffel"
@@ -1009,28 +1251,38 @@ msgstr "Sniper-riffel"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Nogen har puttet en fælde i kassen!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Desværre, men der er ingen tilgængelige spil som venter på spillere"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Desværre, men din version er ikke supportet mere. Den nyeste supportede "
+"version er %s. Du kan downloade en opdateret version af Wormux på http://www."
+"wormux.org/wiki/download.php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Lyd"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Lydeffekter?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Lydfrekvens"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Lyde"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Starter et nyt spil"
 
@@ -1050,18 +1302,26 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Sprøjte"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Snak i netværkskamp"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr "Hold-grafer"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr "Hold-statistik"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Hold"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Holdeditor"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportation"
@@ -1074,11 +1334,11 @@ msgstr "Klyngebomben forlod slagmarken før den eksploderede."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Fodboldbomben forlod slagmarken før den eksploderede."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnuen forlod slagmarken før den eksploderede"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Stinkdyret forlod slagmarken før det eksploderede"
 
@@ -1090,6 +1350,15 @@ msgstr "Den laserstyrede raket forlod slagmarken..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Bolden forlod slagmarken før den eksploderede"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Klient- og serverversionerne er inkompatible (lokal version: %s, server "
+"version: %s) Prøv venligst en anden server."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "Forbindelsen udløb. Check at der ikke er nogen firewall i vejen!"
@@ -1098,7 +1367,7 @@ msgstr "Forbindelsen udløb. Check at der ikke er nogen firewall i vejen!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Diskogranaten forlod dansegulvet før den eksploderede"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "Spillet blev afbrudt fordi din forbindelse blev brudt."
 
@@ -1106,7 +1375,7 @@ msgstr "Spillet blev afbrudt fordi din forbindelse blev brudt."
 msgid "The grenade left the battlefield before exploding"
 msgstr "Granaten forlod slagmarken før den eksploderede"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "De andre venter på dig! Vågn op :-)"
 
@@ -1123,14 +1392,19 @@ msgstr "Serveren afslog forbindelsen."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Serveren afslog forbindelsen: forkert kodeord!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Der er kun %i hold."
 msgstr[1] "Der er kun %i hold."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Tid"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1154,7 +1428,7 @@ msgstr ""
 "Affyr: Mellemrum\n"
 "Et stykke ammunition per tur"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Værktøj"
 
@@ -1162,12 +1436,12 @@ msgstr "Værktøj"
 msgid "Unable to contact host."
 msgstr "Kan ikke kontakte værten."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Kan ikke åbne banekataloget (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Kan ikke åbne det personlige banekatalog (%s)!"
@@ -1176,84 +1450,108 @@ msgstr "Kan ikke åbne det personlige banekatalog (%s)!"
 msgid "Unable to use this port!"
 msgstr "Kan ikke bruge denne port!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Ukendt kommando"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Ubegrænset"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Unavngivet"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Version"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Version-verifikation fejlede fordi: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Vent! Spiller %i er ikke klar endnu!"
 msgstr[1] "Vent! Spillere %i er ikke klar endnu!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 "Venter på serveren; det eneste du kan gøre er at annullere eller chatte!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "VÃ¥ben: Affyr / bonusboks: falder hurtigt"
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "VÃ¥ben"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Hjemmeside: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Hvilken skam for %s – han blev dræbt af en simpel pistol!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Vindpartikler?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Vinder"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux starter..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux version "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "Banen har en ugyldig CRC-checksum!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Ugyldigt banenavn!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Ugyldigt hold!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Du er alene :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Du er alene..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Du skal vælge mindst én gyldig bane!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Du skal vælge mindst to gyldige hold!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Du kan ikke spille før du har valgt et hold!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Du ramte ved siden af!"
 
@@ -1261,7 +1559,7 @@ msgstr "Du ramte ved siden af!"
 msgid "aka"
 msgstr "også kendt som"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1271,15 +1569,20 @@ msgstr ""
 "Bombning: Venstreklik på målet\n"
 "En bombning per tur"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "kunne ikke indlæse konfiguration"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "brugerdefineret spiller"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "færdig"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "fejl under fortolkning af konfigurationsfil"
 
@@ -1287,15 +1590,15 @@ msgstr "fejl under fortolkning af konfigurationsfil"
 msgid "from"
 msgstr "fra"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "ingen konfigurationsfil!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Indlæser musik"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Indlæser lydprofilen: %s"
diff --git a/po/de.po b/po/de.po
index 5370e1f..8a80acd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2008-03-15 23:43+0100\n"
 "Last-Translator: Nikolas Becker <post-AT-nikolasbecker-DOT-de>\n"
 "Language-Team: German <de at li.org>\n"
@@ -18,71 +18,81 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Karte %s nicht gefunden :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i Spieler verbunden"
 msgstr[1] "%i Spieler verbunden"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i Spieler bereit"
 msgstr[1] "%i Spieler bereit"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) ist gestorben."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> aka %s aus %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> aus %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Mannschaft %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Mannschaft %s - Entfernt"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s begeht Selbstmord!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s begeht Selbstmord!"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s) ist gestorben."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s ist ins Wasser gefallen."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s ist von der Karte gefallen!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s stirbt durch seine Tollpatschigkeit!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -90,16 +100,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s hat %u Lebenspunkt gewonnen!"
 msgstr[1] "%s hat %u Lebenspunkte gewonnen!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s ist ein Psychopath, er hat ein Mitglied von Mannschaft %s getötet!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s stirbt durch seine Tollpatschigkeit!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -123,21 +128,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "Mannschaft %s hat %u Bazooka gewonnen!"
 msgstr[1] "Mannschaft %s hat %u Bazookas gewonnen!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "Mannschaft %s hat %u Gnu gewonnen! Spreng sie in die Luft, Cowboy!"
 msgstr[1] "Mannschaft %s hat %u Gnus gewonnen! Spreng sie in die Luft, Cowboy!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "Mannschaft %s hat %u Luftangriff gewonnen!"
 msgstr[1] "Mannschaft %s hat %u Luftangriffe gewonnen!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -152,7 +157,7 @@ msgstr[1] ""
 "Mannschaft %s hat %u Presslufthammer gewonnen! Mach nicht zuviel Lärm damit! "
 "Danke, die Nachbarschaft."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -208,7 +213,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "Mannschaft %s hat %u Splittergranate gewonnen!"
 msgstr[1] "Mannschaft %s hat %u Splittergranaten gewonnen!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -250,7 +255,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "Mannschaft %s hat %u Lärmbombe gewonnen!"
 msgstr[1] "Mannschaft %s hat %u Lärmbomben gewonnen!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -271,14 +276,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "Mannschaft %s hat %u Pistole gewonnen!"
 msgstr[1] "Mannschaft %s hat %u Pistolen gewonnen!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "Mannschaft %s hat %u Jetpack gewonnen! Sehr cool!"
 msgstr[1] "Mannschaft %s hat %u Jetpacks gewonnen! Sehr cool!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -294,14 +299,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "Mannschaft %s hat %u Mine gewonnen!"
 msgstr[1] "Mannschaft %s hat %u Minen gewonnen!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "Mannschaft %s hat %u Fallschirm gewonnen!"
 msgstr[1] "Mannschaft %s hat %u Fallschirme gewonnen!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -324,7 +329,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "Mannschaft %s hat %u Schrotflinte gewonnen!"
 msgstr[1] "Mannschaft %s hat %u Schrotflinten gewonnen!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Mannschaft %s hat %u Enterhaken gewonnen!"
+msgstr[1] "Mannschaft %s hat %u Enterhaken gewonnen!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -373,7 +385,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Mannschaft %s hat %u Rundensprünge gewonnen! Ich weiß dass du es liebst."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -384,16 +396,26 @@ msgstr[1] ""
 "Mannschaft %s hat %u Tux-Werfer gewonnen! Noch keinen fliegenden Pinguin "
 "gesehen?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(tot)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(System Sprache)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(unbekannte Zeit)"
 
@@ -402,7 +424,7 @@ msgstr "(unbekannte Zeit)"
 msgid "(unlimited)"
 msgstr "(unbegrenzt)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -411,7 +433,11 @@ msgstr ""
 "Die neue Version %s ist verfügbar. Die momentan verwendete Version ist %s. "
 "Überprüfe, ob für dein Betriebssystem bereits ein Update bereit steht."
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Luftangriff"
 
@@ -419,10 +445,19 @@ msgstr "Luftangriff"
 msgid "Airhammer"
 msgstr "Presslufthammer"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Alle Mannschaften"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Spielen"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Und der Gewinner ist..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -437,7 +472,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Amboss"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autoren:"
 
@@ -461,6 +496,15 @@ msgstr "Baseballschl
 msgid "Bazooka"
 msgstr "Panzerfaust"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleportation"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Schneidbrenner"
@@ -473,8 +517,9 @@ msgstr "Springball"
 msgid "Bye bye tux..."
 msgstr "Und tschüss Tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Kann Mannschaft %s nicht finden!"
@@ -484,24 +529,72 @@ msgstr "Kann Mannschaft %s nicht finden!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Kann das persönliche Mannschaftenverzeichnis (%s) nicht öfnen!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Kann das Mannschaftenverzeichnis (%s) nicht öfnen!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Kann das persönliche Mannschaftenverzeichnis (%s) nicht öfnen!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Anzahl der Figuren"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Fallschirm"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Fallschirm"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Online nach neuen Versionen suchen?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Eine Karte zufällig auswählen"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Client Modus"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Am tollpatschigsten"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Splittergranate"
@@ -515,7 +608,12 @@ msgstr "Panzerfaust"
 msgid "Commit Suicide"
 msgstr "Selbstmord begehen"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "keine Konfigurationsdatei vorhanden!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Zum Spiel verbinden"
 
@@ -523,11 +621,11 @@ msgstr "Zum Spiel verbinden"
 msgid "Connected !"
 msgstr "Verbunden !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Konstruktion"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Gesteuert von: "
 
@@ -536,7 +634,7 @@ msgstr "Gesteuert von: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Konnte die neuste Version von %s nicht abrufen"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, fuzzy, c-format
 msgid "Couldn't open file %s"
 msgstr "konnte Konfiguration nicht laden"
@@ -545,11 +643,32 @@ msgstr "konnte Konfiguration nicht laden"
 msgid "Credits"
 msgstr "Abspann"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Diskogranate"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Dauer einer Runde"
 
@@ -557,24 +676,34 @@ msgstr "Dauer einer Runde"
 msgid "Dynamite"
 msgstr "Dynamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "ENDE DES SPIELS"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Fehler in %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Fehler beim Laden der Mannschaft:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -582,7 +711,22 @@ msgstr ""
 "Fehler beim Erstellen des Verzeichnisses  \"%s\": kann Konfigurationsdatei "
 "nicht speichern."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Fehler beim Erstellen des Verzeichnisses  \"%s\": kann Konfigurationsdatei "
+"nicht speichern."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Fehler beim Erstellen des Verzeichnisses  \"%s\": kann Konfigurationsdatei "
+"nicht speichern."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -592,33 +736,37 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Fehler: Kann nicht zu %s:%s verbinden"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Fehler: Kann Indexserver nicht kontaktieren um ein Spiel zu hosten"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Fehler: Kann Indexserver nicht kontaktieren um ein Internetspiel zu suchen"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Fehler: Kann Server nicht starten"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Fehler: Dein Server kann über das Internet nicht erreicht werden. Überprüfe "
-"deine Firewall-Konfiguration"
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Fehler: kann den Körper \"%s\" für Mannschaft \"%s\" nicht finden."
@@ -632,23 +780,33 @@ msgstr "Flammenwerfer"
 msgid "Football Bomb"
 msgstr "Lärmbombe"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Vollbild?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Vollbild?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "Spielname:"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Spielname:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnu-Werfer"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -656,11 +814,15 @@ msgstr ""
 msgid "Grapple"
 msgstr "Enterhaken"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granate"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Initialisiere Spielfeld..."
 
@@ -668,17 +830,17 @@ msgstr "Initialisiere Spielfeld..."
 msgid "Gun"
 msgstr "Pistole"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr ""
 "HOME Verzeichnis (Umgebungsvariable $HOME) konnte nicht gefunden werden!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Viel Spaß beim Spiel!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Hauptkommandant"
 
@@ -691,7 +853,11 @@ msgstr "Hauptkommandant:"
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Spiel hosten"
 
@@ -733,7 +899,11 @@ msgstr ""
 "Wie man es benutzt : Linksklick aufs Ziel\n"
 "eine Munition pro Runde"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Beeile dich, du bist zu langsam !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -741,7 +911,8 @@ msgstr ""
 "Falls du einen Fehler gefunden oder einen Featurewunsch hast, sende uns eine "
 "E-Mail (in English bitte):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Startenergie"
 
@@ -756,7 +927,7 @@ msgstr ""
 "Feuer : Leertaste gedrückt halten bis die gewünschte Stärke erreicht ist\n"
 "eine Munition pro Runde"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Initialisierung"
 
@@ -764,31 +935,43 @@ msgstr "Initialisierung"
 msgid "Initialise map"
 msgstr "Initialisiere Karte"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Initialisiere Sounds"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Initialisiere Mannschaft"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Es ist ein Geschenk!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Düsenrucksack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Komm nach #wormux auf irc.freenode.net um Gegner zu finden."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Sprache"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Lade Karten:"
 
@@ -796,7 +979,7 @@ msgstr "Lade Karten:"
 msgid "Load teams:"
 msgstr "Lade Mannschaft:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Lokale Mannschaften:"
 
@@ -804,13 +987,13 @@ msgstr "Lokale Mannschaften:"
 msgid "LowGrav"
 msgstr "Geringe Schwerkraft"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "Karten"
@@ -824,11 +1007,16 @@ msgstr "Karte %s, eine Kreation von: "
 msgid "Maps"
 msgstr "Karten"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Startenergie"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Maximale Anzahl an Spielern:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maximale FPS"
 
@@ -836,40 +1024,45 @@ msgstr "Maximale FPS"
 msgid "Mine"
 msgstr "Mine"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "Musik?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Am präzisesten"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Am tollpatschigsten"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Am verräterischsten"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Am nützlichsten"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Am nutzlosesten"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Am gewalttätigsten"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Fallschirm"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Musik?"
 
@@ -877,32 +1070,48 @@ msgstr "Musik?"
 msgid "Network Game"
 msgstr "Netzwerkspiel"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Netzwerk Initialisierung"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Neues Netzwerkspiel um "
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Kein Element <%s> in der XML-Config-Datei gefunden!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Niemand!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Anzahl der Figuren"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Anzahl der Mannschaften:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Einstellungen"
@@ -915,42 +1124,55 @@ msgstr "Einstellungs Men
 msgid "Parachute"
 msgstr "Fallschirm"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Fallschirm wird automatisch aktiviert."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Spielen"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Spieler"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Spielerenergie?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Spielername?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Spielername?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Stinktier-Werfer"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 #, fuzzy
 msgid "Public battles"
 msgstr "Schlacht verlassen"
@@ -959,7 +1181,7 @@ msgstr "Schlacht verlassen"
 msgid "Quit"
 msgstr "Verlassen"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Wormux verlassen"
 
@@ -967,19 +1189,24 @@ msgstr "Wormux verlassen"
 msgid "Quit battle"
 msgstr "Schlacht verlassen"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Spiel starten"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Zufällige Karte"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Lese Standard-Konfigurationsdatei"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Lese persönliche Konfigurationsdatei"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Auflösung"
 
@@ -987,34 +1214,34 @@ msgstr "Aufl
 msgid "Riot Bomb"
 msgstr "Lärmbombe"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Spiel starten"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Sagen: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "Am Rand scrollen"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Am Rand scrollen"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Server Adresse:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Im Internert verfügbare Server"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Server Modus"
 
@@ -1022,10 +1249,35 @@ msgstr "Server Modus"
 msgid "Shotgun"
 msgstr "Schrotflinte"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Einstellungs Menü"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Runde überspringen"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Scharfschützengewehr"
@@ -1034,29 +1286,36 @@ msgstr "Scharfsch
 msgid "Someone put a booby trap into the crate!"
 msgstr "Eine Sprengfalle wurde in einer Holzkiste versteckt."
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Im Moment gibt es leider keine offenen Spiele"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "Geräusche"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Soundeffekte?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Tonfrequenz"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Geräusche"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Starte ein neues Spiel"
 
@@ -1076,20 +1335,29 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Spritze"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+#, fuzzy
+msgid "Talk in network battle"
+msgstr "Zurück zur Schlacht"
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "Manschaften"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "Manschaften"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Manschaften"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportation"
@@ -1105,11 +1373,11 @@ msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr ""
 "Die Lärmbombe hat das Schlachtfeld verlassen bevor sie explodieren konnte."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Das Gnu hat das Schlachtfeld verlassen bevor es explodieren konnte."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr ""
 "Die Stinktier hat das Schlachtfeld verlassen bevor es explodieren konnte."
@@ -1122,6 +1390,15 @@ msgstr "Die Lenkrakete hat das Schlachtfeld verlassen..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Der Ball hat das Schlachtfeld verlassen bevor er explodieren konnte."
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Die Versionen von Client und Server sind inkompatibel (local=%s, server=%s). "
+"Versuche es mit einem anderen Server."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
@@ -1133,7 +1410,7 @@ msgid "The disco grenade has left the dance floor before exploding"
 msgstr ""
 "Die Diskogranate hat die Tanzfläche verlassen bevor sie explodieren konnte."
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "Das Spiel wurde unterbrochen, da keine Verbindung mehr besteht."
 
@@ -1142,7 +1419,7 @@ msgid "The grenade left the battlefield before exploding"
 msgstr ""
 "Die Granate hat das Schlachtfeld verlassen bevor sie explodieren konnte."
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Die Anderen warten auf dich! Aufwachen :-)"
 
@@ -1160,14 +1437,19 @@ msgstr "Der Server hat die Verbindung zur
 msgid "The server rejected the connection: wrong password!"
 msgstr "Der Server hat die Verbindung zurückgesetzt."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Es gibt nur %i Mannschaft."
 msgstr[1] "Es gibt nur %i Mannschaften."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1191,7 +1473,7 @@ msgstr ""
 "Feuer : Leertaste\n"
 "eine Munition pro Runde"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Werkzeuge"
 
@@ -1199,12 +1481,12 @@ msgstr "Werkzeuge"
 msgid "Unable to contact host."
 msgstr "Kann Server nicht kontaktieren!"
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Kann das Karten-Verzeichnis (%s) nicht öffnen!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Kann das persönliche Karten-Verzeichnis (%s) nicht öffnen!"
@@ -1213,83 +1495,108 @@ msgstr "Kann das pers
 msgid "Unable to use this port!"
 msgstr "Kann diesen Port nicht verwenden!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(unbegrenzt)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Namenlos"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Version"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Die Überprüfung der Version schlug fehl, da: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Warte! %i Spieler ist noch nicht bereit!"
 msgstr[1] "Warte! %i Spieler sind noch nicht bereit!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Auf Server warten. Du kannst abbrechen oder chatten!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Waffen"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Webseite: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Wie peinlich für %s - er wurde mit einer einfachen Pistole getötet!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Windpartikel?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Gewinner"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux startet..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux Version "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Du bist alleine :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Du bist alleine..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Du brauchst mindestens eine gültige Karte !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Du brauchst mindestens zwei gültige Mannschaften!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Du kannst nicht spielen bevor du eine Mannschaft gewählt hast!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Dein Schuss ging daneben!"
 
@@ -1297,7 +1604,7 @@ msgstr "Dein Schuss ging daneben!"
 msgid "aka"
 msgstr "aka"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1307,15 +1614,20 @@ msgstr ""
 "Bomben : Linksklick aufs Ziel\n"
 "eine Bombe pro Runde"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "konnte Konfiguration nicht laden"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "fertig"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "Fehler beim Parsen der Konfigurationsdatei"
 
@@ -1323,15 +1635,15 @@ msgstr "Fehler beim Parsen der Konfigurationsdatei"
 msgid "from"
 msgstr "aus"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "keine Konfigurationsdatei vorhanden!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Lade Musik"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Lade Sound Profil: %s"
@@ -1341,15 +1653,23 @@ msgstr "o Lade Sound Profil: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Audio geöffnet mit %d Hz und %d Bit"
 
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Fehler: Dein Server kann über das Internet nicht erreicht werden. "
+#~ "Überprüfe deine Firewall-Konfiguration"
+
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr ""
+#~ "%s versucht mit einer anderen Version zu verbinden: Client=%s, Server=%s."
+
 #~ msgid "Connect !"
 #~ msgstr "Verbinden !"
 
 #~ msgid "Connect to an internet game"
 #~ msgstr "Zu einem Internet Spiel verbinden"
 
-#~ msgid "Refresh"
-#~ msgstr "Aktualisieren"
-
 #~ msgid "Error loading team's data %s:"
 #~ msgstr "Fehler beim Laden der Daten der Mannschaft %s:"
 
@@ -1362,22 +1682,8 @@ msgstr "o Audio ge
 #~ msgid "Error while loading game mode %s (file %s):"
 #~ msgstr "Fehler beim Laden des Spielmodus %s (Datei %s):"
 
+#~ msgid "Refresh"
+#~ msgstr "Aktualisieren"
+
 #~ msgid "XML error during loading map '%s': "
 #~ msgstr "XML Fehler beim Laden der Karte '%s':"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr ""
-#~ "%s versucht mit einer anderen Version zu verbinden: Client=%s, Server=%s."
-
-#~ msgid ""
-#~ "The client and server versions are incompatible (local=%s, server=%s). "
-#~ "Please try another server."
-#~ msgstr ""
-#~ "Die Versionen von Client und Server sind inkompatibel (local=%s, server=%"
-#~ "s). Versuche es mit einem anderen Server."
-
-#~ msgid "And the winner is..."
-#~ msgstr "Und der Gewinner ist..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Beeile dich, du bist zu langsam !!"
diff --git a/po/eo.po b/po/eo.po
index 290d3d3..6d75981 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,16 +1,14 @@
-# translation of wormux_eo.po to esperanto
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# translation of eo_new.po to esperanto
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Axel Rousseau <axel584 AT axel584.org>, 2006.
-# Pierre-Marie Pédrot <pedrotpmx AT wanadoo.fr>, 2007.
-# Pierre-Marie Pédrot <pedrotpmx at wanadoo.fr>, 2007.
+# Pierre-Marie Pédrot <pedrotpmx at wanadoo.fr>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: wormux_eo\n"
+"Project-Id-Version: eo_new\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2007-08-23 23:04+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-02 04:03+0200\n"
 "Last-Translator: Pierre-Marie Pédrot <pedrotpmx at wanadoo.fr>\n"
 "Language-Team: esperanto <kde-i18n-eo at kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,70 +17,80 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
-msgstr "! Mapo %s ne troveblas :-("
+msgstr "! Mapo %s ne troveblas:-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i ludanto konektiĝis"
 msgstr[1] "%i ludantoj konektiĝis"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i ludanto pretas"
 msgstr[1] "%i ludantoj pretas"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s teamo) mortis."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> kiel %s el %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> el %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "%s Teamo"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s Teamo - Defore"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s mortigis sin !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
-msgstr "%s bildo po sekundo (fps)"
+msgstr "%s bildoj po sekundo (fps)"
+
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s (teamo %s) mortigis sin!"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "%s (teamo %s) mortis."
+
+#: src/game/game.cpp:709
+#, c-format
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s (teamo %s) droniĝis!"
+
+#: src/game/game.cpp:703
+#, c-format
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s (teamo %s) falis el la mapo!"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:724
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s droniĝis."
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s (teamo %s) grundtrafis tro perforte!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:731
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s falis el la mapo !"
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s (teamo %s) estas mortinta pro lia mallerteco."
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -91,15 +99,10 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s gajnis %u energian poenton."
 msgstr[1] "%s gajnis %u energiajn poentojn."
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
-msgstr "%s estas psikopatiulo, li mortigas membron el lia teamo : %s !"
-
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s estas mortinta pro lia mallerteco."
+msgstr "%s estas psikopatiulo, li mortigas membron el lia teamo: %s!"
 
 #: src/weapon/mine.cpp:121
 #, c-format
@@ -109,36 +112,36 @@ msgstr "%s estas proksima al mino..."
 #: src/object/bonus_box.cpp:97
 #, c-format
 msgid "%s team already has infinite ammo for the %s!"
-msgstr "%s teamo jam havas senlimajn municiojn por la %s"
+msgstr "%s teamo jam havas senlimajn municiojn por la %s!"
 
 #. Show message
 #: src/weapon/skip_turn.cpp:57
 #, c-format
 msgid "%s team has skipped its turn."
-msgstr "La teamo '%s' malhavis lian vicon."
+msgstr "%s teamo malhavis lian vicon."
 
 #: src/weapon/cluzooka.cpp:396
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u Cluster bazookas!"
 msgid_plural "%s team has won %u Cluster bazookas!"
-msgstr[0] "%s teamo gajnis %u bazukon !"
-msgstr[1] "%s teamo gajnis %u bazukojn !"
+msgstr[0] "%s teamo gajnis %u disbazukon!"
+msgstr[1] "%s teamo gajnis %u disbazukojn!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
-msgstr[0] "%s teamo gajnis %u Gnuon ! Eksplodigu ĉiujn, vakero !"
-msgstr[1] "%s teamo gajnis %u Gnuon ! Eksplodigu ĉiujn, vakero !"
+msgstr[0] "%s teamo gajnis %u Gnuon! Eksplodigu ĉiujn, vakero!"
+msgstr[1] "%s teamo gajnis %u Gnuon! Eksplodigu ĉiujn, vakero!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
-msgstr[0] "%s teamo gajnis %u aeratakon !"
-msgstr[1] "%s teamo gajnis %u aeratakojn !"
+msgstr[0] "%s teamo gajnis %u aeratakon!"
+msgstr[1] "%s teamo gajnis %u aeratakojn!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -147,38 +150,38 @@ msgid_plural ""
 "%s team has won %u airhammers! Don't make too much noise with them! Thanks, "
 "your neighbours."
 msgstr[0] ""
-"%s teamo gajnis %u pneŭmatikan martelon ! Ne tro bruu ! Dankon, la najbaraĵo."
+"%s teamo gajnis %u pneŭmatikan martelon! Ne tro bruu! Dankon, la najbaraĵo."
 msgstr[1] ""
-"%s teamo gajnis %u pneÅ­matikajn martelojn ! Ne tro bruu, danko por la "
+"%s teamo gajnis %u pneÅ­matikajn martelojn! Ne tro bruu, danko por la "
 "najbaraĵo."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
-msgstr[0] "%s teamo gajnis %u amboson ! Platigu ĉiujn !"
-msgstr[1] "%s teamo gajnis %u ambosojn ! Platigu ĉiujn !"
+msgstr[0] "%s teamo gajnis %u amboson! Platigu ĉiujn!"
+msgstr[1] "%s teamo gajnis %u ambosojn! Platigu ĉiujn!"
 
 #: src/weapon/auto_bazooka.cpp:329
 #, c-format
 msgid "%s team has won %u automatic bazooka!"
 msgid_plural "%s team has won %u automatic bazookas!"
-msgstr[0] "%s teamo gajnis %u aÅ­tomatikan bazukon !"
-msgstr[1] "%s teamo gajnis %u aÅ­tomatikajn bazukojn !"
+msgstr[0] "%s teamo gajnis %u aÅ­tomatikan bazukon!"
+msgstr[1] "%s teamo gajnis %u aÅ­tomatikajn bazukojn!"
 
 #: src/weapon/baseball.cpp:116
 #, c-format
 msgid "%s team has won %u baseball bat!"
 msgid_plural "%s team has won %u baseball bats!"
-msgstr[0] "%s teamo gajnis %u basbalbatilon !"
-msgstr[1] "%s teamo gajnis %u basbalbatilojn !"
+msgstr[0] "%s teamo gajnis %u basbalbatilon!"
+msgstr[1] "%s teamo gajnis %u basbalbatilojn!"
 
 #: src/weapon/bazooka.cpp:130
 #, c-format
 msgid "%s team has won %u bazooka!"
 msgid_plural "%s team has won %u bazookas!"
-msgstr[0] "%s teamo gajnis %u bazukon !"
-msgstr[1] "%s teamo gajnis %u bazukojn !"
+msgstr[0] "%s teamo gajnis %u bazukon!"
+msgstr[1] "%s teamo gajnis %u bazukojn!"
 
 #: src/weapon/blowtorch.cpp:137
 #, c-format
@@ -188,210 +191,235 @@ msgid_plural ""
 "%s team has won %u blowtorchs! If you're under 18, ask your parents to use "
 "it."
 msgstr[0] ""
-"%s teamo gajnis %u torĉon ! Se vi estas malpli ol 18-jara, demandu viajn "
+"%s teamo gajnis %u torĉon! Se vi estas malpli ol 18-jara, demandu viajn "
 "gepatrojn."
 msgstr[1] ""
-"%s teamo gajnis %u torĉojn ! Se vi estas malpli ol 18-jara, demandu viajn "
+"%s teamo gajnis %u torĉojn! Se vi estas malpli ol 18-jara, demandu viajn "
 "gepatrojn."
 
 #: src/weapon/bounce_ball.cpp:113
 #, c-format
 msgid "%s team has won %u bounce ball! Boing!"
 msgid_plural "%s team has won %u bounce balls! Boing!"
-msgstr[0] "%s teamo gajnis %u resaltantan pilkon ! Åœpruc !"
-msgstr[1] "%s teamo gajnis %u resaltantajn pilkojn ! Åœpruc !"
+msgstr[0] "%s teamo gajnis %u resaltantan pilkon! Åœpruc!"
+msgstr[1] "%s teamo gajnis %u resaltantajn pilkojn! Åœpruc!"
 
 #: src/weapon/cluster_bomb.cpp:206
 #, c-format
 msgid "%s team has won %u cluster bomb!"
 msgid_plural "%s team has won %u cluster bombs!"
-msgstr[0] "%s teamo gajnis %u disgrenadon !"
-msgstr[1] "%s teamo gajnis %u disgrenadojn !"
+msgstr[0] "%s teamo gajnis %u disgrenadon!"
+msgstr[1] "%s teamo gajnis %u disgrenadojn!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
-msgstr[0] "%s teamo gajnis %u konstruilon ! Ne forgesu vian kaskon."
-msgstr[1] "%s teamo gajnis %u konstruilojn ! Ne forgesu vian kaskon."
+msgstr[0] "%s teamo gajnis %u konstruilon! Ne forgesu vian kaskon."
+msgstr[1] "%s teamo gajnis %u konstruilojn! Ne forgesu vian kaskon."
 
 #: src/weapon/disco_grenade.cpp:170
 #, c-format
 msgid "%s team has won %u disco grenade! Shake your body when throwing it!"
 msgid_plural ""
 "%s team has won %u disco grenades! Shake your body when throwing them!"
-msgstr[0] "%s teamo gajnis %u diskogrenadon ! Ekskuu dum vi lanĉas ĝin !"
-msgstr[1] "%s teamo gajnis %u diskogrenadojn ! Ekskuu dum vi lanĉas ĝin !"
+msgstr[0] "%s teamo gajnis %u diskogrenadon! Ekskuu dum vi lanĉas ĝin!"
+msgstr[1] "%s teamo gajnis %u diskogrenadojn! Ekskuu dum vi lanĉas ĝin!"
 
 #: src/weapon/dynamite.cpp:145
 #, c-format
 msgid "%s team has won %u dynamite!"
 msgid_plural "%s team has won %u dynamites!"
-msgstr[0] "%s teamo gajnis %u dinamitan bastonon !"
-msgstr[1] "%s teamo gajnis %u dinamitajn bastonojn !"
+msgstr[0] "%s teamo gajnis %u dinamitan bastonon!"
+msgstr[1] "%s teamo gajnis %u dinamitajn bastonojn!"
 
 #: src/weapon/flamethrower.cpp:178
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u flame-thrower!"
 msgid_plural "%s team has won %u flame-throwers!"
-msgstr[0] "%s teamo gajnis %u dinamitan bastonon !"
-msgstr[1] "%s teamo gajnis %u dinamitajn bastonojn !"
+msgstr[0] "%s teamo gajnis %u flamĵetilon!"
+msgstr[1] "%s teamo gajnis %u flamĵetilojn!"
 
 #: src/weapon/footbomb.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
-msgstr[0] "%s teamo gajnis %u tumultbombon !"
-msgstr[1] "%s teamo gajnis %u tumultbombojn !"
+msgstr[0] "%s teamo gajnis %u futbalbombon!"
+msgstr[1] "%s teamo gajnis %u futbalbombojn!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
-msgstr[0] "%s teamo gajnis %u alkroĉilon !"
-msgstr[1] "%s teamo gajnis %u alkroĉilojn !"
+msgstr[0] "%s teamo gajnis %u alkroĉilon!"
+msgstr[1] "%s teamo gajnis %u alkroĉilojn!"
 
 #: src/weapon/grenade.cpp:90
 #, c-format
 msgid "%s team has won %u grenade!"
 msgid_plural "%s team has won %u grenades!"
-msgstr[0] "%s teamo gajnis %u grenadon !"
-msgstr[1] "%s teamo gajnis %u grenadojn !"
+msgstr[0] "%s teamo gajnis %u grenadon!"
+msgstr[1] "%s teamo gajnis %u grenadojn!"
 
 #: src/weapon/gun.cpp:99
 #, c-format
 msgid "%s team has won %u gun!"
 msgid_plural "%s team has won %u guns!"
-msgstr[0] "%s teamo gajnis %u fusilon !"
-msgstr[1] "%s teamo gajnis %u fusilojn !"
+msgstr[0] "%s teamo gajnis %u fusilon!"
+msgstr[1] "%s teamo gajnis %u fusilojn!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
-msgstr[0] "%s teamo gajnis %u jetpakon ! Ŭaŭ !"
-msgstr[1] "%s teamo gajnis %u jetpakojn ! Ŭaŭ !"
+msgstr[0] "%s teamo gajnis %u jetpakon! Ŭaŭ!"
+msgstr[1] "%s teamo gajnis %u jetpakojn! Ŭaŭ!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
-msgstr[0] "%s teamo gajnis %u malpezigilon ! Mi estas Neil Armstrong !"
-msgstr[1] "%s teamo gajnis %u malpezigilojn ! Mi estas Neil Armstrong !"
+msgstr[0] "%s teamo gajnis %u malpezigilon! Mi estas Neil Armstrong!"
+msgstr[1] "%s teamo gajnis %u malpezigilojn! Mi estas Neil Armstrong!"
 
 #: src/weapon/mine.cpp:247
 #, c-format
 msgid "%s team has won %u mine!"
 msgid_plural "%s team has won %u mines!"
-msgstr[0] "%s teamo gajnis %u minon !"
-msgstr[1] "%s teamo gajnis %u minojn !"
+msgstr[0] "%s teamo gajnis %u minon!"
+msgstr[1] "%s teamo gajnis %u minojn!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
-msgstr[0] "%s teamo gajnis %u paraŝuton !"
-msgstr[1] "%s teamo gajnis %u paraŝutojn !"
+msgstr[0] "%s teamo gajnis %u paraŝuton!"
+msgstr[1] "%s teamo gajnis %u paraŝutojn!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
-msgstr[0] "%s teamo gajnis %u putoron ! Vi havas vian gasmaskon, ĉu ne ?"
-msgstr[1] "%s teamo gajnis %u putorojn ! Vi havas vian gasmaskon, ĉu ne ?"
+msgstr[0] "%s teamo gajnis %u putoron! Vi havas vian gasmaskon, ĉu ne?"
+msgstr[1] "%s teamo gajnis %u putorojn! Vi havas vian gasmaskon, ĉu ne?"
 
 #: src/weapon/riot_bomb.cpp:133
 #, c-format
 msgid "%s team has won %u riot bomb!"
 msgid_plural "%s team has won %u riot bombs!"
-msgstr[0] "%s teamo gajnis %u tumultbombon !"
-msgstr[1] "%s teamo gajnis %u tumultbombojn !"
+msgstr[0] "%s teamo gajnis %u tumultbombon!"
+msgstr[1] "%s teamo gajnis %u tumultbombojn!"
 
 #: src/weapon/shotgun.cpp:134
 #, c-format
 msgid "%s team has won %u shotgun!"
 msgid_plural "%s team has won %u shotguns!"
-msgstr[0] "%s teamo gajnis %u blovfusilon !"
-msgstr[1] "%s teamo gajnis %u blovfusilojn !"
+msgstr[0] "%s teamo gajnis %u blovfusilon!"
+msgstr[1] "%s teamo gajnis %u blovfusilojn!"
 
-#: src/weapon/snipe_rifle.cpp:246
-#, fuzzy, c-format
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "%s teamo gajnis %u vangofrapon! Evitu tion!"
+msgstr[1] "%s teamo gajnis %u vangofrapojn! Evitu tion!"
+
+#: src/weapon/snipe_rifle.cpp:247
+#, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
 "%s team has won %u sniper rifles! Aim and shoot between the eyes!"
-msgstr[0] "%s teamo gajnis %u tiraljoran fusilon ! Celu inter la okuloj !"
-msgstr[1] "%s teamo gajnis %u tiraljorajn fusilojn ! Celu inter la okuloj !"
+msgstr[0] ""
+"%s teamo gajnis %u tiraljoran fusilon! Celu kaj pafu inter la okuloj!"
+msgstr[1] ""
+"%s teamo gajnis %u tiraljorajn fusilojn! Celu kaj pafu inter la okuloj!"
 
 #: src/weapon/submachine_gun.cpp:144
 #, c-format
 msgid "%s team has won %u submachine gun!"
 msgid_plural "%s team has won %u submachine guns!"
-msgstr[0] "%s teamo gajnis %u mitraleton !"
-msgstr[1] "%s teamo gajnis %u mitraletojn !"
+msgstr[0] "%s teamo gajnis %u mitraleton!"
+msgstr[1] "%s teamo gajnis %u mitraletojn!"
 
 #: src/weapon/suicide.cpp:77
 #, c-format
 msgid "%s team has won %u suicide!"
 msgid_plural "%s team has won %u suicides! Use them all for an extra bonus!"
-msgstr[0] "%s teamo gajnis %u sinmortigon !"
-msgstr[1] "%s teamo gajnis %u sinmortigojn !"
+msgstr[0] "%s teamo gajnis %u sinmortigon!"
+msgstr[1] "%s teamo gajnis %u sinmortigojn!"
 
 #: src/weapon/syringe.cpp:115
 #, c-format
 msgid "%s team has won %u syringe!"
 msgid_plural "%s team has won %u syringes!"
-msgstr[0] "%s teamo gajnis %u injektilon !"
-msgstr[1] "%s teamo gajnis %u injektilojn !"
+msgstr[0] "%s teamo gajnis %u injektilon!"
+msgstr[1] "%s teamo gajnis %u injektilojn!"
 
 #: src/weapon/teleportation.cpp:120
 #, c-format
 msgid "%s team has won %u teleportation!"
 msgid_plural "%s team has won %u teleportations!"
-msgstr[0] "%s teamo gajnis %u teleportilon !"
-msgstr[1] "%s teamo gajnis %u teleportilojn !"
+msgstr[0] "%s teamo gajnis %u teleportilon!"
+msgstr[1] "%s teamo gajnis %u teleportilojn!"
 
 #: src/weapon/skip_turn.cpp:68
 #, c-format
 msgid "%s team has won %u turn skip! I know you'll love it."
 msgid_plural "%s team has won %u turn skips! I know you'll love them."
-msgstr[0] "%s teamo gajnis %u vicpasigon ! Mi scias, ke vi amos ĝin."
-msgstr[1] "%s teamo gajnis %u vicpasigojn ! Mi scias, ke vi amos ilin."
+msgstr[0] "%s teamo gajnis %u vicpasigon! Mi scias, ke vi amos ĝin."
+msgstr[1] "%s teamo gajnis %u vicpasigojn! Mi scias, ke vi amos ilin."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] ""
-"%s teamo gajnis %u tuksĵetilon ! Ĉu vi neniam vidis flugantan sfeniskon ?"
+"%s teamo gajnis %u tuksĵetilon! Ĉu vi neniam vidis flugantan sfeniskon?"
 msgstr[1] ""
-"%s teamo gajnis %u tuksĵetilojn ! Ĉu vi neniam vidis flugantan sfeniskon ?"
+"%s teamo gajnis %u tuksĵetilojn! Ĉu vi neniam vidis flugantan sfeniskon?"
+
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "%s teamo primurditis."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s entombigis membron de la %s teamo kun li!"
 
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(mortinta)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(sistema lingvo)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
-msgstr ""
+msgstr "(nekonata tempo)"
 
 #. Display number of ammo
 #: src/interface/interface.cpp:196
 msgid "(unlimited)"
 msgstr "(senlimaj)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
+"Nova versio %s estas havebla, dum via estas %s. Vi eble volas kontroli ĉu "
+"estas ĝisdatigaĵo por via mastruma sistemo!"
+
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Aldoni propran teamon"
 
-#: src/weapon/air_attack.cpp:209
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Aeratako"
 
@@ -399,27 +427,35 @@ msgstr "Aeratako"
 msgid "Airhammer"
 msgstr "PneÅ­matika martelo"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Ĉiuj teamoj"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Ĉiam"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Kaj la gajnanto estas..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
 "Fire : space key\n"
 "a hit per turn"
 msgstr ""
-"Angulo : Supren/Malsupren\n"
-"Pafo : spacetosigno\n"
+"Angulo: Supren/Malsupren\n"
+"Pafo: spacetosigno\n"
 "Unu pafo vice"
 
 #: src/weapon/anvil.cpp:132
 msgid "Anvil"
 msgstr "Amboso"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
-msgstr "AÅ­toroj :"
+msgstr "AÅ­toroj:"
 
 #: src/weapon/auto_bazooka.cpp:220
 msgid "Automatic Bazooka"
@@ -427,7 +463,7 @@ msgstr "AÅ­tomatika bazuko"
 
 #: src/menu/pause_menu.cpp:51
 msgid "Back to battle"
-msgstr ""
+msgstr "Reiri al la batalo"
 
 #: src/network/net_error_msg.cpp:42
 msgid "Bad socket ..."
@@ -441,6 +477,14 @@ msgstr "Basbalbatilo"
 msgid "Bazooka"
 msgstr "Bazuko"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "AntaÅ­ ago"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Torĉo"
@@ -453,83 +497,153 @@ msgstr "Resaltanta pilko"
 msgid "Bye bye tux..."
 msgstr "AdiaÅ­, tukso..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
-msgstr "Ne eblas trovi teamon %s !"
+msgstr "Ne eblas trovi la teamon %s!"
 
 #: src/team/teams_list.cpp:160
 #, c-format
 msgid "Cannot open personal teams directory (%s)!"
-msgstr "Ne eblas malfermi teaman dosierujon (%s) !"
+msgstr "Ne eblas malfermi la dosierujon de personaj teamoj (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
-msgstr "Ne eblas malfermi teaman dosierujon (%s) !"
+msgstr "Ne eblas malfermi la dosierujon de teamoj (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Ne eblas malfermi la dosierujon de propraj teamoj (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Centrigi la kameraon ĉe la ulo"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Ŝanĝi aktivan ulon"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Ŝanĝi celangulon"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Ŝanĝi kategorion de armilo"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Ŝanĝi templimon de armilo"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Ulo"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Ulŝanĝo"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
-msgstr ""
+msgstr "Ĉu kontroli la ĝisdatigaĵoj enrete?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
+msgstr "Elekti hazarde el la malsamaj mapoj"
+
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
 msgstr ""
 
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Klako: Centrigi la kameraon ĉe la ulo"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Klientmodo"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "La plej mallerta"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Disgrenado"
 
 #: src/weapon/cluzooka.cpp:389
-#, fuzzy
 msgid "Cluzooka"
-msgstr "Bazuko"
+msgstr "Disbazuko"
 
 #: src/weapon/suicide.cpp:42
 msgid "Commit Suicide"
-msgstr "Sinmortigo"
+msgstr "Sinmortigi"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Agordmenuo"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
-msgstr "Konektu al ludo"
+msgstr "Konekti al ludo"
 
 #: src/network/net_error_msg.cpp:33
 msgid "Connected !"
-msgstr "Konektis !"
+msgstr "Konektita!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Konstruilo"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Stirato per:"
 
 #: src/network/download.cpp:81
 #, c-format
 msgid "Couldn't fetch last version from %s"
-msgstr ""
+msgstr "Ne ebli elpreni la lastan version el %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
-msgstr ""
+msgstr "Ne eblis malfermi dosieron %s"
 
 #: src/menu/main_menu.cpp:72
 msgid "Credits"
 msgstr "Kreditoj"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Vundo per vico ĉe subitmorta modo"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Forigi propran teamon"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Diskogrenado"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Montri tiun mesaĝon"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Åœovi&demeti: movi kameraon"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "DaÅ­ro antaÅ­ subitmorta modo"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "VicdaÅ­ro"
 
@@ -537,105 +651,147 @@ msgstr "VicdaÅ­ro"
 msgid "Dynamite"
 msgstr "Dinamito"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "LUDFINO"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
-msgstr ""
+msgstr "LaÅ­teco de efektoj"
+
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energio"
 
-#: src/tool/error.cpp:82
+#: src/tool/error.cpp:63
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Eraro en %s : %lu"
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Eraro en %s:%lu (Wormux %s) : %s"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr "Eraro iniciatante reton: la kliento %s ne akordiĝas kun vi! - %s"
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
-msgstr "Eraro muntante teamon :"
+msgstr "Eraro ŝargante teamon:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
-msgstr "Eraro kreante dosierujon \"%s\" : ne eblas registri agordan dosieron."
+msgstr ""
+"Eraro kreante dosierujon \"%s\": ne eblas konservi la dosieron de agordo."
+
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "Eraro forigante dosierujon \"%s\": ne eblas forigi la propran teamon."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Eraro forigante dosierujon \"%s\": ne eblas forigi la dosieron de agordo."
 
-#: src/game/game.cpp:128
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
 "%s"
 msgstr ""
-"Eraro :\n"
+"Eraro:\n"
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
-msgstr "Ne eblas konekti al %s : %s"
+msgstr "Ne eblas konekti al %s: %s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
-msgstr "Eraro : Ne eblas kontakti indeksservilon por gastigi ludon"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
+msgstr "Eraro: Ne eblas kontakti la indeksservilon por gastigi ludon"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
-msgstr "Eraro : Ne eblas kontakti indeksservilon por serĉi interretan ludon"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
+msgstr "Eraro: Ne eblas kontakti la indeksservilon por serĉi interretan ludon"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
-msgstr "Eraro : Ne eblas starti servilon"
+msgstr "Eraro: Ne eblas starti servilon"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
+"Eraro: via servilo ne estas atingebla el la interreto. Kontroli la agordon "
+"de via fajroŝirmilo: la TCP pordo %s devas akcepti konektojn el ekstero. Se "
+"vi ne estas senpere konektita al la interreto, kontroli la agordon de via "
+"kursilo: la TCP pordo %s devas trasendiĝi al via komputilo."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
-msgstr "Eraro : Ne eblas trovi aspekton \"%s\" por la teamo \"%s\"."
+msgstr "Eraro: Ne eblas trovi aspekton \"%s\" por la teamo \"%s\"."
 
 #: src/weapon/flamethrower.cpp:134
 msgid "Flame Thrower"
-msgstr ""
+msgstr "Flamĵetilo"
 
 #: src/weapon/footbomb.cpp:158
-#, fuzzy
 msgid "Football Bomb"
-msgstr "Tumultbombo"
+msgstr "Futbalbombo"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Plen-ekrane/fenestre"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
-msgstr "Plenekrane ?"
+msgstr "Plenekrane?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
-msgstr ""
+msgstr "Ludo"
+
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Ludmodo"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
-msgstr ""
+msgstr "Ludnomo:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnuĵetilo"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
-msgstr ""
+msgstr "Grafikoj"
 
 #: src/weapon/grapple.cpp:166
 msgid "Grapple"
 msgstr "Alkroĉilo"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Gravito"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Grenado"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Preparante la grundon..."
 
@@ -643,16 +799,16 @@ msgstr "Preparante la grundon..."
 msgid "Gun"
 msgstr "Pistolo"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
-msgstr "HOME dosiero (mediovariablo $HOME) ne troveblas !"
+msgstr "HOME dosiero (mediovariablo $HOME) ne troveblas!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
-msgstr "Bone amuzu !"
+msgstr "Bone amuzu!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Ĉefkomandoro"
 
@@ -663,11 +819,15 @@ msgstr "Ĉefkomandoro:"
 
 #: src/menu/main_menu.cpp:69 src/menu/pause_menu.cpp:59
 msgid "Help"
-msgstr ""
+msgstr "Helpo"
+
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Supersalti"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
-msgstr "Gastigu ludon"
+msgstr "Gastigi ludon"
 
 #: src/weapon/blowtorch.cpp:63
 msgid ""
@@ -675,7 +835,7 @@ msgid ""
 "Angle : Up/Down\n"
 "an ammo per turn"
 msgstr ""
-"Kiel uzi ĝin : apogu kontinue spacetosignon\n"
+"Kiel uzi ĝin: apogu kontinue spacetosignon\n"
 "Unu uzo vice"
 
 #: src/weapon/airhammer.cpp:75
@@ -683,7 +843,7 @@ msgid ""
 "Howto use it : keep space key pressed\n"
 "an ammo per turn"
 msgstr ""
-"Kiel uzi ĝin : apogu kontinue spacetosignon\n"
+"Kiel uzi ĝin: apogu kontinue spacetosignon\n"
 "Unu uzo vice"
 
 #: src/weapon/auto_bazooka.cpp:221
@@ -693,27 +853,32 @@ msgid ""
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
-"Kiel uzi ĝin : maldekstrklaku sur celo\n"
-"Komenca pafangulo : Supren/Malsupren\n"
-"Pafo : apogu kontinue spacetosignon ĝis la vola fortoUnu pafo vice"
+"Kiel uzi ĝin: maldekstrklaku sur celo\n"
+"Komenca pafangulo: Supren/Malsupren\n"
+"Pafo: apogu kontinue spacetosignon ĝis la vola fortoUnu pafo vice"
 
 #: src/weapon/anvil.cpp:133
 msgid ""
 "Howto use it : left click on target\n"
 "an ammo per turn"
 msgstr ""
-"Kiel uzi ĝin : maldekstrklaku sur celo\n"
+"Kiel uzi ĝin: maldekstrklaku sur celo\n"
 "Unu amunicio vice"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Rapidegu, vi tro malrapidas!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
 msgstr ""
 "Se vi trovas cimon aÅ­ havas demandon pri funcio, sendu retleteron al ni "
-"(bonvolu angllingve) :"
+"(bonvolu angllingve):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Komenca energio"
 
@@ -724,11 +889,11 @@ msgid ""
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
-"Komenca pafangulo : Supren/Malsupren\n"
-"Pafo : apogu kontinue spacetosignon ĝis la vola forto\n"
+"Komenca pafangulo: Supren/Malsupren\n"
+"Pafo: apogu kontinue spacetosignon ĝis la vola forto\n"
 "Unu pafo vice"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Preparanto"
 
@@ -736,224 +901,271 @@ msgstr "Preparanto"
 msgid "Initialise map"
 msgstr "Preparante mapon"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Preparante sonojn"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Preparante teamon"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
-msgstr "Tio estas donaco !"
+msgstr "Tio estas donaco!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpako"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Aliĝu #wormux en irc.freenode.net por trovi oponantojn."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Salti"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Salti malantaÅ­en"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Forĵetas la ludantojn nomitajn kiel <nickname> el la ludo"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Lingvo"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
-msgstr "Muntas la mapojn :"
+msgstr "Muntas la mapojn:"
 
 #: src/team/teams_list.cpp:136
 msgid "Load teams:"
-msgstr "Muntas la teamojn :"
+msgstr "Muntas la teamojn:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
-msgstr "Lokaj teamoj :"
+msgstr "Lokaj teamoj:"
 
 #: src/weapon/lowgrav.cpp:49
 msgid "LowGrav"
 msgstr "Malpezigilo"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
-msgstr ""
+msgstr "Manuma konekto"
 
-#: src/menu/game_menu.cpp:84
-#, fuzzy
+#: src/menu/game_menu.cpp:78
 msgid "Map"
-msgstr "Mapoj"
+msgstr "Mapo"
 
 #: src/map/map.cpp:294
 #, c-format
 msgid "Map %s, a creation of: "
-msgstr "Mapo %s, far :"
+msgstr "Mapo %s, far:"
 
 #: src/game/game_init.cpp:109
 msgid "Maps"
 msgstr "Mapoj"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Maks energio"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
-msgstr "Maksimuma kvanto da ludantoj :"
+msgstr "Maksimuma kvanto da ludantoj:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
-msgstr "Maksimumaj bildoj po sukundo (fps)"
+msgstr "Maksimumaj bildoj po sekundo (fps)"
 
 #: src/weapon/mine.cpp:213
 msgid "Mine"
 msgstr "Mino"
 
-#: src/menu/options_menu.cpp:133
-#, fuzzy
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
-msgstr "Muzikon ?"
+msgstr "Diversaĵoj"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "La plej akurata"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "La plej mallerta"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "La plej perfida"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "La plej utila"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "La plej malutila"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "La plej perforta"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Movi la kameraon per muso aÅ­ sagoj"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Movi ulon"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
-msgstr ""
+msgstr "Muzika laÅ­teco"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
-msgstr "Muzikon ?"
+msgstr "Muziko?"
 
 #: src/menu/main_menu.cpp:63
 msgid "Network Game"
 msgstr "Reta ludo"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
-msgstr "Preparante la reton"
+msgstr "Preparado de reto"
+
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Neniam"
 
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
-#, fuzzy
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
-msgstr "Reta ludo"
+msgstr "Nova reta ludo ĉe"
+
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Ĉu averti pri nova ludanto?"
 
-#: src/weapon/weapon.cpp:657
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
-msgstr "Neniu ero <%s> trovita en la XML agorda dosiero !"
+msgstr "Neniu ero <%s> trovita en la XML dosiero de agordo!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
-msgstr "Neniu !"
+msgstr "Neniu!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Kvanto da ludantoj"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
-msgstr "Kvanto da teamoj :"
+msgstr "Kvanto da teamoj:"
+
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "Sur ulo: ŝanĝi la aktiva ulon"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "Sur mapo: elekti celon"
 
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opcioj"
 
 #: src/menu/pause_menu.cpp:55
-#, fuzzy
 msgid "Options menu"
-msgstr "Opcioj"
+msgstr "Opciomenuo"
 
 #: src/weapon/parachute.cpp:68
 msgid "Parachute"
 msgstr "Paraŝuto"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Paraŝuto aŭtomatike uziĝis."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
-msgstr ""
+msgstr "Pasvorto:"
+
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "PaÅ­zi"
 
 #: src/menu/main_menu.cpp:60
 msgid "Play"
-msgstr "Aktoru"
+msgstr "Ludi"
+
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Ludi plurfoje"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Ludanto"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
-msgstr "Ludantan energion ?"
+msgstr "Energio de ludanto?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Ludanta nomo"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
-msgstr "Ludantajn nomojn ?"
+msgstr "Nomo de ludanto?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Putorĵetilo"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
-msgstr "Pordo :"
+msgstr "Pordo:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
-msgstr ""
+msgstr "Publikaj bataloj"
 
 #: src/menu/main_menu.cpp:75
 msgid "Quit"
-msgstr "Forlasu"
+msgstr "Forlasi"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
-msgstr "Forigu el Wormux"
+msgstr "Foriri el Wormux"
 
 #: src/menu/pause_menu.cpp:63
 msgid "Quit battle"
-msgstr ""
+msgstr "Foriri el batalo"
 
-#: src/menu/map_selection_box.cpp:233
-#, fuzzy
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Foriri el ludo"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
-msgstr "Muntas la mapojn :"
+msgstr "Hazarda mapo"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Legante norman agordaron"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Legante personan agordaron"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Difino"
 
@@ -961,34 +1173,33 @@ msgstr "Difino"
 msgid "Riot Bomb"
 msgstr "Tumultbombo"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Komencas partion"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
-msgstr "Diru : "
+msgstr "Diri: "
 
-#: src/menu/options_menu.cpp:84
-#, fuzzy
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
-msgstr "Rulumu sur randoj"
+msgstr "Grandeco de rulumrando"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
-msgstr "Rulumu sur randoj"
+msgstr "Rulumi sur randoj"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
-msgstr "Servila adreso :"
+msgstr "Servila adreso:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Interretebla servilo"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Servila modo"
 
@@ -996,9 +1207,33 @@ msgstr "Servila modo"
 msgid "Shotgun"
 msgstr "Blovfusilo"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Montri la menuon de armiloj"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Montri/Kaŝi interfacon"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Montri/Kaŝi minimapon"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
-msgstr "Pasigo"
+msgstr "Pasigi vicon"
+
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Vangofrapi"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Vangofrapi la malamikon por saltigi lin iomete."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Pli malgranda celangulo kaj paŝo"
 
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
@@ -1006,37 +1241,45 @@ msgstr "Tiraljora fusilo"
 
 #: src/object/bonus_box.cpp:86
 msgid "Someone put a booby trap into the crate!"
-msgstr ""
+msgstr "Iu metis insidon en la skatolo!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Pardonu, aktuale, neniu ludo atendantas ludantojn"
 
-#: src/menu/options_menu.cpp:178
-#, fuzzy
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Pardonu, via versio ne plu estas subtenita. Subtenita versio estas %s. Vi "
+"povas elŝuti ĝisdatan version ĉe http://www.wormux.org/wiki/download.php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
-msgstr "Sonoj"
+msgstr "Sono"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
-msgstr "Sonajn efektojn ?"
+msgstr "Sonaj efektoj?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Sona frekvenco"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Sonoj"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Komencante novan ludon"
 
 #: src/interface/interface.cpp:196
 msgid "Stock:"
-msgstr "Municioj :"
+msgstr "Municioj:"
 
 #: src/weapon/submachine_gun.cpp:99
 msgid "Submachine Gun"
@@ -1050,40 +1293,45 @@ msgstr "SuperTukso"
 msgid "Syringe"
 msgstr "Injektilo"
 
-#: src/menu/results_menu.cpp:389
-#, fuzzy
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Babili dum reta batalo"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
-msgstr "Teamoj"
+msgstr "Teamaj grafikaĵoj"
 
-#: src/menu/results_menu.cpp:378
-#, fuzzy
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
-msgstr "Teamoj"
+msgstr "Teamaj statistikoj"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Teamoj"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Teama redaktilo"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportilo"
 
 #: src/weapon/cluster_bomb.cpp:146
 msgid "The Cluster Bomb has left the battlefield before it could explode."
-msgstr "La disgrenado foriris de la batalejo antaÅ­ ol explodi"
+msgstr "La disgrenado foriris de la batalejo antaÅ­ ol explodi."
 
 #: src/weapon/footbomb.cpp:111
-#, fuzzy
 msgid "The Football Bomb has left the battlefield before it could explode."
-msgstr "La disgrenado foriris de la batalejo antaÅ­ ol explodi"
+msgstr "La futbalbombo foriris de la batalejo antaÅ­ ol explodi."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
-msgstr "La Gnuo foriris de la batalejo antaÅ­ ol explodi"
+msgstr "La Gnuo foriris de la batalejo antaÅ­ ol explodi."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
-msgstr "La putoro foriris de la batalejo antaÅ­ ol explodi"
+msgstr "La putoro foriris de la batalejo antaÅ­ ol explodi."
 
 #: src/weapon/auto_bazooka.cpp:175
 msgid "The automatic rocket has left the battlefield..."
@@ -1091,27 +1339,36 @@ msgstr "La aÅ­tomatika raketo foriris de la batalejo..."
 
 #: src/weapon/bounce_ball.cpp:72
 msgid "The ball left the battlefield before exploding"
-msgstr "La pilko foriris de la batalejo antaÅ­ ol explodi"
+msgstr "La pilko foriris de la batalejo antaÅ­ ol explodi."
+
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"La kliento kaj servilo estas neakordigeblaj (loka=%s, servilo=%s). Bonvolu "
+"provi alian servilon."
 
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
-msgstr "La konekto tempolimis. Certiĝu, ke no estas ie fajroŝirmilo !"
+msgstr "La konekto tempolimis. Certiĝu, ke ne estas ie fajroŝirmilo!"
 
 #: src/weapon/disco_grenade.cpp:127
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "La diskogrenado foriris de la diskejo antaÅ­ ol explodi"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
-msgstr ""
+msgstr "La ludo ĉesis pro ke, vi estis malkonektita."
 
 #: src/weapon/grenade.cpp:58
 msgid "The grenade left the battlefield before exploding"
 msgstr "La grenado foriris de la batalejo antaÅ­ ol explodi"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
-msgstr "La alioj estas atendando vin ! Vekiĝu :-)"
+msgstr "La alioj estas atendando vin! Vekiĝu:-)"
 
 #: src/weapon/bazooka.cpp:83 src/weapon/cluzooka.cpp:336
 #: src/weapon/riot_bomb.cpp:86
@@ -1123,27 +1380,31 @@ msgid "The server rejected the connection."
 msgstr "La servilo forĵetis la konekton."
 
 #: src/network/net_error_msg.cpp:51
-#, fuzzy
 msgid "The server rejected the connection: wrong password!"
-msgstr "La servilo forĵetis la konekton."
+msgstr "La servilo forĵetis la konekton pro malbona pasvorto!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
-msgstr[0] "Sole estas %i teamo."
-msgstr[1] "Sole estas %i teamoj."
+msgstr[0] "Estas nur %i teamo."
+msgstr[1] "Estas nur %i teamoj."
+
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Tempo"
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
-"Tempolimo : Radmuso aŭ Paĝa Supren/Malsupren\n"
-"Angulo : Supren/Malsupren\n"
-"Pafo : apogu kontinue spacetosignon ĝis la vola fortoUnu pafo vice"
+"Tempolimo: Radmuso aŭ Paĝa Supren/Malsupren\n"
+"Angulo: Supren/Malsupren\n"
+"Pafo: apogu kontinue spacetosignon ĝis la vola fortoUnu pafo vice"
 
 #: src/weapon/bounce_ball.cpp:90
 msgid ""
@@ -1152,117 +1413,142 @@ msgid ""
 "Fire : space key\n"
 "an ammo per turn"
 msgstr ""
-"Tempolimo : Radmuso aŭ Paĝa Supren/Malsupren\n"
-"Angulo : Supren/Malsupren\n"
-"Pafo : spacetosignoUnu pafo vice"
+"Tempolimo: Radmuso aŭ Paĝa Supren/Malsupren\n"
+"Angulo: Supren/Malsupren\n"
+"Pafo: spacetosignoUnu pafo vice"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Iloj"
 
 #: src/network/net_error_msg.cpp:36
 msgid "Unable to contact host."
-msgstr "Ne eblas kontakti fora komputilon."
+msgstr "Ne eblas kontakti foran komputilon."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
-msgstr "Ne eblas malfermi mapan dosierujon (%s) !"
+msgstr "Ne eblas malfermi la dosierujon de mapoj (%s)!"
 
-#: src/map/maps_list.cpp:244
-#, fuzzy, c-format
+#: src/map/maps_list.cpp:250
+#, c-format
 msgid "Unable to open personal maps directory (%s)!"
-msgstr "Ne eblas malfermi mapan dosierujon (%s) !"
+msgstr "Ne eblas malfermi la dosierujon de personaj mapoj (%s)!"
 
 #: src/network/net_error_msg.cpp:39
 msgid "Unable to use this port!"
-msgstr "Ne eblas uzi ĉi tiun pordon !"
+msgstr "Ne eblas uzi ĉi tiun pordon!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Nekonata komando"
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(senlimaj)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
-msgstr ""
+msgstr "Sennoma"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versio"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
-msgstr ""
+msgstr "Versiokontrolo fiaskis pro: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
-msgstr[0] "Atendu ! %i ludanto ankoraÅ­ ne pretas !"
-msgstr[1] "Atendu ! %i ludantoj ankoraÅ­ ne pretas !"
+msgstr[0] "Atendu! %i ludanto ankoraÅ­ ne pretas!"
+msgstr[1] "Atendu! %i ludantoj ankoraÅ­ ne pretas!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
-msgstr "Atende servilon, vi nur povas rezigni aÅ­ babili !"
+msgstr "Atende servilon, vi povas nur rezigni aÅ­ babili!"
+
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Armilo: Pafi / Bonusa skatolo: falas rapide"
 
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Armiloj"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "TTT-ejo: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
-msgstr "Kiel honto por %s : li estis mortigita per simpla pafilo !"
+msgstr "Kiel honto por %s: li estis mortigita per simpla pafilo!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
-msgstr "Venterojn ?"
+msgstr "Venterojn?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Gajnanto"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
-msgstr "Wormux muntas..."
+msgstr "Wormux ŝargante..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux versio "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "Malbona mapa CRC!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Malbona mapnomo!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Malbona teamo!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
-msgstr "Vi estas sola :-/"
+msgstr "Vi estas sola:-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Vi estas sola..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
-msgstr "Vi bezonas almenaÅ­ unu taÅ­gan mapon !"
+msgstr "Vi bezonas almenaÅ­ unu taÅ­gan mapon!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
-msgstr "Vi bezonas almenaÅ­ du teamojn !"
+msgstr "Vi bezonas almenaÅ­ du teamojn!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
-msgstr "Vi ne ludeblos, antaÅ­ ol elekti teamon !"
+msgstr "Vi ne ludeblos, antaÅ­ ol elekti teamon!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
-msgstr "Vi mispafis !"
+msgstr "Vi mispafis!"
 
 #: src/menu/credits_menu.cpp:75
 msgid "aka"
 msgstr "alinome"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1272,33 +1558,36 @@ msgstr ""
 "Bombado: Maldekstrklaku sur celo\n"
 "Unu bombado vice"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
-msgstr ""
+msgstr "ne eblis ŝargi agordon"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "propra lundanto"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "farita"
 
-#: src/map/maps_list.cpp:82
-#, fuzzy
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
-msgstr "Legante norman agordaron"
+msgstr "eraro dum analizo de la agordodosiero"
 
 #: src/menu/credits_menu.cpp:79
 msgid "from"
 msgstr "el"
 
-#: src/map/maps_list.cpp:71
-#, fuzzy
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
-msgstr "Eraro muntante agordan dosieron : %s"
+msgstr "neniu agordodosiero!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Legante muzikon"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Legante sonan profilon: %s"
@@ -1308,43 +1597,12 @@ msgstr "o Legante sonan profilon: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Malferminte %d Hz %d bit-an sonon"
 
-#~ msgid "Connect !"
-#~ msgstr "Konektu !"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Konektu al interretludo"
-
-#~ msgid "Refresh"
-#~ msgstr "Refreŝu"
+#~ msgid "Automatically join a game"
+#~ msgstr "Aŭtomate aliĝi al ludo"
 
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Eraro muntante la datumojn de la teamo %s :"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Eraro muntante agordan dosieron : %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Eraro muntante norman agordan dosieron : %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Eraro muntante ludon %s (dosiero %s) :"
-
-#, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "XML-a eraro dum la mapa muntado '%s':"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s provas konetiĝi kun alia versio: kliento=%s, mi=%s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "Kaj la gajnanto estas..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Rapidegu, vi tro malrapidas !"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Ĉu vi volas vere forlasi (J/N) ?"
-
-#, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Preparante la reton"
+#~ msgid ""
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
+#~ msgstr ""
+#~ "Neniu publika servilo kaj malbona manuma konektagordo. Provu konekti "
+#~ "manume."
diff --git a/po/es.po b/po/es.po
index e51f22d..6bd1900 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wormux\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-05-04 09:37+0100\n"
-"Last-Translator: Juan <jua56 at hotmail.com>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-06 15:07+0100\n"
+"Last-Translator: Juan Pujol Rojas <konker69 at gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -21,70 +21,80 @@ msgstr ""
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "Mapa %s no encontrado :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i jugador conectado"
 msgstr[1] "%i jugadores conectados"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i jugador listo"
 msgstr[1] "%i jugadores listos"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) ha muerto."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> aka %s de %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> de %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "%s Equipo"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s Equipo - Remoto"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "¡%s se suicidado!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "¡%s del equipo %s se ha suicidado!"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "¡%s del equipo %s ha muerto!"
+
+#: src/game/game.cpp:709
+#, c-format
+msgid "%s from %s team has fallen into the water!"
+msgstr "¡%s del equipo %s se ha caido al agua!"
+
+#: src/game/game.cpp:703
+#, c-format
+msgid "%s from %s team has fallen off the map!"
+msgstr "¡%s del equipo %s ha salido del mapa!"
+
+#: src/game/game.cpp:724
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s se ha caido al agua."
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "¡%s del equipo %s ha golpeado demasiado fuerte la tierra! "
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:731
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "¡%s se ha salido del mapa!"
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "¡%s del equipo %s ha muerto porque es torpe!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -93,16 +103,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "¡El jugador %s ha conseguido %u punto de vida!"
 msgstr[1] "¡El jugador %s ha conseguido %u puntos de vida!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "¡¡%s es un psicopata!!, ha matado a un miembro de su equipo %s "
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "¡%s se ha muerto porque es más tonto que abundio!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -126,7 +131,7 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "¡El equipo %s ha conseguido %u Cluster bazooka!"
 msgstr[1] "¡El equipo %s ha conseguido %u Cluster bazookas!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
@@ -134,14 +139,14 @@ msgstr[0] "¡El equipo %s ha conseguido %u Gnu! Cuidado hay animales sueltos :)"
 msgstr[1] ""
 "¡El equipo %s ha conseguido %u Gnus! Cuidado hay animales sueltos :)"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "¡El equipo %s ha conseguido %u ataque aereo!"
 msgstr[1] "¡El equipo %s ha conseguido %u ataques aereos!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -156,7 +161,7 @@ msgstr[1] ""
 "¡El equipo %s ha conseguido %u martillos voladores! No hagas demasiado ruido "
 "con ellos! Gracias! Vuestros vecinos."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -208,7 +213,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "¡El equipo %s ha conseguido %u bomba de fragmentación!"
 msgstr[1] "¡El equipo %s ha ganado %u bombas de fragmentación!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -248,7 +253,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "¡El equipo %s ha conseguido %u bomba de futbol!"
 msgstr[1] "¡El equipo %s ha conseguido %u bombas de futbol!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -269,14 +274,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "¡El equipo %s ha conseguido %u pistola!"
 msgstr[1] "¡El equipo %s ha conseguido %u pistolas!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "¡El equipo %s ha conseguido %u jetpack!"
 msgstr[1] "¡El equipo %s ha conseguido %u jetpacks!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -290,14 +295,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "¡El equipo %s ha conseguido %u mina!"
 msgstr[1] "¡El equipo %s ha conseguido %u minas!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "¡El equipo %s ha conseguido %u paracaida!"
 msgstr[1] "¡El equipo %s ha conseguido %u paracaidas!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -318,7 +323,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "¡El equipo %s ha conseguido %u escopeta!"
 msgstr[1] "¡El equipo %s ha ganado %u escopetas!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "¡El equipo %s ha conseguido %u manotazo!"
+msgstr[1] "¡El equipo %s ha conseguido %u manotazos!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -365,23 +377,33 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "¡El equipo %s ha conseguido %u salta turno!"
 msgstr[1] "¡El equipo %s ha conseguido %u salta turnos!"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "¡El equipo %s ha conseguido %u lanzador de Tux!"
 msgstr[1] "¡El equipo %s ha ganado %u lanzadores de Tux!"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "El equipo %s ha ganado."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "¡%s se ha llevado un miembro de %s a la tumba con él! "
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(muerto)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(idioma del sistema)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(tiempo desconocido)"
 
@@ -390,7 +412,7 @@ msgstr "(tiempo desconocido)"
 msgid "(unlimited)"
 msgstr "(ilimitado)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -399,7 +421,11 @@ msgstr ""
 "La versión %s está disponible, pero tienes la versión %s. A lo mejor quieres "
 "ver si hay una actualización disponible para tu sistema operativo."
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Añadir equipo personalizado"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Ataque aereo"
 
@@ -407,17 +433,25 @@ msgstr "Ataque aereo"
 msgid "Airhammer"
 msgstr "Martillo aéreo"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Todos los equipos"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Siempre"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "El ganador es..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
 "Fire : space key\n"
 "a hit per turn"
 msgstr ""
-"Angulo: Arriba/Abajo\n"
+"Ángulo: Arriba/Abajo\n"
 "Fuego: barra espaciadora\n"
 "un tiro por turno"
 
@@ -425,7 +459,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Yunque"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autores:"
 
@@ -449,6 +483,14 @@ msgstr "Bate de béisbol"
 msgid "Bazooka"
 msgstr "Bazooka"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Antes de empezar"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Blitz"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Soplete"
@@ -461,8 +503,9 @@ msgstr "Bounce Ball"
 msgid "Bye bye tux..."
 msgstr "Hasta luego tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "¡Equipo %s no encontrado!"
@@ -472,24 +515,69 @@ msgstr "¡Equipo %s no encontrado!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "¡No se puede abrir el directorio de equipos (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "¡No se puede abrir el directorio de equipos (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "¡No se puede abrir el directorio de equipos personalizados (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Centrar la cámara al personaje"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Cambia el personaje activo"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Cambia el ángulo de tiro"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Cambiar la categoría de arma"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Cambiar el valor de algunas armas"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Personaje"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Cambiar de personaje"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "¿Comprobar actualizaciones en Internet? "
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Elige al azar entre los distintos mapas"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Clásica"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Click: Centra la cámara al personaje"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Modo cliente"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "El más torpe"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Granada de fragmentación"
@@ -502,7 +590,11 @@ msgstr "Bazooka"
 msgid "Commit Suicide"
 msgstr "Suicidio"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Menú de configuración"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Conectar a una partida"
 
@@ -510,11 +602,11 @@ msgstr "Conectar a una partida"
 msgid "Connected !"
 msgstr "¡Conectado!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Construir"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Controlado por: "
 
@@ -523,7 +615,7 @@ msgstr "Controlado por: "
 msgid "Couldn't fetch last version from %s"
 msgstr "No se ha podido volver a la versión %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "No se pudo abrir el archivo %s"
@@ -532,11 +624,32 @@ msgstr "No se pudo abrir el archivo %s"
 msgid "Credits"
 msgstr "Créditos"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Energía por turno de la muerte súbita"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Eliminar el equipo personalizado"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Granada disco"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Muestra este mensaje"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Pulsar y arrastrar: Mueve la cámara"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Duración de la muerte súbita"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Duración del turno"
 
@@ -544,24 +657,34 @@ msgstr "Duración del turno"
 msgid "Dynamite"
 msgstr "Dinamita"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "FIN DEL JUEGO"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Volumen de los efectos"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energia"
+
+#: src/tool/error.cpp:63
+#, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Error en %s:%lu (Wormux %s) : %s"
+
+#: src/include/action_handler.cpp:210
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Error en %s:%lu"
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr "Error al iniciar la red: Cliente %s no está de acuerdo con usted - %s"
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Error cargando el equipo:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -569,7 +692,22 @@ msgstr ""
 "Error mientras se creaba el directorio \"%s\": no se puede guardar el "
 "fichero de configuración."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Error mientras se borraba el directorio \"%s\". No se puede borrar el equipo "
+"personalizado."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Error mientras se borraba el archivo \"%s\". No se puede borrar el equipo "
+"personalizado."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -579,34 +717,40 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Error: No se puede conectar a %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
-msgstr "Error: No se puede contactar con el servidor donde se aloja la partida"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
+msgstr "Error: No se puede crear el servidor de juego"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Error: No se puede contactar con el servidor para buscar una partida en "
 "internet"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Error: Imposible iniciar servidor"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Error: Tu servidor no se puede conectar a internet. Comprueba la "
-"configuración de tu cortafuego (firewall)."
+"Error: El servidor no es accesible desde la Internet. Mira la configuración "
+"del firewall: El Puerto TCP %s debe aceptar conexión desde el exterior. Si "
+"no está directamente conectado a Internet, comprueba la configuración de tu "
+"router: Puerto TCP %s debe ser dirigido a tu ordenador."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Error: no se puede encontrar el skin \"%s\" para el equipo \"%s\"."
@@ -619,23 +763,31 @@ msgstr "Lanzallamas"
 msgid "Football Bomb"
 msgstr "Bomba de futbol"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Pantalla completa / ventana"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "¿Pantalla completa?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Juego"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Estilo de juego"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Nombre de juego:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Lanzador de Gnu"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr "Opciones gráficas"
 
@@ -643,11 +795,15 @@ msgstr "Opciones gráficas"
 msgid "Grapple"
 msgstr "Ataque"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Gravedad"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granada"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inicialización..."
 
@@ -655,16 +811,16 @@ msgstr "Inicialización..."
 msgid "Gun"
 msgstr "Pistola"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "¡El directorio HOME (la variable de entorno $HOME) no se encuentra!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "¡Que tengas una buena partida!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Comandante jefe"
 
@@ -677,9 +833,13 @@ msgstr "Comandante jefe: "
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Salto grande"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
-msgstr "Alojar una partida"
+msgstr "Servidor"
 
 #: src/weapon/blowtorch.cpp:63
 msgid ""
@@ -707,7 +867,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 "Como usarlo: click izquierdo sobre el objetivo\n"
-"Angulo de fuego inicial: Arriba/Abajo\n"
+"Ángulo de fuego inicial: Arriba/Abajo\n"
 "Fuego: manten pulsada la barra espaciadora hasta alcanzar la fuerza deseada\n"
 "un arma por turno "
 
@@ -719,7 +879,11 @@ msgstr ""
 "Como usarlo: botón derecho sobre el objetivo\n"
 "un arma por turno"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Date prisa, eres demasiado lento"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -727,7 +891,8 @@ msgstr ""
 "Si encuentras un bug o tienes una petición de funcionalidad, envíanos un "
 "email (en ingles, por favor):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Energia inicial"
 
@@ -743,7 +908,7 @@ msgstr ""
 "deseada\n"
 "un arma por turno"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inicialización"
 
@@ -751,31 +916,43 @@ msgstr "Inicialización"
 msgid "Initialise map"
 msgstr "Inicialización de la mapa"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inicialización de sonidos"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inicialización de equipos"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "¡Eso es un regalo!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Entra en #wormux en irc.freenode.net para encontrar algún oponente."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Salto"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Salto de espaldas"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Hecha los jugadores designados por <nickname> fuera del juego"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Idioma"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Carga el mapa %s:"
 
@@ -783,7 +960,7 @@ msgstr "Carga el mapa %s:"
 msgid "Load teams:"
 msgstr "Carga los equipos:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Equipos locales:"
 
@@ -791,13 +968,13 @@ msgstr "Equipos locales:"
 msgid "LowGrav"
 msgstr "Baja gravedad"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "Conexión manual"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Mapa"
 
@@ -810,11 +987,15 @@ msgstr "Mapa %s, hecho por:"
 msgid "Maps"
 msgstr "Mapas"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Energía máxima"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Numero de jugadores por equipo:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Numero máximo de FPS"
 
@@ -822,39 +1003,43 @@ msgstr "Numero máximo de FPS"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr "Misceláneo"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "El más preciso"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "El más torpe"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "El más traidor"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "El más útil"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "El más inutil"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "El más violento"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Mueve la cámara con el ratón o con las flechas"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Mover el personaje"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Volumen de la música"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "¿Música?"
 
@@ -862,32 +1047,48 @@ msgstr "¿Música?"
 msgid "Network Game"
 msgstr "Juego en red"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Inicialización de la red"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Nunca"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Nuevo juego de la red en"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "¿Alarma de un nuevo jugador?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "¡Ningun elemento <%s> encontrado en el archivo de configuración xml!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "¡Nadie!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Numero de jugadores por equipo"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Numero de equipos"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "En el personaje: Cambia el jugador activo"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "En el mapa: Selecciona un personaje"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opciones"
@@ -900,42 +1101,54 @@ msgstr "Menu de opciones"
 msgid "Parachute"
 msgstr "Paracaídas"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "El paracaídas se activa automáticamente."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr "Clave:"
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pausa"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Jugar"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Jugar varias partidas"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Jugador"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "¿Muestra la energia del jugador?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Nombre del jugador"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "¿Muestra el nombre del jugador?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Lanzador de mofetas"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr "Batallas publicas"
 
@@ -943,7 +1156,7 @@ msgstr "Batallas publicas"
 msgid "Quit"
 msgstr "Salir"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Salir de Wormux"
 
@@ -951,19 +1164,23 @@ msgstr "Salir de Wormux"
 msgid "Quit battle"
 msgstr "Salir de la batalla"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Salir del juego"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Mapa aleatorio"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Leyendo fichero de configuración"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Leyendo fichero de configuración personal"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Resolución"
 
@@ -971,33 +1188,33 @@ msgstr "Resolución"
 msgid "Riot Bomb"
 msgstr "Bomba Antidisturbio"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Empieza el juego"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Habla:"
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr "Desplazamiento en los bordes"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Desplazamiento en los bordes"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Dirección del servidor:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Servidor disponible en internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Modo servidor"
 
@@ -1005,10 +1222,36 @@ msgstr "Modo servidor"
 msgid "Shotgun"
 msgstr "Escopeta"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Ver el menú de armas"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Ver/ocultar la información"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Ver/ocultar minimapa"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Saltar turno"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Manotazo"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Manotazo al enemigo para hacerle dar un pequeño salto."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+"Ángulo lento\n"
+"Salto pequeño"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Fusil de francotirador"
@@ -1017,28 +1260,38 @@ msgstr "Fusil de francotirador"
 msgid "Someone put a booby trap into the crate!"
 msgstr "¡Alguien puso una trampa explosiva camuflada en la caja!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Lo siento, actualmente, ningún juego está esperando a jugadores"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Lo sentimos, pero su versión no tiene soporte. La versión con soporte es %s. "
+"Puede descargar una versión actualizada en http://www.wormux.org/wiki/"
+"download.php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "¿Efectos sonoros?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Frecuencia del sonido"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Opciones de sonido"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Empezando un nuevo juego"
 
@@ -1058,18 +1311,26 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Jeringuilla"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Habla en la batalla en red"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr "Graficas de equipos"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr "Estado de los equipos"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Equipos"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Editor de equipos"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teletransportación"
@@ -1086,13 +1347,13 @@ msgstr ""
 "La bomba de fragmentación ha abandonado el campo de batalla antes de que "
 "pudiera explotar."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr ""
 "El Gnu abandonó el campo de batalla antes de explotar. Te añoraremos en el "
 "sentimiento todos :("
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr ""
 "La mofeta abandonó el campo de batalla antes de explotar. Que su hedor "
@@ -1106,6 +1367,15 @@ msgstr "El cohete automático ha ido a otro mundo..."
 msgid "The ball left the battlefield before exploding"
 msgstr "La pelota ha abandonado el campo de batalla antes de explotar."
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"El cliente y el servidor tienen la versión incompatible (cliente=%s, "
+"servidor=%s). Porfavor elige otro servidor."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "Ha pasado el tiempo de conexión. Mira si no hay algún firewall."
@@ -1114,7 +1384,7 @@ msgstr "Ha pasado el tiempo de conexión. Mira si no hay algún firewall."
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "La granada disco ha abandonado la pista de baile antes de explotar."
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "El juego se interrumpió por que te has desconectado."
 
@@ -1122,7 +1392,7 @@ msgstr "El juego se interrumpió por que te has desconectado."
 msgid "The grenade left the battlefield before exploding"
 msgstr "La granada ha abandonado el campo de batalla antes de explotar."
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "¡Todos están esperando! Venga que todos están por ti :-)"
 
@@ -1139,14 +1409,19 @@ msgstr "El servidor ha rechazado la conexión"
 msgid "The server rejected the connection: wrong password!"
 msgstr "El servidor ha rechazado la conexión: password erroneo"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Solo hay %i equipo."
 msgstr[1] "Solo hay %i equipos."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Tiempo"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1170,7 +1445,7 @@ msgstr ""
 "Fuego: barra espaciadora\n"
 "un arma por turno"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Herramientas"
 
@@ -1178,12 +1453,12 @@ msgstr "Herramientas"
 msgid "Unable to contact host."
 msgstr "¡Imposible contactar con el servidor!"
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "¡Imposible abrir el directorio de los mapas (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "¡Imposible abrir el directorio personal de mapas (%s)!"
@@ -1192,84 +1467,110 @@ msgstr "¡Imposible abrir el directorio personal de mapas (%s)!"
 msgid "Unable to use this port!"
 msgstr "¡Imposible usar este puerto!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Comando desconocido"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Ilimitado"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versión"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "La verificación de versión ha fallado por: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "¡Espera! %i jugador no está preparado todavía!"
 msgstr[1] "¡Espera! %i jugadores no están preparados todavía!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 "¡Esperando al servidor, todo lo que puedes hacer es cancelar o charlar!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+"Arma: Dispara\n"
+"Cajas: Acelera la caída"
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Armas"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Sitio web: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "¡Que vergüenza para %s lo ha matado una simple pistola!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "¿Muestra las particulas del viento?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Ganador"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Arrancando Wormux..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Versión de Wormux"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "¡Mapa incorrecto CRC!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "¡Nombre de mapa incorrecto!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "¡Equipo incorrecto!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Estás solo..."
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Estás solo..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "¡Necesitas al menos un mapa válido!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "¡Necesitas al menos dos equipos válidos!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "¡No podrás jugar antes de seleccionar un equipo!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "¡Has fallado el tiro!"
 
@@ -1277,7 +1578,7 @@ msgstr "¡Has fallado el tiro!"
 msgid "aka"
 msgstr "aqui"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1287,15 +1588,20 @@ msgstr ""
 "Para bombardear: clic derecho sobre el objetivo\n"
 "un ataque por turno"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "No se puede cargar el fichero de configuración"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "jugador personalizado"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "Terminado"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "Leyendo fichero de configuración"
 
@@ -1303,15 +1609,15 @@ msgstr "Leyendo fichero de configuración"
 msgid "from"
 msgstr "de "
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "no hay un fichero de configuración"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Cargando musica"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Cargando perfil de sonido: %s"
@@ -1321,32 +1627,22 @@ msgstr "o Cargando perfil de sonido: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Abierto audio a %d Hz %d bit"
 
-#~ msgid "Connect !"
-#~ msgstr "¡Conexión!"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Conectado a una partida en internet"
-
-#~ msgid "Refresh"
-#~ msgstr "Actualizar"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Error cargando datos del equipo %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Error cargando el fichero de configuración: %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Error cargando el fichero de configuración: %s"
+#~ msgid "Automatically join a game"
+#~ msgstr "Unirse automáticamente a la partida "
 
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Error cargando el modo de juego %s (fichero %s):"
-
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "Error XML durante la carga del mapa '%s':"
+#~ msgid ""
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
+#~ msgstr ""
+#~ "No dispone de los servidores públicos y tampoco configuración de conexión "
+#~ "manual. Configure la conexión manualmente."
 
-#~ msgid "%s team was fragged down."
-#~ msgstr "El equipo %s ha ganado."
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Error: Tu servidor no se puede conectar a internet. Comprueba la "
+#~ "configuración de tu cortafuego (firewall)."
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: opción ilegal -- %c\n"
@@ -1381,28 +1677,6 @@ msgstr "o Abierto audio a %d Hz %d bit"
 #~ msgid "%s: unrecognized option `--%s'\n"
 #~ msgstr "%s: opcion no reconocida `--%s'\n"
 
-#~ msgid "And the winner is..."
-#~ msgstr "El ganador es..."
-
-#~ msgid "Displays this message"
-#~ msgstr "Muestra este mensaje"
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Date prisa, eres demasiado lento"
-
-#~ msgid "Kicks the players designated by <nickname> out of the game"
-#~ msgstr "Hecha los jugadores designados por <nickname> fuera del juego"
-
-#~ msgid ""
-#~ "The client and server versions are incompatible (local=%s, server=%s). "
-#~ "Please try another server."
-#~ msgstr ""
-#~ "El cliente y el servidor tienen la versión incompatible (cliente=%s, "
-#~ "servidor=%s). Porfavor elige otro servidor."
-
-#~ msgid "Unknown command"
-#~ msgstr "Comando desconocido"
-
 #~ msgid "  Most sold-out  :  "
 #~ msgstr " El más traidor  :  %s (%i).\n"
 
@@ -1457,6 +1731,12 @@ msgstr "o Abierto audio a %d Hz %d bit"
 #~ msgid "ClanLib error during loading map '%s' :"
 #~ msgstr "ClanLib error durante la carga del mapa '%s' :"
 
+#~ msgid "Connect !"
+#~ msgstr "¡Conexión!"
+
+#~ msgid "Connect to an internet game"
+#~ msgstr "Conectado a una partida en internet"
+
 #~ msgid "Do you really want to quit? (Y/N)"
 #~ msgstr "¿Esta seguro que quiere salir? (S/N)"
 
@@ -1466,12 +1746,21 @@ msgstr "o Abierto audio a %d Hz %d bit"
 #~ msgid "End of the game!\n"
 #~ msgstr "¡Final de la partida!\n"
 
-#~ msgid "Energy:"
-#~ msgstr "Energia :"
-
 #~ msgid "Error during loading skin %s:"
 #~ msgstr "Error durante la carga del skin (%s) :"
 
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Error cargando datos del equipo %s:"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Error cargando el fichero de configuración: %s"
+
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Error cargando el fichero de configuración: %s"
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Error cargando el modo de juego %s (fichero %s):"
+
 #~ msgid "Error while loading game mode %s from memory:"
 #~ msgstr "Error cargando el modo de juego %s de la memoria :"
 
@@ -1505,18 +1794,15 @@ msgstr "o Abierto audio a %d Hz %d bit"
 #~ msgid "Number of players per team:"
 #~ msgstr "Numero de jugadores por equipo:"
 
-#~ msgid "Pause"
-#~ msgstr "Pausa"
-
 #~ msgid "Please tell us your opinion of Wormux via email:"
 #~ msgstr "Por favor danos tu opinión de Wormux por correo electrónico:"
 
+#~ msgid "Refresh"
+#~ msgstr "Actualizar"
+
 #~ msgid "Riot bomb"
 #~ msgstr "Bazooka automático"
 
-#~ msgid "Select the teams:"
-#~ msgstr "Selecciona los equipos:"
-
 #~ msgid "Select the world:"
 #~ msgstr "Selecciona el mapa:"
 
@@ -1575,6 +1861,9 @@ msgstr "o Abierto audio a %d Hz %d bit"
 #~ "PELIGRO!! Network está todavía en desarrollo, y por eso es un poquito "
 #~ "experimental."
 
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "Error XML durante la carga del mapa '%s':"
+
 #~ msgid "You need at least two teams to play: change this in 'Options menu' !"
 #~ msgstr ""
 #~ "¡Necesitas al menos dos equipos para jugar, cambia esto en el menu "
diff --git a/po/fa.po b/po/fa.po
index 9288cc4..0184d13 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fa\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2007-12-14 18:03+0100\n"
 "Last-Translator: Behdad Pournader <behdadp at farsiweb.info>\n"
 "Language-Team: Wormux Fa <behdadp at farsiweb.info>\n"
@@ -16,85 +16,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "نقشه‌ی %s پیدا نشد."
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "بازیکن %i وصل شد"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "بازیکن %i آماده است."
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) مرد."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> مشهور به %s از %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> از %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "تیم %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "تیم %s- از راه دور"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s خودکشی کرد!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s فریم بر ثانیه"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s خودکشی کرد!"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s) مرد."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s در آب افتاد."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s از نقشه بیرون افتاد."
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s کشته شد، بخاطر اینکه او یک احمق بود!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
 msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s %u انرژی برنده شد!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s یک موجود روانی است، او یکی از اعضای تیم %s را به کشتن داد."
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s کشته شد، بخاطر اینکه او یک احمق بود!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -117,19 +122,19 @@ msgid "%s team has won %u Cluster bazookas!"
 msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "تیم %s برنده‌ی %u بازوکا شد!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "تیم %s برنده‌ی %u گنو شد! بجمب پسر!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "تیم %s برنده‌ی %u حمله‌ی هوایی شد!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -141,7 +146,7 @@ msgstr[0] ""
 "تیم %s برنده‌ی %u بیل مکانیکی شد! لطفا زیادی سر و صدا نکنید! مرسی،از طرف "
 "همسایه‌ها!"
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -186,7 +191,7 @@ msgid "%s team has won %u cluster bomb!"
 msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "تیم %s برنده‌ی %u بمب خوشه‌ای شد!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -218,7 +223,7 @@ msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "تیم %s برنده‌ی %u بمب تخریبی شد!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -236,13 +241,13 @@ msgid "%s team has won %u gun!"
 msgid_plural "%s team has won %u guns!"
 msgstr[0] "تیم %s برنده‌ی %u اسلحه شد!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "تیم %s برنده‌ی %u پک پرواز شد! پرواز کن پسر!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -256,13 +261,13 @@ msgid "%s team has won %u mine!"
 msgid_plural "%s team has won %u mines!"
 msgstr[0] "تیم %s برنده‌ی %u مین شد!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "تیم %s برنده‌ی %u بادکنک نجات شد!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -281,7 +286,13 @@ msgid "%s team has won %u shotgun!"
 msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "تیم %s برنده‌ی %u شاتگان شد!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "تیم %s برنده‌ی %u چنگک شد! ببینم تو بهتری یا مرد عنکبوتی؟!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -321,23 +332,33 @@ msgid "%s team has won %u turn skip! I know you'll love it."
 msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "تیم %s برنده‌ی %u خروج از نوبت شد! می‌دونم خیلی دوسش داری!"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] ""
 "تیم %s برنده‌ی %u سوپرتاکس شد! چیه؟ تاحالا پنگوئن ندیدی که پرواز کنه؟"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(مرده)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(زبان سیستم)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -346,14 +367,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(بی‌نهایت)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "حمله‌ی هوایی"
 
@@ -361,10 +386,19 @@ msgstr "حمله‌ی هوایی"
 msgid "Airhammer"
 msgstr "بیل مکانیکی"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "همه‌ی تیمها"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "شروع"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "و بالاخره برنده معرفی می‌شود..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -379,7 +413,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "سندان"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "نویسندگان:"
 
@@ -403,6 +437,15 @@ msgstr "چوب بیسبال"
 msgid "Bazooka"
 msgstr "باوکا"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "جابجایی"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "مشعل"
@@ -415,8 +458,9 @@ msgstr "شیطونک"
 msgid "Bye bye tux..."
 msgstr "بای بای تاکس..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "نمی‌توان تیم %s را پیدا کرد!"
@@ -426,24 +470,72 @@ msgstr "نمی‌توان تیم %s را پیدا کرد!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "نمی‌توان پوشه‌ی شخصی تیم‌ها را باز کرد (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "نمی‌توان پوشه‌ی تیم‌ها را باز کرد (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "نمی‌توان پوشه‌ی شخصی تیم‌ها را باز کرد (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "تعداد کاراکترها"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "بادکنک نجات"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "بادکنک نجات"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "به صورت تصادفی یک نقشه از بین نقشه‌های مختلف انتخاب کن"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "حالت کارگیر (کلاینت)"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "احمق‌ترین"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "بمب خوشه‌ای"
@@ -457,7 +549,12 @@ msgstr "باوکا"
 msgid "Commit Suicide"
 msgstr "خودکشی"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "مشکل در بارگذاری پرونده‌ی تنظیمات: %s"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "اتصال به بازی"
 
@@ -465,11 +562,11 @@ msgstr "اتصال به بازی"
 msgid "Connected !"
 msgstr "اتصال برقرار شد!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "سازه"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "کنترل شده بوسیله‌ی: "
 
@@ -478,7 +575,7 @@ msgstr "کنترل شده بوسیله‌ی: "
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr ""
@@ -487,11 +584,32 @@ msgstr ""
 msgid "Credits"
 msgstr "دست اندر کاران"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "نارنجک دیسکو"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "زمان یک نوبت"
 
@@ -499,30 +617,51 @@ msgstr "زمان یک نوبت"
 msgid "Dynamite"
 msgstr "دینامیت"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "پایان بازی"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "مشکل در %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "مشکل در بارگذاری تیم: "
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr "مشکل در ساخت پوشه‌ی جدید \"%s\": ناتوان در ذخیره‌ی پرونده‌ی تنظیمات."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "مشکل در ساخت پوشه‌ی جدید \"%s\": ناتوان در ذخیره‌ی پرونده‌ی تنظیمات."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "مشکل در ساخت پوشه‌ی جدید \"%s\": ناتوان در ذخیره‌ی پرونده‌ی تنظیمات."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -532,30 +671,36 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "مشکل: ناتوان در اتصال به %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "مشکل: ناتوان در ارتباط با کارگزار برای میزبانی یک بازی"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "مشکل: ناتوان در ارتباط با کارگزار برای جستجوی یک بازی اینترنتی"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "مشکل: ناتوان در راه‌اندازی یک کارگزار"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "مشکل: ناتوان در پیدا کردن \"%s\" از تیم \"%s\""
@@ -569,23 +714,33 @@ msgstr "اسلحه‌ی آتیشی"
 msgid "Football Bomb"
 msgstr "بمب تخریبی"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "تمام صفحه؟"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "تمام صفحه؟"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "حالت کارگیر (کلاینت)"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr ""
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "گنو"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -593,11 +748,15 @@ msgstr ""
 msgid "Grapple"
 msgstr "Ú†Ù†Ú¯Ú©"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "نارنجک"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "در حال شروع زمین..."
 
@@ -605,16 +764,16 @@ msgstr "در حال شروع زمین..."
 msgid "Gun"
 msgstr "اسلحه"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "پوشه‌ی خانگی پیدا نشد!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "بازی خوبی داشته باشید!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "رئیس ارتش"
 
@@ -627,7 +786,11 @@ msgstr "رئیس ارتش: "
 msgid "Help"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "میزبانی یک بازی"
 
@@ -667,7 +830,11 @@ msgstr ""
 "چگونگی استفاده از آن: کلیک چپ روی هدف\n"
 "یک بار در هر نوبت"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "بجنب، خیلی کندی! بابا صد رحمت به لاک‌پشت!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -675,7 +842,8 @@ msgstr ""
 "اگر شما یک باگ پیدا کردید و یا درخواست اضافه شدن یک قابلیت به بازی را دارید "
 "لطفا به ما ایمیل بزنید (لطفا به زبان انگلیسی)"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "انرژی آغازی"
 
@@ -691,7 +859,7 @@ msgstr ""
 "دارید\n"
 "یک بار در هر نوبت"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "در حال شروع"
 
@@ -699,31 +867,43 @@ msgstr "در حال شروع"
 msgid "Initialise map"
 msgstr "نقشه‌ی آغازین"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "صداهای آغازین"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "تیم‌های آغازین"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "این یک هدیه است!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "پک پرواز"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "به #wormux در irc.freenode.net بپیوندید."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "زبان"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "بارگذاری نقشه‌ها: "
 
@@ -731,7 +911,7 @@ msgstr "بارگذاری نقشه‌ها: "
 msgid "Load teams:"
 msgstr "بارگذاری تیم‌ها: "
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "تیم‌های محلی: "
 
@@ -739,13 +919,13 @@ msgstr "تیم‌های محلی: "
 msgid "LowGrav"
 msgstr "ضد جاذبه"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "نقشه‌ها"
@@ -759,11 +939,16 @@ msgstr "نقشه‌ی %s، ساخته‌ای از: "
 msgid "Maps"
 msgstr "نقشه‌ها"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "انرژی آغازی"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "حداکثر تعداد بازیکنان: "
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "حداکثر فریم بر ثانیه"
 
@@ -771,40 +956,45 @@ msgstr "حداکثر فریم بر ثانیه"
 msgid "Mine"
 msgstr "مین"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "موسیقی؟"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "بی اشتباه‌ترین"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "احمق‌ترین"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "با استقامت‌ترین"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "موثرترین"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "بی‌مصرف‌ترین"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "وحشی‌ترین"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "بادکنک نجات"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "موسیقی؟"
 
@@ -812,33 +1002,49 @@ msgstr "موسیقی؟"
 msgid "Network Game"
 msgstr "بازی شبکه‌ای"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "در حال آغاز شبکه"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
 msgstr "بازی شبکه‌ای"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "هیچ عنصر <%s> در پرونده‌ی تنظیم xml پیدا نشد!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "هیچکس"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "تعداد کاراکترها"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "تعداد تیم‌ها: "
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "گزینه‌ها"
@@ -852,42 +1058,55 @@ msgstr "گزینه‌ها"
 msgid "Parachute"
 msgstr "بادکنک نجات"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "بادکنک نجات به صورت اتوماتیم فعال خواهد شد."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "شروع"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "بازیکن"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "انرژی بازیکن؟"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "نام بازیکن؟"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "نام بازیکن؟"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "راسو بوگندو"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "پورت: "
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr ""
 
@@ -895,7 +1114,7 @@ msgstr ""
 msgid "Quit"
 msgstr "خروج"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "خروج از ورموکس"
 
@@ -903,19 +1122,24 @@ msgstr "خروج از ورموکس"
 msgid "Quit battle"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "اجرای بازی"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "نقشه تصادفی"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "درحال خواندن پرونده‌ی تنظیمات پیش‌فرض"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "درحال خواندن پرونده‌ی تنظیمات شخصی"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "رزولوشن"
 
@@ -923,34 +1147,34 @@ msgstr "رزولوشن"
 msgid "Riot Bomb"
 msgstr "بمب تخریبی"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "اجرای بازی"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "بگو: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "اسکرول روی خط"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "اسکرول روی خط"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "آدرس کارگزار:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "کارگزار حاضر در اینترنت"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "حالت کارگزار"
 
@@ -958,10 +1182,35 @@ msgstr "حالت کارگزار"
 msgid "Shotgun"
 msgstr "شاتگان"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "گزینه‌ها"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "خروج از نوبت"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "تفنگ دوربین‌دار"
@@ -970,29 +1219,36 @@ msgstr "تفنگ دوربین‌دار"
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "شرمنده، در حال حاضر، هیچ بازی منتظر بازیکنان دیگر نیست."
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "صداها"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "افکت‌های صدا؟"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "فرکانس صدا"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "صداها"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "در حال شروع یک بازی جدید"
 
@@ -1012,20 +1268,28 @@ msgstr "سوپر تاکس"
 msgid "Syringe"
 msgstr "سرنگ مسموم"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr ""
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "تیم‌ها"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "تیم‌ها"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "تیم‌ها"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "جابجایی"
@@ -1039,11 +1303,11 @@ msgstr "بمب خوشه‌ای قبل از اینکه عمل کند از زمی
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "بمب خوشه‌ای قبل از اینکه عمل کند از زمین جنگ خارج شد."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "گنو قبل از اینکه عمل کند از زمین جنگ خارج شد"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "راسوی بوگندو قبل از اینکه عمل کند از زمین جنگ خارج شد"
 
@@ -1055,6 +1319,13 @@ msgstr "بازوکای اتوماتیک از زمین جنگ خارج شد..."
 msgid "The ball left the battlefield before exploding"
 msgstr "شیطونک قبل از اینکه عمل کند از زمین جنگ خارج شد"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "اتصال وصل نشد. بررسی کنید که آیا دیوار آتشی در راه است!"
@@ -1063,7 +1334,7 @@ msgstr "اتصال وصل نشد. بررسی کنید که آیا دیوار آ
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "نارنجک دیسکو قبل از اینکه عمل کند از زمین رقص خارج شد"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1071,7 +1342,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr "نارنجک قبل از اینکه عمل کند از زمین جنگ خارج شد"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "بقیه منتظر شما هستند! بجنب دیگه!"
 
@@ -1089,13 +1360,18 @@ msgstr "کارگزار اتصال را رد کرد."
 msgid "The server rejected the connection: wrong password!"
 msgstr "کارگزار اتصال را رد کرد."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "فقط %i تیم وجود دارد."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1111,7 +1387,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "ابزارها"
 
@@ -1119,12 +1395,12 @@ msgstr "ابزارها"
 msgid "Unable to contact host."
 msgstr "قادر به اتصال به میزبان نیست."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "ناتوان در بازکردن پرونده‌ی نقشه‌ها (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "ناتوان در بازکردن پرونده‌ی نقشه‌های شخصی (%s)!"
@@ -1133,82 +1409,107 @@ msgstr "ناتوان در بازکردن پرونده‌ی نقشه‌های ش
 msgid "Unable to use this port!"
 msgstr "ناتوان در استفاده از این پورت!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(بی‌نهایت)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "بدون نام"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "نسخه"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "صبر کنید! بازیکن %i آماده نیست!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "در انتظار کارگزار، شما فقط می‌توانید رد کنید و یا گپ بزنید!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "اسلحه‌ها"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "وب‌سایت: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "چه افتضاحی، %s با یک اسلحه‌ی ساده کشته شد!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "باد؟"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "برنده"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "ورموکس در حال اجراست..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "نسخه‌ی ورموکس"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "شما تنهایید!"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "شما تنهایید..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "شما حداقل یک نقشه‌ که به درستی کار کند نیاز دارید!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "شما حداقل به ۲ تیم نیاز دارید!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "شما قبل از اینکه تیمی انتخاب کنید نمی‌توانید بازی کنید!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "شلیک شما از دست رفت!"
 
@@ -1216,22 +1517,27 @@ msgstr "شلیک شما از دست رفت!"
 msgid "aka"
 msgstr "مشهور به"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
 "a bombing per turn"
 msgstr ""
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr ""
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "تمام"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 #, fuzzy
 msgid "error parsing the config file"
 msgstr "درحال خواندن پرونده‌ی تنظیمات پیش‌فرض"
@@ -1240,16 +1546,16 @@ msgstr "درحال خواندن پرونده‌ی تنظیمات پیش‌فرض
 msgid "from"
 msgstr "از"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 #, fuzzy
 msgid "no configuration file!"
 msgstr "مشکل در بارگذاری پرونده‌ی تنظیمات: %s"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "در حال بارگذاری موسیقی"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "در حال بارگذاری پرونده‌ی موسیقی: %s"
@@ -1259,14 +1565,17 @@ msgstr "در حال بارگذاری پرونده‌ی موسیقی: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "صدا با %d هرتز و %d بیت باز شد"
 
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "%s می‌خواهد به شما وصل شود، ولی نسخه‌ی او فرق دارد: من=%s او=%s."
+
 #~ msgid "Connect !"
 #~ msgstr "اتصال!"
 
 #~ msgid "Connect to an internet game"
 #~ msgstr "اتصال به یک بازی اینترنتی"
 
-#~ msgid "Refresh"
-#~ msgstr "بازخوانی"
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "واقعا می‌خواهید از بازی خارج شوید؟ (Y/N)"
 
 #~ msgid "Error loading team's data %s:"
 #~ msgstr "مشکل در بارگذاری داده‌های تیم %s: "
@@ -1280,18 +1589,9 @@ msgstr "صدا با %d هرتز و %d بیت باز شد"
 #~ msgid "Error while loading game mode %s (file %s):"
 #~ msgstr "مشکل در بارگذاری بازی در حالت %s (پرونده‌ی %s): "
 
+#~ msgid "Refresh"
+#~ msgstr "بازخوانی"
+
 #, fuzzy
 #~ msgid "XML error during loading map '%s': "
 #~ msgstr "مشکل xml در هنگام بارگذاری نقشه‌ی '%s': "
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s می‌خواهد به شما وصل شود، ولی نسخه‌ی او فرق دارد: من=%s او=%s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "و بالاخره برنده معرفی می‌شود..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "بجنب، خیلی کندی! بابا صد رحمت به لاک‌پشت!!"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "واقعا می‌خواهید از بازی خارج شوید؟ (Y/N)"
diff --git a/po/fi.po b/po/fi.po
index 8e1a35b..ac340bd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2008-05-14 13:38+0300\n"
 "Last-Translator: Bastian Salmela <basse at kulma.org>\n"
 "Language-Team: fi_FI <fi at li.org>\n"
@@ -21,71 +21,81 @@ msgstr ""
 "X-Poedit-Country: FINLAND\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Karttaa %s ei löydy :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i pelaaja liittyneenä"
 msgstr[1] "%i pelaajaa liittyneenä"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i pelaaja valmiina"
 msgstr[1] "%i pelaajaa valmiina"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (joukkue %s) kuoli."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s < %s > aka %s %s:stä"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s < %s > %s:stä"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Joukkue %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s Joukkue - Etä"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s suoritti itsemurhan !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s suoritti itsemurhan !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (joukkue %s) kuoli."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s sukelsi syvyyksiin."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s tipahti ulos kartalta!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s kuoli kömpelyyteensä!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -93,16 +103,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s voitti %u voimapisteen."
 msgstr[1] "%s voitti %u voimapistettä."
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "psykopaatti %s tappaa jäseniä ryhmästä %s!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s kuoli kömpelyyteensä!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -126,21 +131,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "Joukkue %s voitti %u rypäle singon!"
 msgstr[1] "Joukkue %s voitti %u rypälesinkoa!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "Joukkue %s voitti %u Gnun! Pläjäytä ne palasiksi lehmipoika!"
 msgstr[1] "Joukkue %s voitti %u Gnuta! Pläjäytä ne palasiksi lehmipoika!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "Joukkue %s voitti %u ilmaiskun!"
 msgstr[1] "Joukkue %s voitti %u ilmaiskua!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -155,7 +160,7 @@ msgstr[1] ""
 "Joukkue %s voitti %u katuporaa! Älä metelöi liikaa! Kiitoksia, terveisin "
 "naapurit."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -211,7 +216,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "Joukkue %s voitti %u rypälepommin!"
 msgstr[1] "Joukkue %s voitti %u rypälepommia!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -249,7 +254,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "Joukkue %s voitti %u jalkapallopommin!"
 msgstr[1] "Joukkue %s voitti %u jalkapallopommia!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -270,14 +275,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "Joukkue %s voitti %u aseen!"
 msgstr[1] "Joukkue %s voitti %u asetta!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "Joukkue %s voitti %u ilmaiskun."
 msgstr[1] "Joukkue %s voitti %u lentorepun! Siistiä!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -291,14 +296,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "Joukkue %s voitti %u miinan!"
 msgstr[1] "Joukkue %s voitti %u miinaa!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "Joukkue %s voitti %u laskuvarjon!"
 msgstr[1] "Joukkue %s voitti %u laskuvarjoa!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -319,7 +324,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "Joukkue %s voitti %u haulikon!"
 msgstr[1] "Joukkue %s voitti %u haulikkoa!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Joukkue %s voitti %u kiipeilykoukun!"
+msgstr[1] "Joukkue %s voitti %u kiipeilykoukkua!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -362,7 +374,7 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "Joukkue %s voitti %u vuoron skippauksen! Mahtavaa."
 msgstr[1] "Joukkue %s voitti %u vuoron skippausta! Mahtavaa."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -371,16 +383,26 @@ msgstr[0] ""
 msgstr[1] ""
 "Joukkue %s voitti %u Tux laukaisijaa! Lentäviä pingviinejä, viimeinkin!"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(kuollut)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(järjestelmän kieli)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(tuntematon aika)"
 
@@ -389,7 +411,7 @@ msgstr "(tuntematon aika)"
 msgid "(unlimited)"
 msgstr "(rajaton)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -398,7 +420,11 @@ msgstr ""
 "Uusi version %s on saatavilla. Käytössäsi oleva versio on %s. Kannattaa "
 "tarkistaa löytyisikö käyttöjärjestelmällesi päivitystä."
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Ilmaisku"
 
@@ -406,10 +432,19 @@ msgstr "Ilmaisku"
 msgid "Airhammer"
 msgstr "Katupora"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Kaikki joukkueet"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Pelaa"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr ""
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -424,7 +459,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Alasin"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Tekijät:"
 
@@ -448,6 +483,15 @@ msgstr "Pesäpallomaila"
 msgid "Bazooka"
 msgstr "Sinko"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleportaatio"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Puhalluslamppu"
@@ -460,8 +504,9 @@ msgstr "Pomppupallo"
 msgid "Bye bye tux..."
 msgstr "Hei hei tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Ei löydy joukkuetta %s!"
@@ -471,24 +516,72 @@ msgstr "Ei löydy joukkuetta %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Ei voida avata henkilökohtaista joukkue hakemistoa (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Ei voida avata joukkue hakemistoa (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Ei voida avata henkilökohtaista joukkue hakemistoa (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Pelaajien määrä"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Laskuvarjo"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Laskuvarjo"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Tarkista päivitykset"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Valitse sattumanvaraisesti eri karttojen välillä"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Client tila"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Kömpelöin"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Rypälepommi"
@@ -501,7 +594,12 @@ msgstr "Sinko"
 msgid "Commit Suicide"
 msgstr "Itsemurhaisku"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "ei asetustiedostoa!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Yhdistä peliin"
 
@@ -509,11 +607,11 @@ msgstr "Yhdistä peliin"
 msgid "Connected !"
 msgstr "Yhdistetty!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Rakenna"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Hallitsee: "
 
@@ -522,7 +620,7 @@ msgstr "Hallitsee: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Ei voitu hakea uusinta versiota osoitteesta %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Ei voitu avata tiedostoa %s"
@@ -531,11 +629,32 @@ msgstr "Ei voitu avata tiedostoa %s"
 msgid "Credits"
 msgstr "Kiitokset"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Diskokranaatti"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Vuoron kesto:"
 
@@ -543,30 +662,51 @@ msgstr "Vuoron kesto:"
 msgid "Dynamite"
 msgstr "Dynamiitti"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "PELI LOPPUI"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Efektien voimakkuus"
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Virhe kohdassa %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Virhe ladattessa joukkuetta :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr "Virhe luodessa hakemistoa \"%s\":  asetustiedostoa ei voida tallentaa."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "Virhe luodessa hakemistoa \"%s\":  asetustiedostoa ei voida tallentaa."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "Virhe luodessa hakemistoa \"%s\":  asetustiedostoa ei voida tallentaa."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -576,31 +716,36 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Virhe: Ei voitu yhdistää: %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Virhe: Ei saatu yhteyttä palvelimeen pelin isännöimiseksi"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "Virhe: E"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Virhe: Palvelimen käynnistäminen epäonnistui"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Virhe: Palvelimellesi ei pääse internetistä. Tarkista palomuuriasetuksesi."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Virhe: ei voida ladata ulkoasua \"%s\" joukkueelle \"%s\"."
@@ -613,23 +758,33 @@ msgstr "Liekinheitin"
 msgid "Football Bomb"
 msgstr "Jalkapallopommi"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Kokoruutu"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Kokoruutu"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Peli"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "Pelin nimi:"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Pelin nimi:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnu"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr "Grafiikka asetukset"
 
@@ -637,11 +792,15 @@ msgstr "Grafiikka asetukset"
 msgid "Grapple"
 msgstr "Kiipeilykoukku"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Kranaatti"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Maaston alustus..."
 
@@ -649,16 +808,16 @@ msgstr "Maaston alustus..."
 msgid "Gun"
 msgstr "Pyssy"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "kotihakemistoa (ympäristömuuttuja $HOME) ei löytynyt!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Pidähän hauskaa!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Ylikomentaja"
 
@@ -671,7 +830,11 @@ msgstr "Ylikomentaja: "
 msgid "Help"
 msgstr "Ohje"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Isännöi peli"
 
@@ -712,7 +875,11 @@ msgstr ""
 "Käyttöohje : valitse kohde vasemmalla hiirennapilla\n"
 "yksi ammus per vuoro"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr ""
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -720,7 +887,8 @@ msgstr ""
 "Jos löysit bugin tai sinulla on parannusehdotuksia, lähetä sähköpostia "
 "(englanniksi): "
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Aloitus voimat:"
 
@@ -735,7 +903,7 @@ msgstr ""
 "Ammu : pidä välilyönti painettuna\n"
 "yksi ammus per vuoro"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Alustus"
 
@@ -743,31 +911,43 @@ msgstr "Alustus"
 msgid "Initialise map"
 msgstr "Alusta kartta"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Alusta äänet"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Alusta joukkueet"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Taivaalta sataa lahjoja!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Lentoreppu"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Liity #wormux kanavalle irc.freenode.netissä löytääksesi vastustajia."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Kieli"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Lataa kartat:"
 
@@ -775,7 +955,7 @@ msgstr "Lataa kartat:"
 msgid "Load teams:"
 msgstr "Lataa joukkueet:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Paikalliset joukkueet:"
 
@@ -783,13 +963,13 @@ msgstr "Paikalliset joukkueet:"
 msgid "LowGrav"
 msgstr "Painottomuus"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "Manuaalinen yhteys"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Kartta"
 
@@ -802,11 +982,16 @@ msgstr "Kartta %s, tehnyt :"
 msgid "Maps"
 msgstr "Kartat"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Aloitus voimat:"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Pelaajien määrä joukkueessa:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maksimi FPS"
 
@@ -814,39 +999,44 @@ msgstr "Maksimi FPS"
 msgid "Mine"
 msgstr "Miina"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr "Sekalaiset"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Tarkin"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Kömpelöin"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Petetyin"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Hyödyllisin"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Hyödyttömin"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Väkivaltaisin"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Laskuvarjo"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Musiikki"
 
@@ -854,32 +1044,48 @@ msgstr "Musiikki"
 msgid "Network Game"
 msgstr "Nettipeli"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Verkon alustus..."
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Uusi verkkopeli paikassa"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Elementtiä <%s> ei löytynyt xml tiedostosta !"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Ei kukaan!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Pelaajien määrä"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Joukkueita"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Asetukset"
@@ -892,42 +1098,55 @@ msgstr "Asetukset"
 msgid "Parachute"
 msgstr "Laskuvarjo"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Laskuvarjo aukeaa automaattisesti."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr "Salasana:"
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Pelaa"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Pelaaja"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Näytä voimat"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Näytä nimi"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Näytä nimi"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Haisunäätä"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr "Julkiset taistelut"
 
@@ -935,7 +1154,7 @@ msgstr "Julkiset taistelut"
 msgid "Quit"
 msgstr "Lopeta"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Lopeta Wormux"
 
@@ -943,19 +1162,24 @@ msgstr "Lopeta Wormux"
 msgid "Quit battle"
 msgstr "Lopeta taistelu"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Aloita peli"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Satunnainen kartta"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Luetaan oletus asetuksia"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Luetaan henkilökohtaisia asetuksia"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Tarkkuus"
 
@@ -963,33 +1187,33 @@ msgstr "Tarkkuus"
 msgid "Riot Bomb"
 msgstr "Mellakkapommi"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Aloita peli"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Sano: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr "Reunuksen koko"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Vieritä ruudun reunoista"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Palvelimen osoite:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Palvelimelle on pääsy internetistä"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Palvelimen tila"
 
@@ -997,10 +1221,35 @@ msgstr "Palvelimen tila"
 msgid "Shotgun"
 msgstr "Haulikko"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Asetukset"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Jätä vuoro väliin"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Tarkkuuskivääri"
@@ -1009,28 +1258,35 @@ msgstr "Tarkkuuskivääri"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Joku viritti ansan laatikkoon!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Valitettavasti tällähetkellä yksikään peli ei odota pelaajia"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Ääni asetukset"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Ääniefektit"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Äänitaajuus"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Ääni asetukset"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Aloitetaan uusi peli"
 
@@ -1050,18 +1306,27 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Ruisku"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+#, fuzzy
+msgid "Talk in network battle"
+msgstr "Takaisin taisteluun"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr "Joukkueen grafiikat"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr "Joukkueen tilastot"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Joukkueet"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportaatio"
@@ -1074,11 +1339,11 @@ msgstr "Rypälepommi on poistunut taistelukentältä räjähtämättömänä."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Jalkapallopommi poistui kentältä ennen kuin ehti räjähtää."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnu on poistunut taistelukentältä..."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Haisunäätä on poistunut taistelukentältä..."
 
@@ -1090,6 +1355,13 @@ msgstr "Automaattiohjus on poistunut taistelukentältä..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Pallo on poistunut taistelukentältä..."
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "Yhteyden aikakatkaisu. Tarkista ettei palomuuri ole tiellä!"
@@ -1098,7 +1370,7 @@ msgstr "Yhteyden aikakatkaisu. Tarkista ettei palomuuri ole tiellä!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Diskogranaatti on poistunut paremmille tanssilattioille"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "Peli keskeytyi koska yhteytesi katkesi."
 
@@ -1106,7 +1378,7 @@ msgstr "Peli keskeytyi koska yhteytesi katkesi."
 msgid "The grenade left the battlefield before exploding"
 msgstr "Kranaatti on poistunut taistelukentältä..."
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Kaikki muut odottavat sinua! Herätys!! :)"
 
@@ -1123,14 +1395,19 @@ msgstr "Palvelimen hylkäsi yhteyden."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Palvelin hylkäsi yhteyden: väärä salasana!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "On olemassa vain %i joukkue."
 msgstr[1] "On olemassa vain %i joukkuetta."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1154,7 +1431,7 @@ msgstr ""
 "Ammu: välilyönti\n"
 "yksi ammus per vuoro"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Työkalut"
 
@@ -1162,12 +1439,12 @@ msgstr "Työkalut"
 msgid "Unable to contact host."
 msgstr "Ei saatu yhteyttä isäntään."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Karttahakemiston avaaminen epäonnistui (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Henkilökohtaisten karttojen avaaminen epäonnistui (%s)!"
@@ -1176,83 +1453,108 @@ msgstr "Henkilökohtaisten karttojen avaaminen epäonnistui (%s)!"
 msgid "Unable to use this port!"
 msgstr "Tätä porttia ei voida käyttää!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(rajaton)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Nimetön"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versio"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Versiontarkistus epäonnistui koska: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Hetkinen! %i pelaaja ei ole vielä valmis!"
 msgstr[1] "Hetkinen! %i pelaajaa ei ole vielä valmiita!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Odotetaan palvelinta, voit ainoastaan keskeyttää tai jutella!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Aseet"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Verkkosivu:"
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Mikä harmi, %s kuoli pikku pyssyn luodista!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Näytä tuuli"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Voittaja"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux käynnistyy..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux versio"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Olet yksin :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Olet yksin..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Tarvitset ainakin yhden toimivan kartan !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Tarvitset ainakin kaksi kunnollista joukkuetta!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Et voi aloittaa peliä ennenkuin olet olet valinnut joukkueen!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Ammuit ohi!"
 
@@ -1260,7 +1562,7 @@ msgstr "Ammuit ohi!"
 msgid "aka"
 msgstr "aka"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1269,15 +1571,20 @@ msgstr ""
 "hyökkässuunta: Vasen/Oikea\n"
 "Pommitus : valitse kohde vasemmalla hiirennapilla yksi pommitus per vuoro"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "ei voitu lukea asetuksia"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "valmis"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "virhe luettaessa asetustiedostoa"
 
@@ -1285,15 +1592,15 @@ msgstr "virhe luettaessa asetustiedostoa"
 msgid "from"
 msgstr ", "
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "ei asetustiedostoa!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Ladataan musiikki"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Ladataan ääniprofiili: %s"
@@ -1302,3 +1609,9 @@ msgstr "o Ladataan ääniprofiili: %s"
 #, c-format
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Avataan äänet: %d Hz %d bittiä."
+
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Virhe: Palvelimellesi ei pääse internetistä. Tarkista palomuuriasetuksesi."
diff --git a/po/fr.po b/po/fr.po
index b17dbef..936d001 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,79 +7,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-01-18 00:03+0100\n"
-"Last-Translator: Kurosu <kurosu at free.fr>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-15 21:11+0100\n"
+"Last-Translator: Frédéric Bertolus <fredb219 at gmail.com>\n"
 "Language-Team:  <fr at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/map/maps_list.cpp:320
-#, c-format
+#: src/map/maps_list.cpp:326
+#, fuzzy, c-format
 msgid "! Map %s not found :-("
-msgstr "! Le terrain %s est introuvable :-("
+msgstr "Le terrain %s est introuvable :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i joueur connecté"
 msgstr[1] "%i joueurs connectés"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i joueur prêt"
 msgstr[1] "%i joueurs prêts"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) est mort."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
-msgstr "%s <%s> dit %s de %s"
+msgstr "%s <%s> alias %s (%s)"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> de %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Équipe %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Équipe %s - Distant"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s s'est suicidé !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
-msgstr "%s i/s"
+msgstr "%s img/s"
+
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s de l'équipe %s s'est suicidé !"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "%s de l'équipe %s est mort."
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:709
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s est tombé dans l'eau."
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s de l'équipe %s est tombé dans l'eau."
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:703
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s est sorti du terrain !"
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s de l'équipe %s est sorti du terrain !"
+
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s de l'équipe %s a touché le sol trop fort !"
+
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s de l'équipe %s est mort à cause de sa maladresse !"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -88,54 +98,49 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "Le joueur %s a gagné %u point de vie !"
 msgstr[1] "Le joueur %s a gagné %u points de vie !"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
-msgstr "%s est un psychopathe, il tue des membres de son équipe (%s) !"
-
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s est mort à cause de sa maladresse !"
+msgstr "%s est un psychopathe, il a tué un membre de son équipe (%s) !"
 
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
-msgstr "%s est près d'une mine !"
+msgstr "%s est près d'une Mine !"
 
 #: src/object/bonus_box.cpp:97
 #, c-format
 msgid "%s team already has infinite ammo for the %s!"
-msgstr "L'équipe %s a déjà un nombre illimité de munition pour l'arme %s !"
+msgstr "L'équipe %s a déjà un nombre illimité de munitions pour l'arme %s !"
 
 #. Show message
 #: src/weapon/skip_turn.cpp:57
 #, c-format
 msgid "%s team has skipped its turn."
-msgstr "%s a sauté son tour."
+msgstr "L'équipe %s a sauté son tour."
 
 #: src/weapon/cluzooka.cpp:396
 #, c-format
 msgid "%s team has won %u Cluster bazookas!"
 msgid_plural "%s team has won %u Cluster bazookas!"
-msgstr[0] "L'équipe %s a gagné %u bazooka à fragmentation !"
-msgstr[1] "L'équipe %s a gagné %u bazookas à fragmentation !"
+msgstr[0] "L'équipe %s a gagné %u Bazooka à Fragmentation !"
+msgstr[1] "L'équipe %s a gagné %u Bazookas à Fragmentation !"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
-msgstr[0] "L'équipe %s a gagné %u balle rebondissante !"
+msgstr[0] "L'équipe %s a gagné %u Gnu! Dégage tes adversaires cowboy!"
 msgstr[1] "L'équipe %s a gagné %u Gnus! Dégage tes adversaires cowboy!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
-msgstr[0] "L'équipe %s a gagné %u attaque aérienne !"
-msgstr[1] "L'équipe %s a gagné %u attaques aériennes !"
+msgstr[0] "L'équipe %s a gagné %u Frappe Aérienne !"
+msgstr[1] "L'équipe %s a gagné %u Frappes Aériennes !"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -144,39 +149,39 @@ msgid_plural ""
 "%s team has won %u airhammers! Don't make too much noise with them! Thanks, "
 "your neighbours."
 msgstr[0] ""
-"L'équipe %s a gagné %u marteau-piqueur! Ne faîtes trop bruit pour vos "
+"L'équipe %s a gagné %u Marteau-piqueur! Ne faîtes pas trop de bruit pour vos "
 "voisins!"
 msgstr[1] ""
-"L'équipe·%s·a·gagné·%u·marteaux-piqueurs!"
-"·Ne·faîtes·trop·bruit·pour·vos·voisins!"
+"L'équipe %s a gagné %u Marteaux-piqueurs! Ne faîtes pas trop de bruit pour "
+"vos voisins!"
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
-msgstr[0] "L'équipe %s a gagné %u enclume ! Écrase les tous !"
-msgstr[1] "L'équipe %s a gagné %u enclumes ! Écrase les tous !"
+msgstr[0] "L'équipe %s a gagné %u Enclume ! Écrase les tous !"
+msgstr[1] "L'équipe %s a gagné %u Enclumes ! Écrase les tous !"
 
 #: src/weapon/auto_bazooka.cpp:329
 #, c-format
 msgid "%s team has won %u automatic bazooka!"
 msgid_plural "%s team has won %u automatic bazookas!"
-msgstr[0] "L'équipe %s a gagné %u bazooka automatique !"
-msgstr[1] "L'équipe %s a gagné %u bazookas automatiques !"
+msgstr[0] "L'équipe %s a gagné %u Bazooka Automatique !"
+msgstr[1] "L'équipe %s a gagné %u Bazookas Automatiques !"
 
 #: src/weapon/baseball.cpp:116
 #, c-format
 msgid "%s team has won %u baseball bat!"
 msgid_plural "%s team has won %u baseball bats!"
-msgstr[0] "L'équipe %s a gagné %u batte de baseball !"
-msgstr[1] "L'équipe %s a gagné %u battes de baseball !"
+msgstr[0] "L'équipe %s a gagné %u Batte de Baseball !"
+msgstr[1] "L'équipe %s a gagné %u Battes de Baseball !"
 
 #: src/weapon/bazooka.cpp:130
 #, c-format
 msgid "%s team has won %u bazooka!"
 msgid_plural "%s team has won %u bazookas!"
-msgstr[0] "L'équipe %s a gagné %u bazooka !"
-msgstr[1] "L'équipe %s a gagné %u bazookas !"
+msgstr[0] "L'équipe %s a gagné %u Bazooka !"
+msgstr[1] "L'équipe %s a gagné %u Bazookas !"
 
 #: src/weapon/blowtorch.cpp:137
 #, c-format
@@ -186,39 +191,39 @@ msgid_plural ""
 "%s team has won %u blowtorchs! If you're under 18, ask your parents to use "
 "it."
 msgstr[0] ""
-"L'équipe %s a gagné %u chalumeau! Si vous êtes mineur, demandez à vos "
+"L'équipe %s a gagné %u Chalumeau! Si vous êtes mineur, demandez à vos "
 "parents avant de l'utiliser!"
 msgstr[1] ""
-"L'équipe·%s·a·gagné·%u·chalumeaux!·Si·vous·êtes·mineur,"
-"·demandez·à·vos·parents·avant·de·l'utiliser!"
+"L'équipe %s a gagné %u Chalumeaux! Si vous êtes mineur, demandez à vos "
+"parents avant de l'utiliser!"
 
 #: src/weapon/bounce_ball.cpp:113
 #, c-format
 msgid "%s team has won %u bounce ball! Boing!"
 msgid_plural "%s team has won %u bounce balls! Boing!"
-msgstr[0] "L'équipe %s a gagné %u balle rebondissante ! Boing !"
-msgstr[1] "L'équipe %s a gagné %u balles rebondissantes ! Boing !"
+msgstr[0] "L'équipe %s a gagné %u Balle Rebondissante ! Boing !"
+msgstr[1] "L'équipe %s a gagné %u Balles Rebondissantes ! Boing !"
 
 #: src/weapon/cluster_bomb.cpp:206
 #, c-format
 msgid "%s team has won %u cluster bomb!"
 msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] ""
-"L'équipe %s a gagné %u bombe à fragmentation ! Attention à ne pas trop se "
+"L'équipe %s a gagné %u Grenade à Fragmentation ! Attention à ne pas trop se "
 "disperser !"
 msgstr[1] ""
-"L'équipe %s a gagné %u bombes à fragmentation ! Attention à ne pas trop se "
+"L'équipe %s a gagné %u Grenades à Fragmentation ! Attention à ne pas trop se "
 "disperser !"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
 msgstr[0] ""
-"L'équipe %s a gagné %u kit de construction ! N'oublie pas ton casque de "
+"L'équipe %s a gagné %u Kit de Construction ! N'oublie pas ton casque de "
 "chantier !"
 msgstr[1] ""
-"L'équipe %s a gagné %u kits de construction ! N'oublie pas ton casque de "
+"L'équipe %s a gagné %u Kits de Construction ! N'oublie pas ton casque de "
 "chantier !"
 
 #: src/weapon/disco_grenade.cpp:170
@@ -226,135 +231,142 @@ msgstr[1] ""
 msgid "%s team has won %u disco grenade! Shake your body when throwing it!"
 msgid_plural ""
 "%s team has won %u disco grenades! Shake your body when throwing them!"
-msgstr[0] "L'équipe %s a gagné %u grenade disco ! Bouge ton corps !"
-msgstr[1] "L'équipe %s a gagné %u grenades disco ! Bouge ton corps !"
+msgstr[0] "L'équipe %s a gagné %u Grenade Disco ! Bouge ton corps !"
+msgstr[1] "L'équipe %s a gagné %u Grenades Disco ! Bouge ton corps !"
 
 #: src/weapon/dynamite.cpp:145
 #, c-format
 msgid "%s team has won %u dynamite!"
 msgid_plural "%s team has won %u dynamites!"
-msgstr[0] "L'équipe %s a gagné %u dynamite !"
-msgstr[1] "L'équipe %s a gagné %u dynamites !"
+msgstr[0] "L'équipe %s a gagné %u Dynamite !"
+msgstr[1] "L'équipe %s a gagné %u Dynamites !"
 
 #: src/weapon/flamethrower.cpp:178
 #, c-format
 msgid "%s team has won %u flame-thrower!"
 msgid_plural "%s team has won %u flame-throwers!"
-msgstr[0] "L'équipe %s a gagné %u lance-flammes ! Ça sent déjà le cramé..."
-msgstr[1] "L'équipe %s a gagné %u lances-flammes ! Ça sent déjà le cramé..."
+msgstr[0] "L'équipe %s a gagné %u Lance-Flammes ! Ça sent déjà le cramé..."
+msgstr[1] "L'équipe %s a gagné %u Lances-Flammes ! Ça sent déjà le cramé..."
 
 #: src/weapon/footbomb.cpp:176
 #, c-format
 msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
-msgstr[0] "L'équipe %s a gagné %u ballon explosif !"
-msgstr[1] "L'équipe %s a gagné %u ballons explosif !"
+msgstr[0] "L'équipe %s a gagné %u Ballon Explosif !"
+msgstr[1] "L'équipe %s a gagné %u Ballons Explosifs !"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
-msgstr[0] "L'équipe %s a gagné %u grappin !"
-msgstr[1] "L'équipe %s a gagné %u grappins !"
+msgstr[0] "L'équipe %s a gagné %u Grappin !"
+msgstr[1] "L'équipe %s a gagné %u Grappins !"
 
 #: src/weapon/grenade.cpp:90
 #, c-format
 msgid "%s team has won %u grenade!"
 msgid_plural "%s team has won %u grenades!"
-msgstr[0] "L'équipe %s a gagné %u grenade !"
-msgstr[1] "L'équipe %s a gagné %u grenades !"
+msgstr[0] "L'équipe %s a gagné %u Grenade !"
+msgstr[1] "L'équipe %s a gagné %u Grenades !"
 
 #: src/weapon/gun.cpp:99
 #, c-format
 msgid "%s team has won %u gun!"
 msgid_plural "%s team has won %u guns!"
-msgstr[0] "L'équipe %s a gagné %u pistolet !"
-msgstr[1] "L'équipe %s a gagné %u pistolets !"
+msgstr[0] "L'équipe %s a gagné %u Pistolet !"
+msgstr[1] "L'équipe %s a gagné %u Pistolets !"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
-msgstr[0] "Ça plane pour l'équipe %s ! Elle a gagné %u jetpack ! "
-msgstr[1] "Ça plane pour l''équipe %s ! Elle a gagné %u jetpacks !"
+msgstr[0] "Ça plane pour l'équipe %s ! Elle a gagné %u Jetpack ! "
+msgstr[1] "Ça plane pour l''équipe %s ! Elle a gagné %u Jetpacks !"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
-msgstr[0] "L'équipe %s a gagné %u anti-gravitation ! Je suis Neil Armstrong !"
-msgstr[1] "L'équipe %s a gagné %u anti-gravitation ! Je suis Neil Armstrong !"
+msgstr[0] "L'équipe %s a gagné %u Anti-gravité ! Je suis Neil Armstrong !"
+msgstr[1] "L'équipe %s a gagné %u Anti-gravité ! Je suis Neil Armstrong !"
 
 #: src/weapon/mine.cpp:247
 #, c-format
 msgid "%s team has won %u mine!"
 msgid_plural "%s team has won %u mines!"
-msgstr[0] "L'équipe %s a gagné %u mine !"
-msgstr[1] "L'équipe %s a gagné %u mines !"
+msgstr[0] "L'équipe %s a gagné %u Mine !"
+msgstr[1] "L'équipe %s a gagné %u Mines !"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
-msgstr[0] "L'équipe %s a gagné %u parachute !"
-msgstr[1] "L'équipe %s a gagné %u parachutes !"
+msgstr[0] "L'équipe %s a gagné %u Parachute !"
+msgstr[1] "L'équipe %s a gagné %u Parachutes !"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
-msgstr[0] "L'équipe %s a gagné %u moufette ! Sortez les masques à gaz !"
-msgstr[1] "L'équipe %s a gagné %u moufettes ! Sortez les masques à gaz !"
+msgstr[0] "L'équipe %s a gagné %u Putois ! Sortez les masques à gaz !"
+msgstr[1] "L'équipe %s a gagné %u Putois ! Sortez les masques à gaz !"
 
 #: src/weapon/riot_bomb.cpp:133
 #, c-format
 msgid "%s team has won %u riot bomb!"
 msgid_plural "%s team has won %u riot bombs!"
-msgstr[0] "L'équipe %s a gagné %u bombe incendiaire !"
-msgstr[1] "L'équipe %s a gagné %u bombes incendiaires !"
+msgstr[0] "L'équipe %s a gagné %u Bombe Anti-émeutes !"
+msgstr[1] "L'équipe %s a gagné %u Bombes Anti-émeutes !"
 
 #: src/weapon/shotgun.cpp:134
 #, c-format
 msgid "%s team has won %u shotgun!"
 msgid_plural "%s team has won %u shotguns!"
-msgstr[0] "L'équipe %s a gagné %u fusil d'assaut !"
-msgstr[1] "L'équipe %s a gagné %u fusils d'assaut !"
+msgstr[0] "L'équipe %s a gagné %u Fusil à pompe !"
+msgstr[1] "L'équipe %s a gagné %u Fusils à pompe !"
+
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "L'équipe %s a gagné %u Baffe !"
+msgstr[1] "L'équipe %s a gagné %u Baffes !"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
 "%s team has won %u sniper rifles! Aim and shoot between the eyes!"
-msgstr[0] "L'équipe %s a gagné %u fusil à lunette ! Vise entre les yeux !"
-msgstr[1] "L'équipe %s a gagné %u fusils à lunette ! Vise entre les yeux !"
+msgstr[0] "L'équipe %s a gagné %u Fusil à lunette ! Vise entre les yeux !"
+msgstr[1] "L'équipe %s a gagné %u Fusils à lunette ! Vise entre les yeux !"
 
 #: src/weapon/submachine_gun.cpp:144
 #, c-format
 msgid "%s team has won %u submachine gun!"
 msgid_plural "%s team has won %u submachine guns!"
-msgstr[0] "L'équipe %s a gagné %u M16 !"
-msgstr[1] "L'équipe %s a gagné %u M16 !"
+msgstr[0] "L'équipe %s a gagné %u Mitraillette !"
+msgstr[1] "L'équipe %s a gagné %u Mitraillettes !"
 
 #: src/weapon/suicide.cpp:77
 #, c-format
 msgid "%s team has won %u suicide!"
 msgid_plural "%s team has won %u suicides! Use them all for an extra bonus!"
-msgstr[0] "L'équipe %s a gagné %u suicide !"
-msgstr[1] "L'équipe %s a gagné %u suicides !"
+msgstr[0] "L'équipe %s a gagné %u Suicide !"
+msgstr[1] "L'équipe %s a gagné %u Suicides !"
 
 #: src/weapon/syringe.cpp:115
 #, c-format
 msgid "%s team has won %u syringe!"
 msgid_plural "%s team has won %u syringes!"
-msgstr[0] "L'équipe %s a gagné %u seringue !"
-msgstr[1] "L'équipe %s a gagné %u seringues !"
+msgstr[0] "L'équipe %s a gagné %u Seringue !"
+msgstr[1] "L'équipe %s a gagné %u Seringues !"
 
 #: src/weapon/teleportation.cpp:120
 #, c-format
 msgid "%s team has won %u teleportation!"
 msgid_plural "%s team has won %u teleportations!"
-msgstr[0] "L'équipe %s a gagné %u teleportation !"
-msgstr[1] "L'équipe %s a gagné %u teleportations !"
+msgstr[0] "L'équipe %s a gagné %u Téléportation !"
+msgstr[1] "L'équipe %s a gagné %u Téléportations !"
 
 #: src/weapon/skip_turn.cpp:68
 #, c-format
@@ -365,27 +377,36 @@ msgstr[0] ""
 msgstr[1] ""
 "L'équipe %s a gagné %u passages de tour ! Wouw, quel arme sur-puissante !"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] ""
-"L'équipe %s a gagné %u lanceur de Tux ! Depuis quand les pingouins savent "
-"voler ??"
+"L'équipe %s a gagné %u Lance-Tux ! Depuis quand les pingouins savent voler ??"
 msgstr[1] ""
-"L'équipe %s a gagné %u lanceurs de Tux ! Depuis quand les pingouins savent "
+"L'équipe %s a gagné %u Lances-Tux ! Depuis quand les pingouins savent "
 "voler ??"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "L'équipe %s a été décimée."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s a emmené un membre de l'équipe %s dans la tombe avec lui !"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(mort)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(langue du système)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(temps inconnu)"
 
@@ -394,28 +415,40 @@ msgstr "(temps inconnu)"
 msgid "(unlimited)"
 msgstr "(illimitées)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 "Une nouvelle version %s est disponible alors que vous utilisez la version %"
-"s. Vous devriez vérifier si vous n'auriez pas une nouvelle version pour "
-"votre système !"
+"s. Vous devriez vérifier s'il existe une mise à jour diponible pour votre "
+"système !"
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Ajouter une équipe personnalisée"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
-msgstr "Attaque aérienne"
+msgstr "Frappe Aérienne"
 
 #: src/weapon/airhammer.cpp:74
 msgid "Airhammer"
-msgstr "Marteau piqueur"
+msgstr "Marteau-piqueur"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Toutes les équipes"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Toujours"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Et le vainqueur est..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -430,13 +463,13 @@ msgstr ""
 msgid "Anvil"
 msgstr "Enclume"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Auteurs :"
 
 #: src/weapon/auto_bazooka.cpp:220
 msgid "Automatic Bazooka"
-msgstr "Bazooka automatique"
+msgstr "Bazooka Automatique"
 
 #: src/menu/pause_menu.cpp:51
 msgid "Back to battle"
@@ -448,26 +481,35 @@ msgstr "Socket erronée..."
 
 #: src/weapon/baseball.cpp:57
 msgid "Baseball Bat"
-msgstr "Batte de base-ball"
+msgstr "Batte de Baseball"
 
 #: src/weapon/bazooka.cpp:123
 msgid "Bazooka"
 msgstr "Bazooka"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Avant l'action"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Blitz"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Chalumeau"
 
 #: src/weapon/bounce_ball.cpp:89
 msgid "Bounce Ball"
-msgstr "Balle rebondissante"
+msgstr "Balle Rebondissante"
 
 #: src/weapon/supertux.cpp:177
 msgid "Bye bye tux..."
 msgstr "Adieu tux !"
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Impossible de trouver l'équipe %s !"
@@ -477,37 +519,87 @@ msgstr "Impossible de trouver l'équipe %s !"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Impossible d'ouvrir le répertoire personnel des équipes(%s) !"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Impossible d'ouvrir le répertoire des équipes (%s) !"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Impossible d'ouvrir le répertoire des équipes personnalisées (%s) !"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Centre la caméra sur le personnage"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Changer de personnage courant"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Modifier l'angle de visée"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Changer de catégories d'armement"
+
+#: src/menu/help_menu.cpp:79
+#, fuzzy
+msgid "Change weapon countdown"
+msgstr "Modifier le délai avant détonation"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Personnage"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Changement de personnage"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
-msgstr "Vérifier nouvelle version ?"
+msgstr "Vérifier les mises à jour ?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
-msgstr "Choisit aléatoirement parmi les différents terrains"
+msgstr "Choisire aléatoirement parmi les différents terrains"
+
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Classique"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Cliquer : centrer la caméra sur le personnage"
 
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Mode client"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Le plus maladroit"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
-msgstr "Grenade à fragmentation"
+msgstr "Grenade à Fragmentation"
 
 #: src/weapon/cluzooka.cpp:389
 msgid "Cluzooka"
-msgstr "Bazooka à fragmentation"
+msgstr "Bazooka à Fragmentation"
 
 #: src/weapon/suicide.cpp:42
 msgid "Commit Suicide"
 msgstr "Suicide"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Menu de configuration"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Se connecter"
 
@@ -515,11 +607,11 @@ msgstr "Se connecter"
 msgid "Connected !"
 msgstr "Connecté !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Construction"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Contrôlé par :"
 
@@ -528,7 +620,7 @@ msgstr "Contrôlé par :"
 msgid "Couldn't fetch last version from %s"
 msgstr "Impossible de récupérer la version depuis %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Impossible d'ouvrir le fichier %s"
@@ -537,11 +629,32 @@ msgstr "Impossible d'ouvrir le fichier %s"
 msgid "Credits"
 msgstr "Crédits"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Dégâts par tour durant le mode mort subite"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Supprimer l'équipe personnalisée"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Grenade Disco"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Afficher ce message"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Glissez-déplacez : Déplacer la caméra"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Dommages infligés par tour dans le death mode"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Durée d'un tour"
 
@@ -549,24 +662,36 @@ msgstr "Durée d'un tour"
 msgid "Dynamite"
 msgstr "Dynamite"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "FIN DU JEU"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
-msgstr "Volume effets sonores"
+msgstr "Volume des effets sonores"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energie"
+
+#: src/tool/error.cpp:63
+#, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Erreur dans %s:%lu (Wormux %s) : %s"
+
+#: src/include/action_handler.cpp:210
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Erreur dans %s:%lu"
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+"Erreur dans l'initialisation du réseau : le Client %s n'est pas d'accord "
+"avec vous !! - %s"
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Erreur au chargement de l'équipe :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -574,7 +699,22 @@ msgstr ""
 "Erreur lors de la création du répertoire \"%s\" : impossible de sauvegarder "
 "la configuration du jeu."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Erreur lors de la suppression du répertoire \"%s\" : impossible de supprimer "
+"l'équipe personnalisé."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Erreur lors de la suppression du fichier \"%s\" : impossible de supprimer "
+"l'équipe personnalisée."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -584,76 +724,98 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Impossible de se connecter à %s : %s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr ""
-"Impossible de contacter le serveur d'index pour la création d'une partie"
+"Erreur : Impossible de contacter le serveur d'index pour la création d'une "
+"partie"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Impossible de contacter le serveur d'index pour rechercher une partie sur "
 "internet"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Impossible de démarrer le serveur"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Erreur : Votre serveur n'est pas accessible depuis internet. Vérifier les "
-"paramètres de votre firewall."
+"Erreur : Votre serveur n'est pas accessible depuis Internet. Vérifier la "
+"configuration de votre firewall : le port TCP %s doit accepter les "
+"connexions extérieures. Si vous n'êtes pas directement connecté à Internet, "
+"vérifier la configuration de votre routeur : le port TCP %s doit être "
+"redirigé vers votre ordinateur."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Erreur : impossible de trouver le skin \"%s\" pour l'équipe \"%s\"."
 
 #: src/weapon/flamethrower.cpp:134
 msgid "Flame Thrower"
-msgstr "Lance-flammes"
+msgstr "Lance-Flammes"
 
 #: src/weapon/footbomb.cpp:158
 msgid "Football Bomb"
-msgstr "Ballon explosif"
+msgstr "Ballon Explosif"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Plein écran / Mode fenêtré"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Plein écran ?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Partie"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Mode de jeu"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Nom de la partie :"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
-msgstr "Lance Gnu"
+msgstr "Lance-Gnu"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
-msgstr "Graphisme"
+msgstr "Graphismes"
 
 #: src/weapon/grapple.cpp:166
 msgid "Grapple"
 msgstr "Grappin"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Gravité"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Grenade"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Initialisation du terrain..."
 
@@ -661,16 +823,16 @@ msgstr "Initialisation du terrain..."
 msgid "Gun"
 msgstr "Pistolet"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Répertoire HOME (variable d'environnement $HOME) introuvable !"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Bonne partie !"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Commandant"
 
@@ -683,9 +845,13 @@ msgstr "Commandant : "
 msgid "Help"
 msgstr "Aide"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Saut en hauteur"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
-msgstr "Créer une partie"
+msgstr "Héberger une partie"
 
 #: src/weapon/blowtorch.cpp:63
 msgid ""
@@ -725,7 +891,11 @@ msgstr ""
 "Usage : clic gauche sur la cible\n"
 "une munition par tour"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Dépêchez-vous, vous êtes trop lents !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -733,7 +903,8 @@ msgstr ""
 "Si vous trouvez un bug ou si vous pensez qu'il manque quelque chose à "
 "Wormux, envoyez un mail (en anglais, svp) :"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Énergie initiale"
 
@@ -748,7 +919,7 @@ msgstr ""
 "Tirer : garder la touche espace enfoncée jusqu'à la puissance désirée\n"
 "une munition par tour"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Initialisation"
 
@@ -756,32 +927,44 @@ msgstr "Initialisation"
 msgid "Initialise map"
 msgstr "Initialisation des données"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Initialisation des sons"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Initialisation des équipes"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "C'est un cadeau !"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 "Venez sur #wormux-fr sur irc.freenode.net pour trouver des adversaires."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Saut"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Saut en arrière"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Expulse les joueurs désignés par <nickname>."
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Langue"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Chargement des terrains :"
 
@@ -789,24 +972,23 @@ msgstr "Chargement des terrains :"
 msgid "Load teams:"
 msgstr "Chargement des équipes :"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Équipes locales :"
 
 #: src/weapon/lowgrav.cpp:49
 msgid "LowGrav"
-msgstr "Anti-gravité"
+msgstr "Anti-Gravité"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "Connection manuelle"
 
-#: src/menu/game_menu.cpp:84
-#, fuzzy
+#: src/menu/game_menu.cpp:78
 msgid "Map"
-msgstr "Terrains"
+msgstr "Terrain"
 
 #: src/map/map.cpp:294
 #, c-format
@@ -817,52 +999,59 @@ msgstr "Terrain %s, une création de :"
 msgid "Maps"
 msgstr "Terrains"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Énergie maximale"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Nombre de joueurs max. :"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
-msgstr "Nbr. max. d'images/sec"
+msgstr "Nbr. max. d'img/s"
 
 #: src/weapon/mine.cpp:213
 msgid "Mine"
 msgstr "Mine"
 
-#: src/menu/options_menu.cpp:133
-#, fuzzy
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
-msgstr "Musique ?"
+msgstr "Divers"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
-msgstr "Le plus doué"
+msgstr "Le plus précis"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Le plus maladroit"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Le plus traître"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Le plus utile"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Le plus inutile"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Le plus violent"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Déplacez la caméra avec la souris ou avec les flèches"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Déplacer le personnge"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
-msgstr "Volume musique"
+msgstr "Volume de la musique"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Musique ?"
 
@@ -870,187 +1059,251 @@ msgstr "Musique ?"
 msgid "Network Game"
 msgstr "Jeu en réseau"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Initialisation du réseau"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Jamais"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
-msgstr "Nouvelle partie à "
+msgstr "Nouvelle partie en réseau à "
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+#, fuzzy
+msgid "New player warning?"
+msgstr "Avertissement de nouveau joueur ?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr ""
 "Aucun élément <%s> n'a été trouvé dans le fichier de configuration XML !"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Personne !"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
-msgstr "Nombre de joueurs par équipe"
+msgstr "Nombre de personnages par équipe"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Nombre d'équipes :"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "Sur un personnage : change le personnage actif"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "Sur la carte : choisir une cible"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Options"
 
 #: src/menu/pause_menu.cpp:55
 msgid "Options menu"
-msgstr "Menu d'options"
+msgstr "Menu Options"
 
 #: src/weapon/parachute.cpp:68
 msgid "Parachute"
 msgstr "Parachute"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Le parachute est activé automatiquement."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
-msgstr "Mot de passe:"
+msgstr "Mot de passe :"
+
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pause"
 
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Jouer"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Jouer plusieurs fois"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Joueur"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Énergie des joueurs ?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Nom du joueur"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Nom des joueurs ?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
-msgstr "Lance putois"
+msgstr "Lance-Putois"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port :"
 
-#: src/menu/network_connection_menu.cpp:155
-#, fuzzy
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
-msgstr "Quitter la partie"
+msgstr "Batailles Publiques"
 
 #: src/menu/main_menu.cpp:75
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
-msgstr "Quitte Wormux"
+msgstr "Quitter Wormux"
 
 #: src/menu/pause_menu.cpp:63
 msgid "Quit battle"
+msgstr "Quitter la bataille"
+
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
 msgstr "Quitter la partie"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Terrain aléatoire"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Lecture du fichier de configuration par défaut"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Lecture du fichier de configuration personnel"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Résolution"
 
 #: src/weapon/riot_bomb.cpp:120
 msgid "Riot Bomb"
-msgstr "Bombe anti-émeute"
+msgstr "Bombe Anti-émeute"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
-msgstr "Lancement du jeu"
+msgstr "Lancer le jeu"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Dire : "
 
-#: src/menu/options_menu.cpp:84
-#, fuzzy
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
-msgstr "Défilement sur les bords"
+msgstr "Importance du défilement"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Défilement sur les bords"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Adresse du serveur :"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
-msgstr "Serveur disponible sur internet"
+msgstr "Serveur disponible sur Internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Mode serveur"
 
 #: src/weapon/shotgun.cpp:91
 msgid "Shotgun"
-msgstr "Fusil à pompe"
+msgstr "Fusil à Pompe"
+
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Afficher le menu d'armement"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Afficher/Masque l'interface"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Afficher/Masquer la mini-carte"
 
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Passer son tour"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Baffe"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Baffez l'ennemi pour le faire un peu décoller."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Angle de visé et déplacement plus précis"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
-msgstr "Fusil sniper"
+msgstr "Fusil à lunette"
 
 #: src/object/bonus_box.cpp:86
 msgid "Someone put a booby trap into the crate!"
 msgstr "Quelqu'un a placé un piège dans cette boîte !"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Désolé, il n'y a actuellement aucun jeu en attente de joueurs"
 
-#: src/menu/options_menu.cpp:178
-#, fuzzy
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Désolé, votre version du jeu n'est plus supporté. Les versions supportés "
+"sont les versions %s. Vous pouvez télécharger une version à jour sur http://"
+"www.wormux.org/wiki/download.php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
-msgstr "Options sonores"
+msgstr "Son"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Effets sonores ?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Fréquence d'échantillonage"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
-msgstr "Options sonores"
+msgstr "Sons"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Lancement d'une nouvelle partie"
 
@@ -1070,20 +1323,27 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Seringue"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
 #, fuzzy
+msgid "Talk in network battle"
+msgstr "Parler dans la bataille en réseau"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
-msgstr "Équipes"
+msgstr "Graphes des équipes"
 
-#: src/menu/results_menu.cpp:378
-#, fuzzy
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
-msgstr "Équipes"
+msgstr "Statistiques des équipes"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Équipes"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Éditeur d'équipe"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Téléportation"
@@ -1091,27 +1351,36 @@ msgstr "Téléportation"
 #: src/weapon/cluster_bomb.cpp:146
 msgid "The Cluster Bomb has left the battlefield before it could explode."
 msgstr ""
-"La grenade à fragmentation a quitté le champ de bataille avant d'exploser."
+"La Grenade à Fragmentation a quitté le champ de bataille avant d'exploser."
 
 #: src/weapon/footbomb.cpp:111
 msgid "The Football Bomb has left the battlefield before it could explode."
-msgstr "La ballon explosif a quitté le champ de bataille avant d'exploser."
+msgstr "La Ballon Explosif a quitté le champ de bataille avant d'exploser."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Le Gnu a déserté le champ de bataille avant d'exploser."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
-msgstr "Le putois a déserté le champ de bataille avant d'exploser."
+msgstr "Le Putois a déserté le champ de bataille avant d'exploser."
 
 #: src/weapon/auto_bazooka.cpp:175
 msgid "The automatic rocket has left the battlefield..."
-msgstr "La roquette automatique est partie dans un autre monde..."
+msgstr "La Roquette Automatique est partie dans un autre monde..."
 
 #: src/weapon/bounce_ball.cpp:72
 msgid "The ball left the battlefield before exploding"
-msgstr "La balle rebondissante a quitté le champ de bataille avant d'exploser."
+msgstr "La Balle a quitté le champ de bataille avant d'exploser."
+
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Les versions client et serveur sont incompatibles (local=%s, serveur=%s). "
+"Essayez un autre serveur SVP."
 
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
@@ -1119,24 +1388,24 @@ msgstr "La connexion a expiré. Vérifiez qu'il n'y a pas de firewall !"
 
 #: src/weapon/disco_grenade.cpp:127
 msgid "The disco grenade has left the dance floor before exploding"
-msgstr "La grenade disco a quitté la piste de danse avant d'exploser."
+msgstr "La Grenade Disco a quitté la piste de danse avant d'exploser."
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "La partie s'est terminée en raison d'une déconnexion."
 
 #: src/weapon/grenade.cpp:58
 msgid "The grenade left the battlefield before exploding"
-msgstr "La grenade a quitté le champ de bataille avant d'exploser."
+msgstr "La Grenade a quitté le champ de bataille avant d'exploser."
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
-msgstr "Les autres t'attendent ! Réveille-toi :-)"
+msgstr "Les autres t'attendent! Réveille-toi :-)"
 
 #: src/weapon/bazooka.cpp:83 src/weapon/cluzooka.cpp:336
 #: src/weapon/riot_bomb.cpp:86
 msgid "The rocket has left the battlefield..."
-msgstr "La roquette est partie dans un autre monde..."
+msgstr "La Roquette est partie dans un autre monde..."
 
 #: src/network/net_error_msg.cpp:45
 msgid "The server rejected the connection."
@@ -1144,23 +1413,28 @@ msgstr "Le serveur a rejeté la connexion."
 
 #: src/network/net_error_msg.cpp:51
 msgid "The server rejected the connection: wrong password!"
-msgstr "Le serveur a rejeté la connexion : mauvais mot de passe"
+msgstr "Le serveur a rejeté la connexion : mauvais mot de passe!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
-msgstr[0] "Il n'y a que %i équipe."
+msgstr[0] "Il n'y a qu' %i équipe."
 msgstr[1] "Il n'y a que %i équipes."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Temps"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
-"Échéance : molette ou Page Suiv./Préc.\n"
+"Échéance : Molette ou Page Suiv./Préc.\n"
 "Angle : Haut/Bas\n"
 "Tirer : garder la touche espace enfoncée jusqu'à la puissance désirée\n"
 "une munition par tour"
@@ -1172,12 +1446,12 @@ msgid ""
 "Fire : space key\n"
 "an ammo per turn"
 msgstr ""
-"Échéance : molette ou Page Suiv./Préc.\n"
+"Échéance : Molette ou Page Suiv./Préc.\n"
 "Angle : Haut/Bas\n"
 "Tirer : espace\n"
 "une munition par tour"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Outils"
 
@@ -1185,12 +1459,12 @@ msgstr "Outils"
 msgid "Unable to contact host."
 msgstr "Impossible de contacter le serveur."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Impossible d'ouvrir le répertoire des terrains (%s) !"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Impossible d'ouvrir le répertoire personnel des terrains (%s) !"
@@ -1199,83 +1473,107 @@ msgstr "Impossible d'ouvrir le répertoire personnel des terrains (%s) !"
 msgid "Unable to use this port!"
 msgstr "Impossible d'utiliser ce port !"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Commande inconnue"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Illimité"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Anonyme"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Version"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "La vérification de la version a échoué : %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Attendez ! %i joueur n'est pas encore prêt !"
 msgstr[1] "Attendez ! %i joueurs ne sont pas encore prêts !"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
-msgstr "Attente du serveur, vous pouvez annuler ou discuter !"
+msgstr "Attente du serveur, vous pouvez seulement annuler ou discuter !"
+
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Arme : Tirer / Boite de bonus : Chute rapide"
 
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Armes"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Site web : "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Trop la honte pour %s : il a été tué par un simple pistolet !"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
-msgstr "Particules de vent ?"
+msgstr "Particules du vent ?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Vainqueur"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Lancement de Wormux..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
-msgstr "Wormux version "
+msgstr "version de Wormux"
+
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "CRC terrain erroné !"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Nom du terrain erroné !"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Equipe erronée !"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "T'es tout seul :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Vous voulez vraiment jouer tout seul ?!"
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Il faut au minimum un terrain valide !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Il faut au minimum deux équipes valides !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Vous ne pourrez jouer sans sélectionner d'équipe !"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Tir dans le vide..."
 
@@ -1283,7 +1581,7 @@ msgstr "Tir dans le vide..."
 msgid "aka"
 msgstr "alias"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1293,15 +1591,20 @@ msgstr ""
 "Attaque : clic gauche sur la cible\n"
 "un bombardement par tour"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "fichier de configuration non chargé"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "Joueur personnalisé"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "terminé"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "Erreur lors de la lecture du fichier de configuration"
 
@@ -1309,15 +1612,15 @@ msgstr "Erreur lors de la lecture du fichier de configuration"
 msgid "from"
 msgstr "de"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "pas de fichier de configuration !"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Chargement de la musique"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Chargement du profil son : %s"
@@ -1326,3 +1629,25 @@ msgstr "o Chargement du profil son : %s"
 #, c-format
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Démarrage du son à %d Hz %d bit"
+
+#, fuzzy
+#~ msgid "Automatically join a game"
+#~ msgstr "Joindre automatiquement une partie (si possible)."
+
+#, fuzzy
+#~ msgid ""
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
+#~ msgstr ""
+#~ "Pas de serveur public sans mot de passe et paramètres de connexion "
+#~ "manuelles incorrects. Veuillez essayer en connexion manuelle."
+
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Erreur : Votre serveur n'est pas accessible depuis internet. Vérifier les "
+#~ "paramètres de votre firewall."
+
+#~ msgid "Warn when a new player joins?"
+#~ msgstr "Prévenir lorsqu'un nouveau joueur arrive?"
diff --git a/po/gl.po b/po/gl.po
index 4386e3a..00ea47a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,88 +1,99 @@
-# tradución de Wormux. gl.po ao Galego
-# translation of gl.po to Galego
+# Tradución do Wormux ao Galego
+# Wormux Galician translation
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Ignacio Casal Quinteiro <icq at cvs.gnome.org>, 2007.
-# Adrián Chaves <adriyetichaves at gmail.com>, 2008.
+# Adrián Chaves <adriyetichaves at gmail.com>, 2008. (Proxecto Trasno <proxecto at trasno.net>)
 msgid ""
 msgstr ""
 "Project-Id-Version: Wormux. gl\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-03-24 12:19+0100\n"
-"Last-Translator: Adrián Chaves <adriyetichaves at gmail.com>\n"
-"Language-Team: Galego <gl at li.org>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-03 17:13+0100\n"
+"Last-Translator: Adrián Chaves Fernández <adriyetichaves at gmail.com>\n"
+"Language-Team: Galician <gl at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.11.4\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Poedit-Language: Galician\n"
+"X-Poedit-Country: SPAIN\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Non se atopou o mapa %s :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i xogador conectado"
 msgstr[1] "%i xogadores conectados"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i xogador preparado"
 msgstr[1] "%i xogadores preparados"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) morreu."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
-msgstr "%s <%s> tamén coñecido como %s de %s"
+msgstr "%s <%s> tamén coñecido coma %s de %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> de %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Equipo %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Equipo %s - remoto"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s suicidouse!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s, do equipo %s, suicidouse!"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "%s, do equipo %s, morreu."
+
+#: src/game/game.cpp:709
+#, c-format
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s, do equipo %s, caeu na auga!"
+
+#: src/game/game.cpp:703
+#, c-format
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s, do equipo %s, caeu fóra do mapa!"
+
+#: src/game/game.cpp:724
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s caeu na auga."
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s, do equipo %s, esnafrouse contra o chan!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:731
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s caeu fóra do mapa!"
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s, do equipo %s, morreu por parvo!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -91,15 +102,10 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s gañou %u punto de enerxía!"
 msgstr[1] "%s gañou %u puntos de enerxía!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
-msgstr "%s é un psicópata, matou a un membro do equipo %s!"
-
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s morreu porque é parvo!"
+msgstr "%s é un psicópata, asasinou a un membro do equipo %s!"
 
 #: src/weapon/mine.cpp:121
 #, c-format
@@ -124,22 +130,22 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "O equipo %s gañou %u bazuca de fragmentación!"
 msgstr[1] "O equipo %s gañou %u bazucas de fragmentación!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "O equipo %s gañou %u GÑU! Dálles duro, vaqueiro!"
 msgstr[1] "O equipo %s gañou %u GÑUs! Dálles duro, vaqueiro!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "O equipo %s gañou %u ataque aéreo!"
 msgstr[1] "O equipo %s gañou %u ataques aéreos!"
 
-#: src/weapon/airhammer.cpp:174
-#, fuzzy, c-format
+#: src/weapon/airhammer.cpp:172
+#, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
 "your neighbours."
@@ -147,270 +153,284 @@ msgid_plural ""
 "%s team has won %u airhammers! Don't make too much noise with them! Thanks, "
 "your neighbours."
 msgstr[0] ""
-"O equipo %s gañou %u taladradora! Non fagas tanto ruído con iso! Grazas, os "
-"teus veciños.O equipo %s gañou %u taladradoras! Non fagas tanto ruído con "
-"iso! Grazas, os teus veciños."
+"O equipo %s gañou %u taladradora! Non fagas moito ruído con iso! Grazas, os "
+"teus veciños."
 msgstr[1] ""
-"O equipo %s gañou %u taladradora! Non fagas tanto ruído con iso! Grazas, os "
-"teus veciños.O equipo %s gañou %u taladradoras! Non fagas tanto ruído con "
-"iso! Grazas, os teus veciños."
+"O equipo %s gañou %u taladradoras! Non fagas tanto ruído con iso! Grazas, os "
+"teus veciños."
 
-#: src/weapon/anvil.cpp:188
-#, fuzzy, c-format
+#: src/weapon/anvil.cpp:189
+#, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
 msgstr[0] "O equipo %s gañou %u bicorna! Aplástaos a todos!"
-msgstr[1] "O equipo %s gañou %u bicorna! Aplástaos a todos!"
+msgstr[1] "O equipo %s gañou %u bicornas! Aplástaos a todos!"
 
 #: src/weapon/auto_bazooka.cpp:329
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u automatic bazooka!"
 msgid_plural "%s team has won %u automatic bazookas!"
 msgstr[0] "O equipo %s gañou %u bazuca automático!"
-msgstr[1] "O equipo %s gañou %u bazuca automático!"
+msgstr[1] "O equipo %s gañou %u bazucas automáticos!"
 
 #: src/weapon/baseball.cpp:116
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u baseball bat!"
 msgid_plural "%s team has won %u baseball bats!"
 msgstr[0] "O equipo %s gañou %u bate de béisbol!"
-msgstr[1] "O equipo %s gañou %u bate de béisbol!"
+msgstr[1] "O equipo %s gañou %u bates de béisbol!"
 
 #: src/weapon/bazooka.cpp:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u bazooka!"
 msgid_plural "%s team has won %u bazookas!"
 msgstr[0] "O equipo %s gañou %u bazuca!"
-msgstr[1] "O equipo %s gañou %u bazuca!"
+msgstr[1] "O equipo %s gañou %u bazucas!"
 
 #: src/weapon/blowtorch.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s team has won %u blowtorch! If you're under 18, ask your parents to use it."
 msgid_plural ""
 "%s team has won %u blowtorchs! If you're under 18, ask your parents to use "
 "it."
 msgstr[0] ""
-"O equipo %s gañou %u soplete! Se es menor de idade, pídelle permiso a teus "
-"pais antes de usalo.O equipo %s gañou %u sopletes! Se es menor de idade, "
-"pídelle permiso a teus pais antes de usalo."
+"O equipo %s gañou %u soplete! Se es menor de idade, pídelle permiso aos teus "
+"pais."
 msgstr[1] ""
-"O equipo %s gañou %u soplete! Se es menor de idade, pídelle permiso a teus "
-"pais antes de usalo.O equipo %s gañou %u sopletes! Se es menor de idade, "
-"pídelle permiso a teus pais antes de usalo."
+"O equipo %s gañou %u sopletes! Se es menor de idade, pídelle permiso aos "
+"teus pais."
 
 #: src/weapon/bounce_ball.cpp:113
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u bounce ball! Boing!"
 msgid_plural "%s team has won %u bounce balls! Boing!"
 msgstr[0] "O equipo %s gañou %u unha saltariña! A botar!"
-msgstr[1] "O equipo %s gañou %u unha saltariña! A botar!"
+msgstr[1] "O equipo %s gañou %u saltariñas! A botar!"
 
 #: src/weapon/cluster_bomb.cpp:206
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u cluster bomb!"
 msgid_plural "%s team has won %u cluster bombs!"
-msgstr[0] "O equipo %s gañou %u bomba de fragmentación"
-msgstr[1] "O equipo %s gañou %u bomba de fragmentación"
+msgstr[0] "O equipo %s gañou %u bomba de fragmentación!"
+msgstr[1] "O equipo %s gañou %u bombas de fragmentación!"
 
-#: src/weapon/construct.cpp:81
-#, fuzzy, c-format
+#: src/weapon/construct.cpp:82
+#, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
 msgstr[0] "O equipo %s gañou %u kit de construción! Non esquezas o casco."
-msgstr[1] "O equipo %s gañou %u kit de construción! Non esquezas o casco."
+msgstr[1] "O equipo %s gañou %u kits de construción! Non esquezas o casco."
 
 #: src/weapon/disco_grenade.cpp:170
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u disco grenade! Shake your body when throwing it!"
 msgid_plural ""
 "%s team has won %u disco grenades! Shake your body when throwing them!"
-msgstr[0] ""
-"O equipo %s gañou %u aleluia! Move o corpo ao tirala!O equipo %s gañou %u "
-"aleluias! Move o corpo ao tiralas!"
-msgstr[1] ""
-"O equipo %s gañou %u aleluia! Move o corpo ao tirala!O equipo %s gañou %u "
-"aleluias! Move o corpo ao tiralas!"
+msgstr[0] "O equipo %s gañou %u aleluia! Move o corpo ao tirala!"
+msgstr[1] "O equipo %s gañou %u aleluias! Move o corpo ao tiralas!"
 
 #: src/weapon/dynamite.cpp:145
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u dynamite!"
 msgid_plural "%s team has won %u dynamites!"
 msgstr[0] "O equipo %s gañou %u dinamita!"
-msgstr[1] "O equipo %s gañou %u dinamita!"
+msgstr[1] "O equipo %s gañou %u cartuchos de dinamita!"
 
 #: src/weapon/flamethrower.cpp:178
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u flame-thrower!"
 msgid_plural "%s team has won %u flame-throwers!"
 msgstr[0] "O equipo %s gañou %u lanzachamas!"
 msgstr[1] "O equipo %s gañou %u lanzachamas!"
 
 #: src/weapon/footbomb.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "O equipo %s gañou %u bomba de rugbi!"
-msgstr[1] "O equipo %s gañou %u bomba de rugbi!"
+msgstr[1] "O equipo %s gañou %u bombas de rugbi!"
 
-#: src/weapon/grapple.cpp:783
-#, fuzzy, c-format
+#: src/weapon/grapple.cpp:809
+#, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
 msgstr[0] "O equipo %s gañou %u gancho!"
-msgstr[1] "O equipo %s gañou %u gancho!"
+msgstr[1] "O equipo %s gañou %u ganchos!"
 
 #: src/weapon/grenade.cpp:90
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u grenade!"
 msgid_plural "%s team has won %u grenades!"
 msgstr[0] "O equipo %s gañou %u granada!"
-msgstr[1] "O equipo %s gañou %u granada!"
+msgstr[1] "O equipo %s gañou %u granadas!"
 
 #: src/weapon/gun.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u gun!"
 msgid_plural "%s team has won %u guns!"
 msgstr[0] "O equipo %s gañou %u pistola!"
-msgstr[1] "O equipo %s gañou %u pistola!"
+msgstr[1] "O equipo %s gañou %u pistolas!"
 
-#: src/weapon/jetpack.cpp:239
-#, fuzzy, c-format
+#: src/weapon/jetpack.cpp:247
+#, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "O equipo %s gañou %u jetpack! E a voar!"
-msgstr[1] "O equipo %s gañou %u jetpack! E a voar!"
+msgstr[1] "O equipo %s gañou %u jetpacks! E a voar!"
 
-#: src/weapon/lowgrav.cpp:78
-#, fuzzy, c-format
+#: src/weapon/lowgrav.cpp:79
+#, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
 msgstr[0] ""
 "O equipo %s gañou %u casco antigravidade! Un pequeno paso para o home, un "
 "gran paso para o software libre."
 msgstr[1] ""
-"O equipo %s gañou %u casco antigravidade! Un pequeno paso para o home, un "
+"O equipo %s gañou %u cascos antigravidade! Un pequeno paso para o home, un "
 "gran paso para o software libre."
 
 #: src/weapon/mine.cpp:247
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u mine!"
 msgid_plural "%s team has won %u mines!"
 msgstr[0] "O equipo %s gañou %u mina!"
-msgstr[1] "O equipo %s gañou %u mina!"
+msgstr[1] "O equipo %s gañou %u minas!"
 
-#: src/weapon/parachute.cpp:165
-#, fuzzy, c-format
+#: src/weapon/parachute.cpp:166
+#, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "O equipo %s gañou %u paracaídas!"
 msgstr[1] "O equipo %s gañou %u paracaídas!"
 
-#: src/weapon/polecat.cpp:179
-#, fuzzy, c-format
+#: src/weapon/polecat.cpp:181
+#, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
 msgstr[0] "O equipo %s gañou %u mofeta! Porías a máscara de gas, non si?"
-msgstr[1] "O equipo %s gañou %u mofeta! Porías a máscara de gas, non si?"
+msgstr[1] "O equipo %s gañou %u mofetas! Porías a máscara de gas, non si?"
 
 #: src/weapon/riot_bomb.cpp:133
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u riot bomb!"
 msgid_plural "%s team has won %u riot bombs!"
-msgstr[0] "O equipo %s gañou %u bomba antimateria!"
-msgstr[1] "O equipo %s gañou %u bomba antimateria!"
+msgstr[0] ""
+"O equipo %s gañou %u bomba antimateria! Que espelidos son estes científicos "
+"do software libre!"
+msgstr[1] ""
+"O equipo %s gañou %u bombas antimateria! Que espelidos son estes científicos "
+"do software libre!"
 
 #: src/weapon/shotgun.cpp:134
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u shotgun!"
 msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "O equipo %s gañou %u escopeta!"
-msgstr[1] "O equipo %s gañou %u escopeta!"
+msgstr[1] "O equipo %s gañou %u escopetas!"
+
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "O equipo %s gañou %u labazada!"
+msgstr[1] "O equipo %s gañou %u labazadas! Esquiva isto!"
 
-#: src/weapon/snipe_rifle.cpp:246
-#, fuzzy, c-format
+#: src/weapon/snipe_rifle.cpp:247
+#, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
 "%s team has won %u sniper rifles! Aim and shoot between the eyes!"
 msgstr[0] ""
 "O equipo %s gañou %u rifle francotirador! Procura acertarlles entre os ollos!"
-"O equipo %s gañou %u rifles francotirador! Procura acertarlles entre os "
-"ollos!"
 msgstr[1] ""
-"O equipo %s gañou %u rifle francotirador! Procura acertarlles entre os ollos!"
 "O equipo %s gañou %u rifles francotirador! Procura acertarlles entre os "
 "ollos!"
 
 #: src/weapon/submachine_gun.cpp:144
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u submachine gun!"
 msgid_plural "%s team has won %u submachine guns!"
 msgstr[0] "O equipo %s gañou %u metralleta!"
-msgstr[1] "O equipo %s gañou %u metralleta!"
+msgstr[1] "O equipo %s gañou %u metralletas!"
 
 #: src/weapon/suicide.cpp:77
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u suicide!"
 msgid_plural "%s team has won %u suicides! Use them all for an extra bonus!"
 msgstr[0] "O equipo %s gañou %u suicidio!"
-msgstr[1] "O equipo %s gañou %u suicidio!"
+msgstr[1] "O equipo %s gañou %u suicidios! Úsaos todos para un bonus extra!"
 
 #: src/weapon/syringe.cpp:115
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u syringe!"
 msgid_plural "%s team has won %u syringes!"
 msgstr[0] "O equipo %s gañou %u xeringa!"
-msgstr[1] "O equipo %s gañou %u xeringa!"
+msgstr[1] "O equipo %s gañou %u xeringas!"
 
 #: src/weapon/teleportation.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u teleportation!"
 msgid_plural "%s team has won %u teleportations!"
 msgstr[0] "O equipo %s gañou %u teleporte!"
-msgstr[1] "O equipo %s gañou %u teleporte!"
+msgstr[1] "O equipo %s gañou %u teleportes!"
 
 #: src/weapon/skip_turn.cpp:68
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u turn skip! I know you'll love it."
 msgid_plural "%s team has won %u turn skips! I know you'll love them."
-msgstr[0] "O equipo %s gañou %u salto de turno! Sei que che vai gustar."
-msgstr[1] "O equipo %s gañou %u salto de turno! Sei que che vai gustar."
+msgstr[0] "O equipo %s gañou %u salto de turno! Gustarache, xa verás."
+msgstr[1] "O equipo %s gañou %u saltos de turno! Gustaranche, xa verás."
 
-#: src/weapon/supertux.cpp:313
-#, fuzzy, c-format
+#: src/weapon/supertux.cpp:316
+#, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
-msgstr[0] "O equipo %s gañou %u SuperTux! Nunca antes viras voar un pingüín?"
+msgstr[0] "O equipo %s gañou %u Super Tux! Nunca antes viras voar un pingüín?"
 msgstr[1] "O equipo %s gañou %u SuperTux! Nunca antes viras voar un pingüín?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "O equipo %s foi derrotado."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s levouse consigo a un membro do equipo %s á outra vida!"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(morto)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(lingua do sistema)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(tempo descoñecido)"
 
 #. Display number of ammo
 #: src/interface/interface.cpp:196
 msgid "(unlimited)"
-msgstr "(ilimitado)"
+msgstr "(ilimitada)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
-"Está dispoñible a versión %s, mentres que a súa é a %s.Ao mellor interésate "
-"ver se hai dispoñible unha actualización para o teu SO!"
+"Está dispoñible a versión %s, mentres que a súa é a %s. Ao mellor "
+"interésalle ver se hai dispoñible unha actualización para o seu SO!"
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Engadir equipo personalizado"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Ataque aéreo"
 
@@ -418,10 +438,18 @@ msgstr "Ataque aéreo"
 msgid "Airhammer"
 msgstr "Taladradora"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Todos os equipos"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Sempre"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "E o gañador é..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -436,7 +464,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Bicorna"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autores:"
 
@@ -460,6 +488,14 @@ msgstr "Bate de béisbol"
 msgid "Bazooka"
 msgstr "Bazuca"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Antes da acción"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Ataque aéreo"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Soplete"
@@ -472,8 +508,9 @@ msgstr "Saltariña"
 msgid "Bye bye tux..."
 msgstr "Deica outra, Tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Non se pode atopar o equipo %s!"
@@ -483,24 +520,69 @@ msgstr "Non se pode atopar o equipo %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Non se pode abrir o directorio de equipos personalizados (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Non se pode abrir o directorio de equipos (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Non se pode abrir o directorio de equipos personalizados (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Centrar a cámara na personaxe"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Cambiar a personaxe activa"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Cambiar o ángulo de tiro"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Cambiar a categoría da arma"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Cambiar a conta atrás da arma"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Personaxe"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Cambio de personaxe"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Buscar actualizacións en liña?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
-msgstr "Elixir un mapa ao chou"
+msgstr "Elixir un dos mapas ao chou"
+
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Clásico"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Clic: centrar a cámara na personaxe"
 
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Modo cliente"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "O máis patoso"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Bomba de fragmentación"
@@ -511,30 +593,34 @@ msgstr "Bazuca de fragmentación"
 
 #: src/weapon/suicide.cpp:42
 msgid "Commit Suicide"
-msgstr "Suicidio"
+msgstr "Suicidarse"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Menú de configuración"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Conectar a unha partida"
 
 #: src/network/net_error_msg.cpp:33
 msgid "Connected !"
-msgstr "Conectado !"
+msgstr "Conectado!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Construción"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
-msgstr "Controlado por:"
+msgstr "Ás ordes de:"
 
 #: src/network/download.cpp:81
 #, c-format
 msgid "Couldn't fetch last version from %s"
 msgstr "Non se puido obter a última versión de %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Non se puido abrir o ficheiro %s"
@@ -543,11 +629,32 @@ msgstr "Non se puido abrir o ficheiro %s"
 msgid "Credits"
 msgstr "Créditos"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Daño por turno durante o modo morte"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Eliminar o equipo actual"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Aleluia"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Amosa esta mensaxe"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Arrastrar e soltar: move a cámara"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Duración antes do modo morte"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Duración dun turno"
 
@@ -555,24 +662,35 @@ msgstr "Duración dun turno"
 msgid "Dynamite"
 msgstr "Dinamita"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "FIN DA PARTIDA"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
-msgstr ""
+msgstr "Volume dos efectos"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Enerxía"
+
+#: src/tool/error.cpp:63
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Erro en %s:%lu"
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Erro en %s:%lu (Wormux %s) : %s"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+"Erro ao inicializar a rede: O cliente %s non está dacordo contigo!! - %s"
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Erro ao cargar o equipo :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -580,7 +698,22 @@ msgstr ""
 "Erro ao crear o directorio \"%s\": imposible almacenar o ficheiro de "
 "configuración."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Erro ao eliminar o directorio \"%s\". Non se puido eliminar o equipo "
+"personalizado."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Erro ao eliminar o ficheiro \"%s\". Non se puido eliminar o equipo "
+"personalizado."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -590,35 +723,42 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Erro: Non se pode conectar a %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
 msgstr ""
-"Erro: Non se pode contactar con servidor índice para aloxar unha partida"
+"Erro: Non se pode contactar co servidor índice para aloxar unha partida"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
-"Erro: Non se pode contactar con servidor índice para buscar unha partida na "
+"Erro: Non se pode contactar co servidor índice para buscar unha partida na "
 "rede"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
-msgstr "Erro:Non se pode iniciar o servidor"
+msgstr "Erro: Non se pode iniciar o servidor"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Erro: O teu servidor non é accesible desde a rede. Comproba a configuración "
-"do teu firewall"
+"Erro: o teu servidor non é accesible dende a Internet. Comproba a "
+"configuración do teu firewall: o porto TCP %s ten que aceptar conexións "
+"externas. Se non estás conectado directamente á Internet, bótalle unha "
+"ollada á configuración do teu router: o porto TCP %s ten que estarlle "
+"permitido á túa computadora."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Erro: non se pode atopar o individuo \"%s\" para o equipo \"%s\"."
@@ -631,35 +771,47 @@ msgstr "Lanzachamas"
 msgid "Football Bomb"
 msgstr "Bomba de rugbi"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Pantalla completa / Fiestra"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Pantalla completa?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
-msgstr ""
+msgstr "Xogo"
+
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Modo de xogo"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Nome da partida:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "GÑU"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
-msgstr ""
+msgstr "Gráficos"
 
 #: src/weapon/grapple.cpp:166
 msgid "Grapple"
 msgstr "Gancho"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Gravidade"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granada"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inicialización do escenario..."
 
@@ -667,16 +819,16 @@ msgstr "Inicialización do escenario..."
 msgid "Gun"
 msgstr "Pistola"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
-msgstr "Non puido atoparse o directorio HOME (a variable de contorno $HOME)."
+msgstr "Non puido atoparse o directorio HOME (a variable de contorno $HOME)!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
-msgstr "Que teñas unha boa partida!"
+msgstr "Que aproveite a partida!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Capitán"
 
@@ -689,7 +841,11 @@ msgstr "Capitán: "
 msgid "Help"
 msgstr "Axuda"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Saltar alto"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Aloxar unha partida"
 
@@ -731,7 +887,11 @@ msgstr ""
 "Modo de uso: clic dereito no obxectivo\n"
 "Un uso por turno"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Veña oh! Que é para hoxe!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -739,7 +899,8 @@ msgstr ""
 "Se atopas un erro ou tes en mente algunha mellora ou nova característica que "
 "farías no xogo, envíanos un correo electrónico (en inglés, por favor):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Enerxía inicial"
 
@@ -754,7 +915,7 @@ msgstr ""
 "Disparo: mantén premida a barra espaciadora ata acadar a potencia desexada\n"
 "Un uso por turno"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Incialización"
 
@@ -762,31 +923,43 @@ msgstr "Incialización"
 msgid "Initialise map"
 msgstr "Inicialización do mapa"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inicialización dos sons"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inicialización dos equipos"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Un agasaio!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Únete a #wormux no irc.freenode.net para atopar algún adversario."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Saltar"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Saltar cara atrás"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Bota fóra da partida aos xogadores nomeados <nickname>"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Lingua"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Cargar mapas:"
 
@@ -794,7 +967,7 @@ msgstr "Cargar mapas:"
 msgid "Load teams:"
 msgstr "Cargar equipos:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Equipos locais:"
 
@@ -802,16 +975,15 @@ msgstr "Equipos locais:"
 msgid "LowGrav"
 msgstr "Casco antigravidade"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
-msgstr ""
+msgstr "Conexión manual"
 
-#: src/menu/game_menu.cpp:84
-#, fuzzy
+#: src/menu/game_menu.cpp:78
 msgid "Map"
-msgstr "Mapas"
+msgstr "Mapa"
 
 #: src/map/map.cpp:294
 #, c-format
@@ -822,11 +994,15 @@ msgstr "Mapa %s, unha creación de: "
 msgid "Maps"
 msgstr "Mapas"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Enerxía máxima"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Número máximo de xogadores:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "FPS máximos"
 
@@ -834,40 +1010,43 @@ msgstr "FPS máximos"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
-#, fuzzy
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
-msgstr "Música?"
+msgstr "Varios"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "O máis preciso"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "O máis patoso"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "O máis traidor"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "O máis útil"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "O máis inútil"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "O máis animal"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Move a cámara co rato ou as frechas"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Mover a personaxe"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
-msgstr ""
+msgstr "Volume da música"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Música?"
 
@@ -875,32 +1054,48 @@ msgstr "Música?"
 msgid "Network Game"
 msgstr "Xogo en rede"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Inicialización da rede"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Nunca"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Novo xogo en rede en "
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Nova advertencia do xogador?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Non se atopou ningún elemento <%s> no ficheiro de configuración XML!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Ninguén!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Número de personaxes"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Número de equipos:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "Nunha personaxe: cambia á activa"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "No mapa: selecciona un obxectivo"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opcións"
@@ -913,51 +1108,62 @@ msgstr "Menú de opcións"
 msgid "Parachute"
 msgstr "Paracaídas"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "O paracaídas actívase automáticamente."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
-msgstr ""
+msgstr "Contrasinal:"
+
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pausar"
 
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Xogar"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Xogar moitas veces"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Xogador"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Enerxía de xogador?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Nome do xogador"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Nome do xogador?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Mofeta"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Porto:"
 
-#: src/menu/network_connection_menu.cpp:155
-#, fuzzy
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
-msgstr "Saír da batalla"
+msgstr "Batallas públicas"
 
 #: src/menu/main_menu.cpp:75
 msgid "Quit"
 msgstr "Saír"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Saír do Wormux"
 
@@ -965,19 +1171,23 @@ msgstr "Saír do Wormux"
 msgid "Quit battle"
 msgstr "Saír da batalla"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Saír da partida"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Mapa ao chou"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
-msgstr "A ler o ficheiro de configuración"
+msgstr "A ler o ficheiro de configuración predefinido"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "A ler o ficheiro de configuración persoal"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Resolución"
 
@@ -985,34 +1195,33 @@ msgstr "Resolución"
 msgid "Riot Bomb"
 msgstr "Bomba antimateria"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Comezar a partida"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
-msgstr "Dicir: "
+msgstr "Di: "
 
-#: src/menu/options_menu.cpp:84
-#, fuzzy
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
-msgstr "Desprazamento nos bordos"
+msgstr "Cambiar o tamaño dos bordos"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Desprazamento nos bordos"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Enderezo do servidor:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Servidor dispoñible na Internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Modo servidor"
 
@@ -1020,47 +1229,81 @@ msgstr "Modo servidor"
 msgid "Shotgun"
 msgstr "Escopeta"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Amosar o menú de armas"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Amosar/Ocultar a interface"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Amosar/Ocultar o minimapa"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Pasar turno"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Labazada"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+"Darlle unha labazada ao enimigo para separar os seus pés do chan un anaco."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Ángulo de tiro máis pequeno e dar un paso"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Rifle francotirador"
 
 #: src/object/bonus_box.cpp:86
 msgid "Someone put a booby trap into the crate!"
-msgstr "Alguén debeu de por unha bomba trampa na caixa!"
+msgstr "Alguén puxo unha bomba trampa na caixa!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Desculpa, pero neste momento non hai partidas agardando por xogadores"
 
-#: src/menu/options_menu.cpp:178
-#, fuzzy
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Canto o sentimos, pero a túa versión xa non ten soporte. A versión con "
+"soporte é a %s. Podes baixar unha versión actualizada na sección de "
+"descargas de http://www.wormux.org"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
-msgstr "Sons"
+msgstr "Son"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Efectos de son?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Frecuencia de son?"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "A iniciar unha nova partida"
 
 #: src/interface/interface.cpp:196
 msgid "Stock:"
-msgstr "Munición"
+msgstr "Munición:"
 
 #: src/weapon/submachine_gun.cpp:99
 msgid "Submachine Gun"
@@ -1074,20 +1317,26 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Xeringa"
 
-#: src/menu/results_menu.cpp:389
-#, fuzzy
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Falar en batallas en liña"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
-msgstr "Equipos"
+msgstr "Gráficos do equipo"
 
-#: src/menu/results_menu.cpp:378
-#, fuzzy
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
-msgstr "Equipos"
+msgstr "Estatísticas do equipo"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Equipos"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Editor de equipos"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportación"
@@ -1095,19 +1344,19 @@ msgstr "Teleportación"
 #: src/weapon/cluster_bomb.cpp:146
 msgid "The Cluster Bomb has left the battlefield before it could explode."
 msgstr ""
-"A bomba de fragmentación deixou o campo de batalla antes de poder explotar."
+"A bomba de fragmentación saiu do campo de batalla antes de poder explotar."
 
 #: src/weapon/footbomb.cpp:111
 msgid "The Football Bomb has left the battlefield before it could explode."
-msgstr "A bomba de rugbi deixou o campo de batalla antes de poder explotar."
+msgstr "A bomba de rugbi saiu do campo de batalla antes de poder explotar."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
-msgstr "O GÑU deixou o campo de batalla antes de explotar"
+msgstr "O GÑU saiu do campo de batalla antes de explotar"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
-msgstr "A mofeta deixou o campo de batalla antes de explotar"
+msgstr "A mofeta saiu do campo de batalla antes de explotar"
 
 #: src/weapon/auto_bazooka.cpp:175
 msgid "The automatic rocket has left the battlefield..."
@@ -1115,52 +1364,65 @@ msgstr "O cohete automático saíu do campo de batalla..."
 
 #: src/weapon/bounce_ball.cpp:72
 msgid "The ball left the battlefield before exploding"
-msgstr "A saltariña deixou o campo de batalla antes de explotar"
+msgstr "A saltariña saiu do campo de batalla antes de explotar"
+
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"As versións do cliente e mailo servidor non son compatibles (local=%s, "
+"servidor=%s). Por favor, proba con outro servidor."
 
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
 "Esgotouse o tempo de espera para a conexión. Comproba se non hai un firewall "
-"polo medio!"
+"de por medio!"
 
 #: src/weapon/disco_grenade.cpp:127
 msgid "The disco grenade has left the dance floor before exploding"
-msgstr "O aleluia deixou o escenario antes de explotar"
+msgstr "O aleluia saiu do escenario antes de explotar"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "A partida interrumpiuse porque te desconectaches."
 
 #: src/weapon/grenade.cpp:58
 msgid "The grenade left the battlefield before exploding"
-msgstr "A granada deixou o campo de batalla antes de explotar"
+msgstr "A granada saiu do campo de batalla antes de explotar"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
-msgstr "Os outros agardan por ti! Esperta :-)"
+msgstr "Os outros agardan por ti! Espavila! :-)"
 
 #: src/weapon/bazooka.cpp:83 src/weapon/cluzooka.cpp:336
 #: src/weapon/riot_bomb.cpp:86
 msgid "The rocket has left the battlefield..."
-msgstr "O cohete deixou o campo de batalla..."
+msgstr "O cohete saiu do campo de batalla..."
 
 #: src/network/net_error_msg.cpp:45
 msgid "The server rejected the connection."
 msgstr "O servido rexeitou a conexión."
 
 #: src/network/net_error_msg.cpp:51
-#, fuzzy
 msgid "The server rejected the connection: wrong password!"
-msgstr "O servido rexeitou a conexión."
+msgstr "O servido rexeitou a conexión: contrasinal incorrecto!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Hai só %i equipo."
 msgstr[1] "Hai só %i equipos."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Tempo"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1184,20 +1446,20 @@ msgstr ""
 "Disparo: barra espaciadora\n"
 "Un uso por turno"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Ferramentas"
 
 #: src/network/net_error_msg.cpp:36
 msgid "Unable to contact host."
-msgstr "Imposible contactar co host."
+msgstr "Imposible contactar co servidor."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Imposible abrir o directorio de mapas (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Imposible abrir o directorio persoal de mapas (%s)!"
@@ -1206,91 +1468,117 @@ msgstr "Imposible abrir o directorio persoal de mapas (%s)!"
 msgid "Unable to use this port!"
 msgstr "Imposible usar este porto!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Comando descoñecido"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Ilimitada"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
-msgstr "Sen Nome"
+msgstr "Sen nome"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versión"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "A verificación da versión fallou porque: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Agarda! %i xogador aínda non está preparado!"
 msgstr[1] "Agarda! %i xogadores aínda non están preparados!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
-msgstr "A agardar polo servidor, todo canto podes facer é cancelar ou chatear!"
+msgstr ""
+"A agardar polo servidor, todo canto podes facer é cancelar, chatear ou ir ao "
+"baño!"
+
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Arma: Fogo / Caixas do ceo: caen rápido"
 
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Armas"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Sitio web:"
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Que vergoña estará a pasar %s - asasinado cunha simple pistola!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Partículas no vento?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Gañador"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "A arrincar o Wormux..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Versión do Wormux "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "CRC de mapa incorrecto!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Nome do mapa incorrecto!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Equipo incorrecto!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Estás só :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Estás só..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Necesitas alomenos un mapa válido!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Necesita alomenos dous equipos válidos!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Non poderás xogar sen antes escoller un equipo!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "O teu disparo foi tomar polo cú!"
 
 #: src/menu/credits_menu.cpp:75
 msgid "aka"
-msgstr "tamén coñecido como"
+msgstr "tamén coñecido coma"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1300,31 +1588,36 @@ msgstr ""
 "Bombardeo: clic esquerdo no obxectivo\n"
 "un bombardeo por turno"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "non se puido cargar a configuración"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "xogador personalizado"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "feito"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
-msgstr "erro ao cargar o ficheiro de configuración: %s"
+msgstr "erro ao cargar o ficheiro de configuración"
 
 #: src/menu/credits_menu.cpp:79
 msgid "from"
 msgstr "de"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "non hai ficheiro de configuración!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o A cargar a música"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o A cargar o perfil de son: %s"
@@ -1334,6 +1627,23 @@ msgstr "o A cargar o perfil de son: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Son aberto a %d Hz e %d bit"
 
+#~ msgid "Automatically join a game"
+#~ msgstr "Unirse a unha partida automáticamente"
+
+#~ msgid ""
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
+#~ msgstr ""
+#~ "Non hai servidores públicos dispoñibles e a configuración de conexión "
+#~ "manual é incorrecta. Probe a conectar manualmente."
+
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Erro: O teu servidor non é accesible desde a rede. Comproba a "
+#~ "configuración do teu firewall"
+
 #~ msgid "Connect !"
 #~ msgstr "Conectar !"
 
@@ -1360,10 +1670,3 @@ msgstr "o Son aberto a %d Hz e %d bit"
 
 #~ msgid "%s tries to connect with a different version : client=%s, me=%s."
 #~ msgstr "%s tenta conectar cunha versión diferente: cliente=%s, eu=%s."
-
-#~ msgid ""
-#~ "The client and server versions are incompatible (local=%s, server=%s). "
-#~ "Please try another server."
-#~ msgstr ""
-#~ "As versións do cliente e mailo servidor non son compatibles (local=%s, "
-#~ "servidor=%s). Por favor, proba con outro servidor."
diff --git a/po/he.po b/po/he.po
index 36d1fdc..401ba76 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2007-11-08 23:03+0100\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-05-26 21:06+0100\n"
 "Last-Translator: Yotam Benshalom <benshalom at gmail.com>\n"
 "Language-Team:  <he at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,71 +16,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! המפה %s לא נמצאה :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "שחקן %i מחובר"
 msgstr[1] "%i שחקנים מחוברים"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "שחקן %i מוכן"
 msgstr[1] "%i שחקנים מוכנים"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) נהרג."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> נקרא %s מ-%s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> מ-%s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "צוות %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "צוות %s - מרוחק"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s מאבד עצמו לדעת!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s תמונות בשניה"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s מאבד עצמו לדעת!"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s) נהרג."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s נפל למים."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s נפל מן המפה!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s מת כי הוא שלומיאל!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -88,16 +98,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s זכה ב-%u נקודת אנרגיה!"
 msgstr[1] "%s זכה ב-%u נקודות אנרגיה!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s הוא פסיכופת, הוא הרג חבר בצוות %s!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s מת כי הוא שלומיאל!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -118,24 +123,24 @@ msgstr "צוות %s ויתר על תורו."
 #, fuzzy, c-format
 msgid "%s team has won %u Cluster bazookas!"
 msgid_plural "%s team has won %u Cluster bazookas!"
-msgstr[0] "צוות %s זכה ב-%u בזוקה!"
+msgstr[0] "צוות %s זכה בבזוקה!"
 msgstr[1] "צוות %s זכה ב-%u בזוקות!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
-msgstr[0] "צוות %s זכה ב-%u גנו! חסל אותם, קאובוי!"
+msgstr[0] "צוות %s זכה בגנו! חסל אותם, קאובוי!"
 msgstr[1] "צוות %s זכה ב-%u גנואים! חסל אותם, קאובוי!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
-msgstr[0] "צוות %s זכה ב-%u התקפה אווירית!"
+msgstr[0] "צוות %s זכה בהתקפה אווירית!"
 msgstr[1] "צוות %s זכה ב-%u התקפות אוויריות!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -143,37 +148,36 @@ msgid ""
 msgid_plural ""
 "%s team has won %u airhammers! Don't make too much noise with them! Thanks, "
 "your neighbours."
-msgstr[0] ""
-"צוות %s זכה ב-%u פטיש אוויר! נא לשמור על השקט בעת השימוש! תודה, השכנים."
+msgstr[0] "צוות %s זכה בפטיש אוויר! נא לשמור על השקט בעת השימוש! תודה, השכנים."
 msgstr[1] ""
 "צוות %s זכה ב-%u פטיש אוויר! נא לשמור על השקט בעת השימוש! תודה, השכנים."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
-msgstr[0] "צוות %s זכה ב-%u סדן! שטח אותם!"
+msgstr[0] "צוות %s זכה בסדן! שטח אותם!"
 msgstr[1] "צוות %s זכה ב-%u סדנים! שטח אותם!"
 
 #: src/weapon/auto_bazooka.cpp:329
 #, c-format
 msgid "%s team has won %u automatic bazooka!"
 msgid_plural "%s team has won %u automatic bazookas!"
-msgstr[0] "צוות %s זכה ב-%u בזוקה אוטומטית!"
+msgstr[0] "צוות %s זכה בבזוקה אוטומטית!"
 msgstr[1] "צוות %s זכה ב-%u בזוקות אוטומטיות!"
 
 #: src/weapon/baseball.cpp:116
 #, c-format
 msgid "%s team has won %u baseball bat!"
 msgid_plural "%s team has won %u baseball bats!"
-msgstr[0] "צוות %s זכה ב-%u אלת בייסבול!"
+msgstr[0] "צוות %s זכה באלת בייסבול!"
 msgstr[1] "צוות %s זכה ב-%u אלות בייסבול!"
 
 #: src/weapon/bazooka.cpp:130
 #, c-format
 msgid "%s team has won %u bazooka!"
 msgid_plural "%s team has won %u bazookas!"
-msgstr[0] "צוות %s זכה ב-%u בזוקה!"
+msgstr[0] "צוות %s זכה בבזוקה!"
 msgstr[1] "צוות %s זכה ב-%u בזוקות!"
 
 #: src/weapon/blowtorch.cpp:137
@@ -183,28 +187,28 @@ msgid ""
 msgid_plural ""
 "%s team has won %u blowtorchs! If you're under 18, ask your parents to use "
 "it."
-msgstr[0] "צוות %s זכה ב-%u מבער! אם אתה קטין, בקש את רשות הוריך."
+msgstr[0] "צוות %s זכה במבער! אם אתה קטין, בקש את רשות הוריך."
 msgstr[1] "צוות %s זכה ב-%u מבערים! אם אתה קטין, בקש את רשות הוריך."
 
 #: src/weapon/bounce_ball.cpp:113
 #, c-format
 msgid "%s team has won %u bounce ball! Boing!"
 msgid_plural "%s team has won %u bounce balls! Boing!"
-msgstr[0] "צוות %s זכה ב-%u כדור מקפץ! בוינג!"
+msgstr[0] "צוות %s זכה בכדור מקפץ! בוינג!"
 msgstr[1] "צוות %s זכה ב-%u כדורים מקפצים! בוינג!"
 
 #: src/weapon/cluster_bomb.cpp:206
 #, c-format
 msgid "%s team has won %u cluster bomb!"
 msgid_plural "%s team has won %u cluster bombs!"
-msgstr[0] "צוות %s זכה ב-%u פצצת מצרר!"
+msgstr[0] "צוות %s זכה בפצצת מצרר!"
 msgstr[1] "צוות %s זכה ב-%u פצצות מצרר!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
-msgstr[0] "צוות %s זכה ב-%u כלי בנייה! זכור לחבוש קסדה."
+msgstr[0] "צוות %s זכה בכלי בנייה! זכור לחבוש קסדה."
 msgstr[1] "צוות %s זכה ב-%u כלי בנייה! זכור לחבוש קסדה."
 
 #: src/weapon/disco_grenade.cpp:170
@@ -212,160 +216,177 @@ msgstr[1] "צוות %s זכה ב-%u כלי בנייה! זכור לחבוש קס
 msgid "%s team has won %u disco grenade! Shake your body when throwing it!"
 msgid_plural ""
 "%s team has won %u disco grenades! Shake your body when throwing them!"
-msgstr[0] "צוות %s זכה ב-%u רימון דיסקו! טלטל את הישבן!"
+msgstr[0] "צוות %s זכה ברימון דיסקו! טלטל את הישבן!"
 msgstr[1] "צוות %s זכה ב-%u רימוני דיסקו! טלטל את הישבן!"
 
 #: src/weapon/dynamite.cpp:145
 #, c-format
 msgid "%s team has won %u dynamite!"
 msgid_plural "%s team has won %u dynamites!"
-msgstr[0] "צוות %s זכה ב-%u דינמיט!"
+msgstr[0] "צוות %s זכה בדינמיט!"
 msgstr[1] "צוות %s זכה ב-%u מקלות דינמיט!"
 
 #: src/weapon/flamethrower.cpp:178
 #, c-format
 msgid "%s team has won %u flame-thrower!"
 msgid_plural "%s team has won %u flame-throwers!"
-msgstr[0] "צוות %s זכה ב-%u להביור!"
+msgstr[0] "צוות %s זכה בלהביור!"
 msgstr[1] "צוות %s זכה ב-%u להביורים!"
 
 #: src/weapon/footbomb.cpp:176
 #, fuzzy, c-format
 msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
-msgstr[0] "צוות %s זכה ב-%u מפזר הפגנות!"
+msgstr[0] "צוות %s זכה במפזר הפגנות!"
 msgstr[1] "צוות %s זכה ב-%u מפזרי הפגנות!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
-msgstr[0] "צוות %s זכה ב-%u וו אחיזה!"
+msgstr[0] "צוות %s זכה בוו אחיזה!"
 msgstr[1] "צוות %s זכה ב-%u ווי אחיזה!"
 
 #: src/weapon/grenade.cpp:90
 #, c-format
 msgid "%s team has won %u grenade!"
 msgid_plural "%s team has won %u grenades!"
-msgstr[0] "צוות %s זכה ב-%u רימון!"
+msgstr[0] "צוות %s זכה ברימון!"
 msgstr[1] "צוות %s זכה ב-%u רימונים!"
 
 #: src/weapon/gun.cpp:99
 #, c-format
 msgid "%s team has won %u gun!"
 msgid_plural "%s team has won %u guns!"
-msgstr[0] "צוות %s זכה ב-%u אקדח!"
+msgstr[0] "צוות %s זכה באקדח!"
 msgstr[1] "צוות %s זכה ב-%u אקדחים!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
-msgstr[0] "צוות %s זכה ב-%u רתמת טיסה! מגניב!"
+msgstr[0] "צוות %s זכה ברתמת טיסה! מגניב!"
 msgstr[1] "צוות %s זכה ב-%u רתמות טיסה! מגניב!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
-msgstr[0] "צוות %s זכה ב-%u אנטי-גרביטציה! אני ניל ארמסטרונג!"
+msgstr[0] "צוות %s זכה באנטי-גרביטציה! אני ניל ארמסטרונג!"
 msgstr[1] "צוות %s זכה ב-%u מתקני אנטי-גרביטציה! אני ניל ארמסטרונג!"
 
 #: src/weapon/mine.cpp:247
 #, c-format
 msgid "%s team has won %u mine!"
 msgid_plural "%s team has won %u mines!"
-msgstr[0] "צוות %s זכה ב-%u מוקש!"
+msgstr[0] "צוות %s זכה במוקש!"
 msgstr[1] "צוות %s זכה ב-%u מוקשים!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
-msgstr[0] "צוות %s זכה ב-%u מצנח!"
+msgstr[0] "צוות %s זכה במצנח!"
 msgstr[1] "צוות %s זכה ב-%u מצנחים!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
-msgstr[0] "צוות %s זכה ב-%u חמוס! שמרת על מסכת הגז שלך?"
+msgstr[0] "צוות %s זכה בחמוס! שמרת על מסכת הגז שלך?"
 msgstr[1] "צוות %s זכה ב-%u חמוסים! שמרת על מסכת הגז שלך?"
 
 #: src/weapon/riot_bomb.cpp:133
 #, c-format
 msgid "%s team has won %u riot bomb!"
 msgid_plural "%s team has won %u riot bombs!"
-msgstr[0] "צוות %s זכה ב-%u מפזר הפגנות!"
+msgstr[0] "צוות %s זכה במפזר הפגנות!"
 msgstr[1] "צוות %s זכה ב-%u מפזרי הפגנות!"
 
 #: src/weapon/shotgun.cpp:134
 #, c-format
 msgid "%s team has won %u shotgun!"
 msgid_plural "%s team has won %u shotguns!"
-msgstr[0] "צוות %s זכה ב-%u שוטגאן!"
+msgstr[0] "צוות %s זכה בשוטגאן!"
 msgstr[1] "צוות %s זכה ב-%u רובי שוטגאן!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "צוות %s זכה בוו אחיזה!"
+msgstr[1] "צוות %s זכה ב-%u ווי אחיזה!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
 "%s team has won %u sniper rifles! Aim and shoot between the eyes!"
-msgstr[0] "צוות %s זכה ב-%u רובה צלפים! כוון אל בין העיניים!"
+msgstr[0] "צוות %s זכה ברובה צלפים! כוון אל בין העיניים!"
 msgstr[1] "צוות %s זכה ב-%u רובי צלפים! כוון אל בין העיניים!"
 
 #: src/weapon/submachine_gun.cpp:144
 #, c-format
 msgid "%s team has won %u submachine gun!"
 msgid_plural "%s team has won %u submachine guns!"
-msgstr[0] "צוות %s זכה ב-%u רובה אוטומטי!"
-msgstr[1] "צוות %s זכה ב-%u רובים אוטומטיים!"
+msgstr[0] "צוות %s זכה בתת-מקלע!"
+msgstr[1] "צוות %s זכה ב-%u תת-מקלעים!"
 
 #: src/weapon/suicide.cpp:77
 #, c-format
 msgid "%s team has won %u suicide!"
 msgid_plural "%s team has won %u suicides! Use them all for an extra bonus!"
-msgstr[0] "צוות %s זכה ב-%u חגורת נפץ!"
+msgstr[0] "צוות %s זכה בחגורת נפץ!"
 msgstr[1] "צוות %s זכה ב-%u חגורות נפץ!"
 
 #: src/weapon/syringe.cpp:115
 #, c-format
 msgid "%s team has won %u syringe!"
 msgid_plural "%s team has won %u syringes!"
-msgstr[0] "צוות %s זכה ב-%u מזרק!"
+msgstr[0] "צוות %s זכה במזרק!"
 msgstr[1] "צוות %s זכה ב-%u מזרקים!"
 
 #: src/weapon/teleportation.cpp:120
 #, c-format
 msgid "%s team has won %u teleportation!"
 msgid_plural "%s team has won %u teleportations!"
-msgstr[0] "צוות %s זכה ב-%u טלפורטציה!"
+msgstr[0] "צוות %s זכה בטלפורטציה!"
 msgstr[1] "צוות %s זכה ב-%u מתקני טלפורטציה!"
 
 #: src/weapon/skip_turn.cpp:68
 #, c-format
 msgid "%s team has won %u turn skip! I know you'll love it."
 msgid_plural "%s team has won %u turn skips! I know you'll love them."
-msgstr[0] "צוות %s זכה ב-%u דילוג תור! בטוח שתאהב את זה."
+msgstr[0] "צוות %s זכה בדילוג תור! ידעתי שתאהב את זה."
 msgstr[1] "צוות %s זכה ב-%u דילוגי תור! בטוח שתאהב את זה."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
-msgstr[0] "צוות %s זכה ב-%u משגר טאקס! אף פעם לא ראית פינגווין מעופף?"
+msgstr[0] "צוות %s זכה במשגר טאקס! אף פעם לא ראית פינגווין מעופף?"
 msgstr[1] "צוות %s זכה ב-%u משגרי טאקס! אף פעם לא ראית פינגווין מעופף?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(מת)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(שפת מערכת)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -374,14 +395,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(ללא הגבלה)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "התקפה אווירית"
 
@@ -389,10 +414,19 @@ msgstr "התקפה אווירית"
 msgid "Airhammer"
 msgstr "פטיש אוויר"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "כל הצוותים"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "שחק"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "והמנצח..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -407,7 +441,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "סדן"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "מחברים:"
 
@@ -431,6 +465,15 @@ msgstr "אלת בייסבול"
 msgid "Bazooka"
 msgstr "בזוקה"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "טלפורטציה"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "מבער"
@@ -443,8 +486,9 @@ msgstr "כדור מקפץ"
 msgid "Bye bye tux..."
 msgstr "היה שלום, טאקס..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "לא ניתן למצוא את צוות %s !"
@@ -454,24 +498,72 @@ msgstr "לא ניתן למצוא את צוות %s !"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "לא ניתן לפתוח את תיקיית הצוותים האישית (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "לא ניתן לפתוח את תיקיית הצוותים (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "לא ניתן לפתוח את תיקיית הצוותים האישית (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "מספר דמויותe"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "מצנח"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "מצנח"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "בחר באחת המפות באופן אקראי"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "מצב לקוח"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "המגושם ביותר"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "פצצת מצרר"
@@ -485,7 +577,12 @@ msgstr "בזוקה"
 msgid "Commit Suicide"
 msgstr "התאבד"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "אין קובץ הגדרות!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "התחבר למשחק"
 
@@ -493,11 +590,11 @@ msgstr "התחבר למשחק"
 msgid "Connected !"
 msgstr "מחובר!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "בנייה"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "מבוקר על ידי:"
 
@@ -506,7 +603,7 @@ msgstr "מבוקר על ידי:"
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, fuzzy, c-format
 msgid "Couldn't open file %s"
 msgstr "לא ניתן לטעון הגדרות"
@@ -515,11 +612,32 @@ msgstr "לא ניתן לטעון הגדרות"
 msgid "Credits"
 msgstr "קרדיטים"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "רימון דיסקו"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "משך תור"
 
@@ -527,30 +645,51 @@ msgstr "משך תור"
 msgid "Dynamite"
 msgstr "דינמיט"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "סוף משחק"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "שגיאה ב-%s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "שגיאה בטעינת צוות:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr "שגיאה בעת טעינת תיקיית \"%s\": לא ניתן לאחסן קובץ הגדרות."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "שגיאה בעת טעינת תיקיית \"%s\": לא ניתן לאחסן קובץ הגדרות."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "שגיאה בעת טעינת תיקיית \"%s\": לא ניתן לאחסן קובץ הגדרות."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -560,30 +699,36 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "לא ניתן להתחבר ל-%s : %s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "שגיאה: לא ניתן ליצור קשר עם שרת אינדקסים כדי לארח משחק"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "שגיאה: לא ניתן ליצור קשר עם שרת אינדקסים כדי לחפש משחק באינטרנט"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "שגיאה: לא ניתן להפעיל את השרת"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "שגיאה: לא ניתן למצוא את הגוף \"%s\" עבור צוות \"%s\"."
@@ -597,23 +742,33 @@ msgstr "להביור"
 msgid "Football Bomb"
 msgstr "מפזר הפגנות"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Plein écran ?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Plein écran ?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "מצב לקוח"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr ""
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "משגר גנו"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -621,11 +776,15 @@ msgstr ""
 msgid "Grapple"
 msgstr "וו אחיזה"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "רימון"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "אתחול פני השטח..."
 
@@ -633,16 +792,16 @@ msgstr "אתחול פני השטח..."
 msgid "Gun"
 msgstr "אקדח"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "לא ניתן למצוא את תיקיית הבית (משתנה סביבה $HOME)!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "משחק מוצלח!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "מפקד"
 
@@ -655,7 +814,11 @@ msgstr "מפקד: "
 msgid "Help"
 msgstr "עזרה"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "ארח משחק"
 
@@ -697,7 +860,11 @@ msgstr ""
 "לשימוש: קליק שמאלי על המטרה\n"
 "תחמושת לתור"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "קדימה, אתה איטי מדי!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -705,7 +872,8 @@ msgstr ""
 "אם מצאת באג, או אם אתה מעוניין לבקש הוספת תכונה חדשה, שלח אלינו מסר(באנגלית "
 "בבקשה):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "אנרגיה ראשונית"
 
@@ -720,7 +888,7 @@ msgstr ""
 "ירי: החזק את מקש הרווח לחוץ לקבלת העוצמה הרצויה\n"
 "תחמושת לתור"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "אתחול"
 
@@ -728,31 +896,43 @@ msgstr "אתחול"
 msgid "Initialise map"
 msgstr "מאתחל מפה"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "מאתחל סאונד"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "מאתחל צוותים"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "קיבלת מתנה!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "רתמת טיסה"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "הצטרף אל #wormux ב-irc.freenode.net כדי למצוא יריבים."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "שפה"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "טען מפות:"
 
@@ -760,7 +940,7 @@ msgstr "טען מפות:"
 msgid "Load teams:"
 msgstr "טען צוותים:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "צוותים מקומיים:"
 
@@ -768,13 +948,13 @@ msgstr "צוותים מקומיים:"
 msgid "LowGrav"
 msgstr "אנטי-גרביטציה"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "מפות"
@@ -788,11 +968,16 @@ msgstr "מפה %s, דרך יצירתה:"
 msgid "Maps"
 msgstr "מפות"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "אנרגיה ראשונית"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "מספר שחקנים מירבי:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "ערך FPS מקסימלי"
 
@@ -800,40 +985,45 @@ msgstr "ערך FPS מקסימלי"
 msgid "Mine"
 msgstr "מוקש"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "מוסיקה?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "המדויק ביותר"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "המגושם ביותר"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "החסר ביותר"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "השימושי ביותר"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "חסר התועלת ביותר"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "האלים ביותר"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "מצנח"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "מוסיקה?"
 
@@ -841,39 +1031,54 @@ msgstr "מוסיקה?"
 msgid "Network Game"
 msgstr "משחק רשת"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "אתחול רשת"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
 msgstr "משחק רשת"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "לא נמצא אלמנט <%s> בקובץ ה-xml!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "אף אחד!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "מספר דמויותe"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "מספר צוותים:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "אפשרויות"
 
 #: src/menu/pause_menu.cpp:55
-#, fuzzy
 msgid "Options menu"
 msgstr "תפריט אפשרויות"
 
@@ -881,42 +1086,55 @@ msgstr "תפריט אפשרויות"
 msgid "Parachute"
 msgstr "מצנח"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "המצנח מופעל אוטומטית."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "שחק"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "שחקן"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "אנרגיה לשחקן?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "שם השחקן?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "שם השחקן?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "משגר חמוסים"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "פורט:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 #, fuzzy
 msgid "Public battles"
 msgstr "יציאה מן הקרב"
@@ -925,7 +1143,7 @@ msgstr "יציאה מן הקרב"
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "יציאה מ-Wormux"
 
@@ -933,19 +1151,24 @@ msgstr "יציאה מ-Wormux"
 msgid "Quit battle"
 msgstr "יציאה מן הקרב"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "הרץ משחק"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "מפה אקראית"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "קורא הגדרות מקובץ ברירת מחדל"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "קורא הגדרות מקובץ אישי"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "אבחנה"
 
@@ -953,34 +1176,34 @@ msgstr "אבחנה"
 msgid "Riot Bomb"
 msgstr "מפזר הפגנות"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "הרץ משחק"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "אמור: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "גלול על גבול המסך"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "גלול על גבול המסך"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "כתובת שרת:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "שרת זמין באינטרנט"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "מצב שרת"
 
@@ -988,10 +1211,35 @@ msgstr "מצב שרת"
 msgid "Shotgun"
 msgstr "שוטגאן"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "תפריט אפשרויות"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "דלג על תור"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "רובה צלפים"
@@ -1000,29 +1248,36 @@ msgstr "רובה צלפים"
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "עמך הסליחה, אין כרגע משחק הממתין לשחקנים"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "סאונד"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "אפקטים קוליים?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "תדירות הסאונד"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "סאונד"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "מתחיל משחק חדש"
 
@@ -1032,7 +1287,7 @@ msgstr "מלאי:"
 
 #: src/weapon/submachine_gun.cpp:99
 msgid "Submachine Gun"
-msgstr "רובה אוטומטי"
+msgstr "תת מקלע"
 
 #: src/weapon/supertux.cpp:229
 msgid "SuperTux"
@@ -1042,20 +1297,29 @@ msgstr "סופרטאקס"
 msgid "Syringe"
 msgstr "מזרק"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+#, fuzzy
+msgid "Talk in network battle"
+msgstr "בחזרה אל הקרב"
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "צוותים"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "צוותים"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "צוותים"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "טלפורטציה"
@@ -1069,11 +1333,11 @@ msgstr "פצצת המצרר יצאה משדה הקרב לפני שהתפוצצה
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "פצצת המצרר יצאה משדה הקרב לפני שהתפוצצה."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "הגנו יצא משדה הקרב לפני שהתפוצץ."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "החמוס יצא משדה הקרב לפני שהתפוצץ."
 
@@ -1085,6 +1349,13 @@ msgstr "הרקטה האוטומטית יצאה משדה הקרב..."
 msgid "The ball left the battlefield before exploding"
 msgstr "הכדור המקפץ יצא משדה הקרב לפני שהתפוצץ."
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "זמן ההמתנה לחיבור עבר. בדוק אם אין חומת-אש שמפריעה!"
@@ -1093,7 +1364,7 @@ msgstr "זמן ההמתנה לחיבור עבר. בדוק אם אין חומת-
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "רימון הדיסקו יצא משדה הקרב לפני שהתפוצץ."
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1101,7 +1372,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr "הרימון יצא משדה הקרב לפני שהתפוצץ."
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "כולם מחכים רק לך! זמן לקום :-)"
 
@@ -1119,14 +1390,19 @@ msgstr "השרת סירב לבקשת החיבור."
 msgid "The server rejected the connection: wrong password!"
 msgstr "השרת סירב לבקשת החיבור."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "יש רק %i צוות."
 msgstr[1] "יש רק %i צוותים."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1150,7 +1426,7 @@ msgstr ""
 "ירי: מקש הרווח\n"
 "תחמושת לתור"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "כלים"
 
@@ -1158,12 +1434,12 @@ msgstr "כלים"
 msgid "Unable to contact host."
 msgstr "לא ניתן ליצור קשר עם השרת."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "לא ניתן לפתוח את תיקיית המפות (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "לא ניתן לפתוח את תיקיית המפות האישית (%s)!"
@@ -1172,83 +1448,108 @@ msgstr "לא ניתן לפתוח את תיקיית המפות האישית (%s)!
 msgid "Unable to use this port!"
 msgstr "לא ניתן להשתמש בפורט זה!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(ללא הגבלה)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "ללא שם"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "גירסה"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "רגע! שחקן %i אינו מוכן עדיין!"
 msgstr[1] "רגע! %i שחקנים אינם מוכנים עדיין!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "ממתין לשרת, כרגע תוכל רק לבטל או להשתמש בצ'אט!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "כלי נשק"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "אתר: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "בושה וכלימה ל-%s: נהרג מכדור אקדח פשוט!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "חלקיקי רוח?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "מנצח"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux נטען..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "גירסת Wormux "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "אתה לבדך :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "אתה לבדך..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "אתה זקוק למפה תקינה אחת לפחות!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "אתה זקוק לשני צוותים תקינים לפחות!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "לא תוכל לשחק לפני שתבחר צוות!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "הירייה שלך החטיאה!"
 
@@ -1256,7 +1557,7 @@ msgstr "הירייה שלך החטיאה!"
 msgid "aka"
 msgstr "המכונה"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1266,15 +1567,20 @@ msgstr ""
 "התקפה: קליק שמאלי על המטרה\n"
 "הפצצה לתור"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "לא ניתן לטעון הגדרות"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "בוצע"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "שגיאה בקריאת קובץ הגדרות"
 
@@ -1282,15 +1588,15 @@ msgstr "שגיאה בקריאת קובץ הגדרות"
 msgid "from"
 msgstr "מ-"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "אין קובץ הגדרות!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o טוען מוסיקה"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o טוען פרופיל סאונד: %s"
@@ -1300,14 +1606,17 @@ msgstr "o טוען פרופיל סאונד: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o נפתח שמע ב-%d Hz ו-%d bit"
 
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "%s מנסה להתחבר לגרסה אחרת: לקוח=%s, אני=%s."
+
 #~ msgid "Connect !"
 #~ msgstr "התחבר!"
 
 #~ msgid "Connect to an internet game"
 #~ msgstr "התחבר למשחק באינטרנט"
 
-#~ msgid "Refresh"
-#~ msgstr "רענן"
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Voulez-vous vraiment quitter ? (O/N)"
 
 #~ msgid "Error loading team's data %s:"
 #~ msgstr "שגיאה בטעינת המידע של צוות %s:"
@@ -1321,20 +1630,14 @@ msgstr "o נפתח שמע ב-%d Hz ו-%d bit"
 #~ msgid "Error while loading game mode %s (file %s):"
 #~ msgstr "שגיאה בעת טעינת מצב משחק %s (קובץ %s) :"
 
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "שגיאת XML במהלך טעינת המפה '%s' :"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s מנסה להתחבר לגרסה אחרת: לקוח=%s, אני=%s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "והמנצח..."
+#~ msgid "Host a game (Windows clients only)"
+#~ msgstr "Créer une partie (clients Windows seulement)"
 
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "קדימה, אתה איטי מדי!!"
+#~ msgid "Most clumsy"
+#~ msgstr "המגושם ביותר"
 
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Voulez-vous vraiment quitter ? (O/N)"
+#~ msgid "Refresh"
+#~ msgstr "רענן"
 
-#~ msgid "Host a game (Windows clients only)"
-#~ msgstr "Créer une partie (clients Windows seulement)"
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "שגיאת XML במהלך טעינת המפה '%s' :"
diff --git a/po/hu.po b/po/hu.po
index 81ad4e0..d255123 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wormux\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2007-05-15 12:00+0200\n"
 "Last-Translator: Varga Istvan\n"
 "Language-Team: Hungarian\n"
@@ -11,71 +11,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "A(z) %s pálya nem található"
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i játékos belépett"
 msgstr[1] "%i játékos belépett"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i játékos kész"
 msgstr[1] "%i játékos kész"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s csapat) meghalt."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s>, ismertebb nevén %s a(z) %s csapatból"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> a(z) %s csapatból"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, fuzzy, c-format
 msgid "%s Team"
 msgstr "Csapatok"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr ""
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s öngyilkos lett!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s képkocka/másodperc"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s öngyilkos lett!"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s csapat) meghalt."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s vízbe esett."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s kiesett a pályáról!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s egy kicsit ügyefogyott volt, ezért távozott az élõk sorából!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -83,16 +93,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s nyert %u energiapontot!"
 msgstr[1] "%s energiája %u egységgel nõtt!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s egy pszichopata, megölte a(z) %s csapat egy tagját!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s egy kicsit ügyefogyott volt, ezért távozott az élõk sorából!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -116,7 +121,7 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "A(z) %s csapat nyert %u %st!"
 msgstr[1] "A(z) %s csapat nyert %u %st!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, fuzzy, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
@@ -129,7 +134,7 @@ msgstr[1] ""
 "lĂŠgitĂĄmadĂĄs "
 "nyert!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, fuzzy, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
@@ -142,7 +147,7 @@ msgstr[1] ""
 "lĂŠgitĂĄmadĂĄs "
 "nyert!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -153,7 +158,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, fuzzy, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -227,7 +232,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "A(z) %s csapat nyert %u %st!"
 msgstr[1] "A(z) %s csapat nyert %u %st!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, fuzzy, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -263,7 +268,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "A(z) %s csapat nyert %u %st!"
 msgstr[1] "A(z) %s csapat nyert %u %st!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, fuzzy, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -284,7 +289,7 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "A(z) %s csapat nyert %u %st!"
 msgstr[1] "A(z) %s csapat nyert %u %st!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
@@ -297,7 +302,7 @@ msgstr[1] ""
 "lĂŠgitĂĄmadĂĄs "
 "nyert!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, fuzzy, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -311,14 +316,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "A(z) %s csapat nyert %u %st!"
 msgstr[1] "A(z) %s csapat nyert %u %st!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, fuzzy, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "A(z) %s csapat nyert %u %st!"
 msgstr[1] "A(z) %s csapat nyert %u %st!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, fuzzy, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -339,7 +344,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "A(z) %s csapat nyert %u %st!"
 msgstr[1] "A(z) %s csapat nyert %u %st!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "A(z) %s csapat nyert %u %st!"
+msgstr[1] "A(z) %s csapat nyert %u %st!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -382,23 +394,33 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "A(z) %s csapat nyert %u %st!"
 msgstr[1] "A(z) %s csapat nyert %u %st!"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, fuzzy, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "A(z) %s csapat nyert %u %st!"
 msgstr[1] "A(z) %s csapat nyert %u %st!"
 
+#: src/game/game_blitz.cpp:70
+#, fuzzy, c-format
+msgid "%s team was fragged down."
+msgstr "%s csapata nyert."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(halott)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr ""
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -407,14 +429,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(korlátlan)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Légitámadás"
 
@@ -422,10 +448,19 @@ msgstr "L
 msgid "Airhammer"
 msgstr "Légkalapács"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Összes csapat"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Irány a játék!"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr ""
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -437,7 +472,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Üllõ"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Szerzõk:"
 
@@ -462,6 +497,15 @@ msgstr "Baseball
 msgid "Bazooka"
 msgstr "Rakétavetõ"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleport"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Lángvágó"
@@ -474,8 +518,9 @@ msgstr "Gumilabda"
 msgid "Bye bye tux..."
 msgstr "Viszlát, pingvin..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Nem találom a(z) %s csapatot!"
@@ -485,24 +530,73 @@ msgstr "Nem tal
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Nem tudom megnyitni a csapatok könyvtárát (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Nem tudom megnyitni a csapatok könyvtárát (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Nem tudom megnyitni a csapatok könyvtárát (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Szereplõk száma"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Ejtõernyõ"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Ejtõernyõ"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Kliens mód"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+#, fuzzy
+msgid "Clumsiest"
+msgstr "Leghasznosabb"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Szõnyegbomba"
@@ -516,7 +610,12 @@ msgstr "Rak
 msgid "Commit Suicide"
 msgstr "Öngyilkosság"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "Hiba a konfigurációs fájl betöltése közben: %s"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Kapcsolódás játékhoz"
 
@@ -524,12 +623,12 @@ msgstr "Kapcsol
 msgid "Connected !"
 msgstr "Kapcsolódva!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 #, fuzzy
 msgid "Construct"
 msgstr "Épít"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr ""
 
@@ -538,7 +637,7 @@ msgstr ""
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr ""
@@ -547,11 +646,32 @@ msgstr ""
 msgid "Credits"
 msgstr "Szerzõk"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Diszkógránát"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Egy forduló ideje"
 
@@ -559,24 +679,34 @@ msgstr "Egy fordul
 msgid "Dynamite"
 msgstr "Dinamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "JÁTÉK VÉGE"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Hiba a következõben: %s, %lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Hiba a csapat betöltése közben:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -584,7 +714,22 @@ msgstr ""
 "Hiba a(z) \"%s\" könyvtár létrehozása közben: nem lehet a konfigurációs "
 "fájlt menteni."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Hiba a(z) \"%s\" könyvtár létrehozása közben: nem lehet a konfigurációs "
+"fájlt menteni."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Hiba a(z) \"%s\" könyvtár létrehozása közben: nem lehet a konfigurációs "
+"fájlt menteni."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -594,30 +739,36 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Hiba: Nem sikerült csatlakozni (%s:%s)"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Hiba: Nem sikerült játékot létrehozni a központi szerveren"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "Hiba: Nem sikerült internetes játékokat keresni a központi szerveren"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Hiba: Nem sikerült a szerver indítása"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Hiba: nem találom a(z) \"%s\" testet a(z) \"%s\" csapathoz."
@@ -631,27 +782,39 @@ msgstr ""
 msgid "Football Bomb"
 msgstr "Rohambomba"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Teljesképernyõs"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Teljesképernyõs"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 #, fuzzy
 msgid "Game"
 msgstr "NĂŠv"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr ""
+"BeĂĄllĂ­"
+"tĂĄsok"
+
+#: src/menu/network_connection_menu.cpp:187
 #, fuzzy
 msgid "Game name:"
 msgstr ""
 "BeĂĄllĂ­"
 "tĂĄsok"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnú-lövõ"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -659,11 +822,15 @@ msgstr ""
 msgid "Grapple"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Gránát"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 #, fuzzy
 msgid "Ground initialization..."
 msgstr "Pálya elõkészítése..."
@@ -672,16 +839,16 @@ msgstr "P
 msgid "Gun"
 msgstr "Pisztoly"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Nem található a felhasználó könyvtára!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Jó játékot!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Parancsnok"
 
@@ -694,7 +861,11 @@ msgstr "Parancsnok: "
 msgid "Help"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Játék létrehozása"
 
@@ -725,14 +896,19 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Siess, túl lassú vagy!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
 msgstr ""
 "Ha hibát találtál vagy hasznos ötleted van, írd meg e-mailben (angolul):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Induló energia"
 
@@ -744,7 +920,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Elõkészítés"
 
@@ -752,33 +928,45 @@ msgstr "El
 msgid "Initialise map"
 msgstr "Pálya elõkészítése"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Hangok elõkészítése"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Csapatok elõkészítése"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Ez egy ajándék!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 #, fuzzy
 msgid "Jetpack"
 msgstr "Sugárhajtású hátizsák"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 "Lépj be a #wormux szobába az irc.freenode.net-en, hogy ellenfeleket találj."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr ""
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Térképek betöltése:"
 
@@ -786,7 +974,7 @@ msgstr "T
 msgid "Load teams:"
 msgstr "Csapatok betöltése:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Helyi csapatok:"
 
@@ -794,14 +982,14 @@ msgstr "Helyi csapatok:"
 msgid "LowGrav"
 msgstr "Alacsony gravitáció"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 #, fuzzy
 msgid "Manual connection"
 msgstr "VĂŠge!"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "Pályák"
@@ -815,11 +1003,16 @@ msgstr "A(z) %s p
 msgid "Maps"
 msgstr "Pályák"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Induló energia"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Játékosok létszáma:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maximum képkocka/másodperc"
 
@@ -827,41 +1020,45 @@ msgstr "Maximum k
 msgid "Mine"
 msgstr "Taposó akna"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "Zene"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr ""
 
-#: src/menu/results_menu.cpp:366
-#, fuzzy
-msgid "Most clumsy"
-msgstr "Leghasznosabb"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Legmûvészibb"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Leghasznosabb"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Leghaszontalanabb"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Legerõszakosabb"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Ejtõernyõ"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Zene"
 
@@ -869,34 +1066,50 @@ msgstr "Zene"
 msgid "Network Game"
 msgstr "Hálózati játék"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Hálózat elõkészítése"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
 msgstr "Hálózati játék"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "A(z) <%s> elem nem található a konfigurációs XML fájlban!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 #, fuzzy
 msgid "Nobody!"
 msgstr "Egy senki!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Szereplõk száma"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Csapatok száma:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Beállítások"
@@ -910,43 +1123,56 @@ msgstr "Be
 msgid "Parachute"
 msgstr "Ejtõernyõ"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 #, fuzzy
 msgid "Parachute is activated automatically."
 msgstr "Az ejtõernyõ magától aktiválódik."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "SzĂźnet"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Irány a játék!"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Játékos"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Játékos energiája"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Játékos neve"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Játékos neve"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Borz-lövõ"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr ""
 
@@ -954,7 +1180,7 @@ msgstr ""
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Kilépés a Wormuxból"
 
@@ -962,23 +1188,28 @@ msgstr "Kil
 msgid "Quit battle"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Játék futtatása"
+
+#: src/menu/map_selection_box.cpp:228
 #, fuzzy
 msgid "Random map"
 msgstr ""
 "%s tĂŠrkĂŠp "
 "betĂśltĂŠse"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 #, fuzzy
 msgid "Reading default config file"
 msgstr "Személyes konfigurációs fájl olvasása"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Személyes konfigurációs fájl olvasása"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Felbontás"
 
@@ -986,34 +1217,34 @@ msgstr "Felbont
 msgid "Riot Bomb"
 msgstr "Rohambomba"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Játék futtatása"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Üzenet: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "Görgetés a széleknél"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Görgetés a széleknél"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Szerver címe:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Interneten elérhetõ szerver"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Szerver mód"
 
@@ -1021,10 +1252,35 @@ msgstr "Szerver m
 msgid "Shotgun"
 msgstr "Sörétespuska"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Beállítások"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Forduló kihagyása"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Mesterlövészpuska"
@@ -1033,29 +1289,36 @@ msgstr "Mesterl
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr ""
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "Hangok"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Hanghatások"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Hangfrekvencia"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Hangok"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Új játék indítása"
 
@@ -1075,20 +1338,28 @@ msgstr "Szuperpingvin"
 msgid "Syringe"
 msgstr "Fecskendõ"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr ""
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "Csapatok"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "Csapatok"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Csapatok"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleport"
@@ -1102,11 +1373,11 @@ msgstr "A sz
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "A szõnyegbomba elhagyta a csatateret robbanás elõtt."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "A gnú elhagyta a csatateret robbanás elõtt"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "A borz elhagyta a csatateret robbanás elõtt"
 
@@ -1118,6 +1389,13 @@ msgstr "Az aut
 msgid "The ball left the battlefield before exploding"
 msgstr "A labda elhagyta a csatateret robbanás elõtt"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
@@ -1127,7 +1405,7 @@ msgstr ""
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "A diszkó-gránát elhagyta a táncparkettet robbanás elõtt"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1135,7 +1413,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr "A gránát elhagyta a csatateret robbanás elõtt"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr ""
 
@@ -1153,14 +1431,19 @@ msgstr "A szerver elutas
 msgid "The server rejected the connection: wrong password!"
 msgstr "A szerver elutasította a kapcsolatot."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Már csak %i csapat van."
 msgstr[1] "Már csak %i csapat van."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1176,7 +1459,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Eszközök"
 
@@ -1184,12 +1467,12 @@ msgstr "Eszk
 msgid "Unable to contact host."
 msgstr "Nem sikerült csatlakozni a kiszolgálóhoz."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Nem sikerült megnyitni a pályák könyvtárát (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, fuzzy, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Nem sikerült megnyitni a pályák könyvtárát (%s)!"
@@ -1198,85 +1481,110 @@ msgstr "Nem siker
 msgid "Unable to use this port!"
 msgstr "Nem sikerült megnyitni a portot!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(korlátlan)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Verzió"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Várj! %i játékos még nem áll készen!"
 msgstr[1] "Várj! %i játékos még nem áll készen!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Várakozás a szerverre, visszaléphetsz vagy csetelhetsz!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Fegyverek"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Honlap: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Mekkora vesztes ez a %s - egy sima pisztoly kinyírta!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Hulló dísztárgyak"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 #, fuzzy
 msgid "Winner"
 msgstr "Taposó akna"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux indítása..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux verzió "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 #, fuzzy
 msgid "You are alone :-/"
 msgstr "Egyedül vagy..."
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Egyedül vagy..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Választanod kell legalább egy pályát!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Választanod kell legalább két csapatot!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr ""
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Ez mellé ment!"
 
@@ -1285,22 +1593,27 @@ msgstr "Ez mell
 msgid "aka"
 msgstr ", ismertebb nevén"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
 "a bombing per turn"
 msgstr ""
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr ""
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "kész"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 #, fuzzy
 msgid "error parsing the config file"
 msgstr "Személyes konfigurációs fájl olvasása"
@@ -1310,16 +1623,16 @@ msgstr "Szem
 msgid "from"
 msgstr "a következõtõl:"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 #, fuzzy
 msgid "no configuration file!"
 msgstr "Hiba a konfigurációs fájl betöltése közben: %s"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "Zene betöltése"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "Hangprofil betöltése: %s"
@@ -1329,62 +1642,27 @@ msgstr "Hangprofil bet
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "Hangminõség: %d Hz, %d bit"
 
-#~ msgid "Connect !"
-#~ msgstr "Kapcsolódás!"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Kapcsolódás internetes játékhoz"
-
-#~ msgid "Refresh"
-#~ msgstr "Frissítés"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Hiba a csapat adatainak betöltése közben (%s):"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Hiba a konfigurációs fájl betöltése közben: %s"
-
-#, fuzzy
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Hiba a konfigurációs fájl betöltése közben: %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Hiba a(z) %s játékmód betöltése közben (%s fájl):"
-
-#, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "XML hiba a(z) '%s' pálya betöltése közben:"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s eltérõ verzióval próbál csatlakozni: kliens=%s, helyi=%s."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Siess, túl lassú vagy!!"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Biztosan ki szeretnél lépni? (Y/N)"
-
 #, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Hálózat elõkészítése"
-
-#~ msgid "(current)"
-#~ msgstr "(jelenlegi)"
+#~ msgid " has joined the party"
+#~ msgstr ""
+#~ "%s kiesett a "
+#~ "pĂĄlyĂĄrĂłl!"
 
 #, fuzzy
-#~ msgid ""
-#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
-#~ "blowtorch, submachine gun) and surely many other things don't work either!"
+#~ msgid " has left the party"
 #~ msgstr ""
-#~ "Néhány fegyver le lett tiltva ismert hibák miatt (ninja-kötél, "
-#~ "légkalapács, lángvágó, géppisztoly) és sok más dolog nem mûködik még!"
+#~ "%s kiesett a "
+#~ "pĂĄlyĂĄrĂłl!"
 
-#~ msgid ""
-#~ "WARNING!! Network is still under developement and therefore a little "
-#~ "experimental."
-#~ msgstr ""
-#~ "FIGYELEM!! A hálózat fejlesztés alatt áll, ezért még csak kísérleti "
-#~ "jellegû."
+#, fuzzy
+#~ msgid "%s has lost %u point of energy."
+#~ msgid_plural "%s has lost %u points of energy."
+#~ msgstr[0] ""
+#~ "%s energiaszintje %u egysĂŠggel "
+#~ "csĂśkkent."
+#~ msgstr[1] ""
+#~ "%s energiaszintje %u egysĂŠggel "
+#~ "csĂśkkent."
 
 #, fuzzy
 #~ msgid "%s team has won %u Gnu!"
@@ -1416,84 +1694,8 @@ msgstr "Hangmin
 #~ msgstr[0] "A(z) %s csapat nyert %u %st!"
 #~ msgstr[1] "A(z) %s csapat nyert %u %st!"
 
-#~ msgid ""
-#~ "WARNING! Disconnections are not yet handled. So you have to restart "
-#~ "Wormux after each disconnection!"
-#~ msgstr ""
-#~ "FIGYELEM! A lekapcsolódások még nem támogatottak. Minden lekapcsolódás "
-#~ "után újra kell indítanod a Wormuxot!"
-
-#~ msgid "Remote"
-#~ msgstr "Távoli"
-
-#~ msgid "Ninjarope"
-#~ msgstr "Ninja-kötél"
-
-#, fuzzy
-#~ msgid "Error while exporting file %s:"
-#~ msgstr ""
-#~ "Hiba lĂŠpett fel a csapat "
-#~ "betĂśltĂŠse "
-#~ "kĂśzben (%s):"
-
-#, fuzzy
-#~ msgid "Error while loading game mode %s from memory:"
-#~ msgstr ""
-#~ "Hiba lĂŠpett fel a csapat "
-#~ "betĂśltĂŠse "
-#~ "kĂśzben (%s):"
-
-#, fuzzy
-#~ msgid "Unexpected exception caught..."
-#~ msgstr ""
-#~ "Elkaptam egy vĂĄratlanul "
-#~ "fellĂŠpett "
-#~ "kivĂŠtelt..."
-
-#~ msgid "C++ exception caught:"
-#~ msgstr "Elfogtam egy C++ kivĂŠtelt:"
-
-#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
-#~ msgstr ""
-#~ "LegalalĂĄbb "
-#~ "kĂŠt csapatot kell "
-#~ "verbuvĂĄlnod a "
-#~ "jĂĄtĂŠkhoz! "
-#~ "Ezt a BeĂĄllĂ­"
-#~ "tĂĄsok "
-#~ "menĂźpont alatt teheted meg!"
-
-#, fuzzy
-#~ msgid " has joined the party"
-#~ msgstr ""
-#~ "%s kiesett a "
-#~ "pĂĄlyĂĄrĂłl!"
-
-#, fuzzy
-#~ msgid " has left the party"
-#~ msgstr ""
-#~ "%s kiesett a "
-#~ "pĂĄlyĂĄrĂłl!"
-
-#, fuzzy
-#~ msgid "Find a random position for characters"
-#~ msgstr ""
-#~ "A kukacok "
-#~ "vĂŠletlenszerĹą elhelyezĂŠse"
-
-#, fuzzy
-#~ msgid "%s has lost %u point of energy."
-#~ msgid_plural "%s has lost %u points of energy."
-#~ msgstr[0] ""
-#~ "%s energiaszintje %u egysĂŠggel "
-#~ "csĂśkkent."
-#~ msgstr[1] ""
-#~ "%s energiaszintje %u egysĂŠggel "
-#~ "csĂśkkent."
-
-#, fuzzy
-#~ msgid "%s team has won.\n"
-#~ msgstr "%s csapata nyert."
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "%s eltérõ verzióval próbál csatlakozni: kliens=%s, helyi=%s."
 
 #, fuzzy
 #~ msgid "'%s has won %u Anvil"
@@ -1537,6 +1739,9 @@ msgstr "Hangmin
 #~ "lĂŠgitĂĄmadĂĄs "
 #~ "nyert!"
 
+#~ msgid "(current)"
+#~ msgstr "(jelenlegi)"
+
 #~ msgid "Air attack"
 #~ msgstr "LĂŠgitĂĄmadĂĄs"
 
@@ -1556,6 +1761,9 @@ msgstr "Hangmin
 #~ msgid "Baseball"
 #~ msgstr "Baseball"
 
+#~ msgid "C++ exception caught:"
+#~ msgstr "Elfogtam egy C++ kivĂŠtelt:"
+
 #~ msgid "ClanLib error :"
 #~ msgstr "ClanLib hiba:"
 
@@ -1566,10 +1774,19 @@ msgstr "Hangmin
 #~ "betĂśltĂŠse "
 #~ "kĂśzben:"
 
+#~ msgid "Connect !"
+#~ msgstr "Kapcsolódás!"
+
+#~ msgid "Connect to an internet game"
+#~ msgstr "Kapcsolódás internetes játékhoz"
+
 #, fuzzy
 #~ msgid "Connected to "
 #~ msgstr "VĂŠge!"
 
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Biztosan ki szeretnél lépni? (Y/N)"
+
 #~ msgid "Duration of the end of a turn:"
 #~ msgstr "Egy fordulĂł ideje:"
 
@@ -1586,6 +1803,39 @@ msgstr "Hangmin
 #~ "betĂśltĂŠse "
 #~ "kĂśzben:"
 
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Hiba a csapat adatainak betöltése közben (%s):"
+
+#, fuzzy
+#~ msgid "Error while exporting file %s:"
+#~ msgstr ""
+#~ "Hiba lĂŠpett fel a csapat "
+#~ "betĂśltĂŠse "
+#~ "kĂśzben (%s):"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Hiba a konfigurációs fájl betöltése közben: %s"
+
+#, fuzzy
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Hiba a konfigurációs fájl betöltése közben: %s"
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Hiba a(z) %s játékmód betöltése közben (%s fájl):"
+
+#, fuzzy
+#~ msgid "Error while loading game mode %s from memory:"
+#~ msgstr ""
+#~ "Hiba lĂŠpett fel a csapat "
+#~ "betĂśltĂŠse "
+#~ "kĂśzben (%s):"
+
+#, fuzzy
+#~ msgid "Find a random position for characters"
+#~ msgstr ""
+#~ "A kukacok "
+#~ "vĂŠletlenszerĹą elhelyezĂŠse"
+
 #~ msgid "Info"
 #~ msgstr "InformĂĄciĂł"
 
@@ -1605,15 +1855,19 @@ msgstr "Hangmin
 #~ "%s fegyver "
 #~ "betĂśltĂŠse"
 
+#, fuzzy
+#~ msgid "Network deinitialization"
+#~ msgstr "Hálózat elõkészítése"
+
+#~ msgid "Ninjarope"
+#~ msgstr "Ninja-kötél"
+
 #~ msgid "Number of players per team:"
 #~ msgstr ""
 #~ "JĂĄtĂŠkosok "
 #~ "szĂĄma "
 #~ "csapatonkĂŠnt:"
 
-#~ msgid "Pause"
-#~ msgstr "SzĂźnet"
-
 #~ msgid "Please tell us your opinion of Wormux via email:"
 #~ msgstr ""
 #~ "KĂŠrjĂźk, "
@@ -1621,6 +1875,12 @@ msgstr "Hangmin
 #~ "vĂŠlemĂŠnyed "
 #~ "a WormuxrĂłl: "
 
+#~ msgid "Refresh"
+#~ msgstr "Frissítés"
+
+#~ msgid "Remote"
+#~ msgstr "Távoli"
+
 #, fuzzy
 #~ msgid "So you have to restart Wormux after each"
 #~ msgstr ""
@@ -1634,6 +1894,14 @@ msgstr "Hangmin
 #~ "ĂŠrvĂŠnyesĂ­"
 #~ "tĂŠsĂŠhez!"
 
+#, fuzzy
+#~ msgid ""
+#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
+#~ "blowtorch, submachine gun) and surely many other things don't work either!"
+#~ msgstr ""
+#~ "Néhány fegyver le lett tiltva ismert hibák miatt (ninja-kötél, "
+#~ "légkalapács, lángvágó, géppisztoly) és sok más dolog nem mûködik még!"
+
 #~ msgid "Sound error :"
 #~ msgstr "Hanghiba:"
 
@@ -1666,14 +1934,50 @@ msgstr "Hangmin
 #~ "kĂśnytĂĄrĂĄt "
 #~ "(%s)!"
 
+#, fuzzy
+#~ msgid "Unexpected exception caught..."
+#~ msgstr ""
+#~ "Elkaptam egy vĂĄratlanul "
+#~ "fellĂŠpett "
+#~ "kivĂŠtelt..."
+
 #~ msgid "Use sound?"
 #~ msgstr "Hang bekapcsolĂĄsa"
 
+#~ msgid ""
+#~ "WARNING! Disconnections are not yet handled. So you have to restart "
+#~ "Wormux after each disconnection!"
+#~ msgstr ""
+#~ "FIGYELEM! A lekapcsolódások még nem támogatottak. Minden lekapcsolódás "
+#~ "után újra kell indítanod a Wormuxot!"
+
+#~ msgid ""
+#~ "WARNING!! Network is still under developement and therefore a little "
+#~ "experimental."
+#~ msgstr ""
+#~ "FIGYELEM!! A hálózat fejlesztés alatt áll, ezért még csak kísérleti "
+#~ "jellegû."
+
 #, fuzzy
 #~ msgid "Weapon:"
 #~ msgstr "Fegyver"
 
 #, fuzzy
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "XML hiba a(z) '%s' pálya betöltése közben:"
+
+#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgstr ""
+#~ "LegalalĂĄbb "
+#~ "kĂŠt csapatot kell "
+#~ "verbuvĂĄlnod a "
+#~ "jĂĄtĂŠkhoz! "
+#~ "Ezt a "
+#~ "BeĂĄllĂ­"
+#~ "tĂĄsok "
+#~ "menĂźpont alatt teheted meg!"
+
+#, fuzzy
 #~ msgid "[Music] Error : file %s does not exist"
 #~ msgstr ""
 #~ "%s fĂĄjl nem "
diff --git a/po/it.po b/po/it.po
index 52a7e4f..ec07a98 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wormux\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-05-11 19:27+0100\n"
-"Last-Translator: mikima <mikimauri at gmail.com>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-08-13 17:47+0100\n"
+"Last-Translator: _Uno <uno at p2pforum.it>\n"
 "Language-Team: RebelCode <info at rebelcoders.org>; TeMpLeR <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -20,70 +20,80 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! La mappa %s non è stata trovata :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i giocatore connesso"
 msgstr[1] "%i giocatori conessi"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i giocatore pronto"
 msgstr[1] "%i giocatori pronti"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (squadra %s) è morto."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s>  chiamato %s da %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> da %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Squadra %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Squadra %s - Remoto"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s si è suicidato!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s è caduto nell'acqua."
+msgid "%s from %s team commited suicide!"
+msgstr "%s della squadra %s si è suicidato!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:751
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s è caduto fuori dalla mappa!"
+msgid "%s from %s team has died."
+msgstr "%s della squadra %s è morto."
+
+#: src/game/game.cpp:709
+#, c-format
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s della squadra %s è caduto nell'acqua!"
+
+#: src/game/game.cpp:703
+#, c-format
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s della squadra %s è caduto fuori dalla mappa!"
+
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s della squadra %s ha colpito il terreno troppo forte!"
+
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s della squadra %s è morto perché maldestro!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -92,16 +102,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "Il giocatore %s vince %u punto di vita !"
 msgstr[1] "Il giocatore %s vince %u punti di vita !"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s è uno psicopatico, ha ucciso un membro del suo team: %s !"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s è morto perché maldestro!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -125,21 +130,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "La squadra %s ha vinto %u Bazooka Cluster!"
 msgstr[1] "La squadra %s ha vinto %u Bazooka!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "La squadra %s ha vinto %u Gnu! Falli saltare, cowboy!"
 msgstr[1] "La squadra %s ha vinto %u Gnu! Falli saltare, cowboy!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "La squadra %s ha vinto %u Attacco Aereo!"
 msgstr[1] "La squadra %s ha vinto %u Attacchi Aerei!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -154,7 +159,7 @@ msgstr[1] ""
 "La squadra %s ha vinto %u Martelli Pneumatici! Non fare troppo rumore. "
 "Grazie, i tuoi vicini."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -210,7 +215,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "La squadra %s ha vinto %u Bomba Custer!"
 msgstr[1] "La squadra %s ha vinto %u Bombe Custer!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -251,7 +256,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "La squadra %s ha vinto %u Bomba Football!"
 msgstr[1] "La squadra %s ha vinto %u Bombe Antisommossa!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -272,14 +277,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "La squadra %s ha vinto %u Pistola!"
 msgstr[1] "La squadra %s ha vinto %u Pistole!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "La squadra %s ha vinto %u Jetpack! Contatto!"
 msgstr[1] "La squadra %s ha vinto %u Jetpack! Contatto!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -293,14 +298,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "La squadra %s ha vinto %u Mina!"
 msgstr[1] "La squadra %s ha vinto %u Mine!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "La squadra %s ha vinto %u Paracadute!"
 msgstr[1] "La squadra %s ha vinto %u Paracaduti!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -325,7 +330,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "La squadra %s ha vinto %u Cannamozza!"
 msgstr[1] "La squadra %s ha vinto %u Cannamozza!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "La squadra %s ha vinto %u Corda Ninja!"
+msgstr[1] "La squadra %s ha vinto %u Corde Ninja!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -370,23 +382,33 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "La squadra %s ha vinto %u Salta Turno! So che ti piacerà."
 msgstr[1] "La squadra %s ha vinto %u Salta Turno! So che ti piacerà."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "La squadra %s ha vinto %u Lancia-Tux! Mai visto un pinguino volare?"
 msgstr[1] "La squadra %s ha vinto %u Lancia-Tux! Mai visto un pinguino volare?"
 
+#: src/game/game_blitz.cpp:70
+#, fuzzy, c-format
+msgid "%s team was fragged down."
+msgstr "La squadra %s vince."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s ha portato un membro della squadra %s nella tomba con lui!"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(morto)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(Lingua di sistema)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(tempo sconosciuto)"
 
@@ -395,7 +417,7 @@ msgstr "(tempo sconosciuto)"
 msgid "(unlimited)"
 msgstr "(illimitato)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -404,7 +426,11 @@ msgstr ""
 "La nuova versione Wormux %s è disponibile, tu stai usando la %s. Puoi "
 "controllare se l'aggiornamento è disponibile per il tuo OS!"
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Inserisci una squadra personalizzata"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Attacco aereo"
 
@@ -412,10 +438,19 @@ msgstr "Attacco aereo"
 msgid "Airhammer"
 msgstr "Martello Pneumatico"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Tutte le squadre"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Gioca"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "ed il vincitore è..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -430,7 +465,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Incudine"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autori:"
 
@@ -454,6 +489,15 @@ msgstr "Mazza da Baseball"
 msgid "Bazooka"
 msgstr "Bazooka"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teletrasporto"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Fiamma Ossidrica"
@@ -466,8 +510,9 @@ msgstr "Pallina Rimbalzina"
 msgid "Bye bye tux..."
 msgstr "Ciao ciao tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Impossibile trovare la squadra %s!"
@@ -477,24 +522,72 @@ msgstr "Impossibile trovare la squadra %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Impossibile aprire la directory personale delle squadre (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Impossibile aprire la directory delle squadra (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Impossibile aprire la cartella (%s) delle squadre personalizzate!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Numero di caratteri:"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Paracadute"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Paracadute"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Ricerca aggiornamenti online?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Scegli casualmente tra le mappe disponibili"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Modalità cliente"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Il più maldestro"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Bomba Cluster"
@@ -507,7 +600,12 @@ msgstr "Cluzooka"
 msgid "Commit Suicide"
 msgstr "Suicidato"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "Nessun file di configurazione!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Conessione al gioco"
 
@@ -515,11 +613,11 @@ msgstr "Conessione al gioco"
 msgid "Connected !"
 msgstr "Connesso!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Kit Costruzione"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Controllato da:"
 
@@ -528,7 +626,7 @@ msgstr "Controllato da:"
 msgid "Couldn't fetch last version from %s"
 msgstr "Impossibile reperire l'ultima versione da %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Impossibile aprire il file %s"
@@ -537,11 +635,34 @@ msgstr "Impossibile aprire il file %s"
 msgid "Credits"
 msgstr "Crediti"
 
+#: src/menu/game_mode_editor.cpp:88
+#, fuzzy
+msgid "Damage per turn during death mode"
+msgstr "Danni per turno durante la death mode"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Cancella una squadra personalizzata"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Granata Disco"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Mostra questo messaggio"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+#, fuzzy
+msgid "Duration before death mode"
+msgstr "Durata prima della death mode"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Durata del turno:"
 
@@ -549,24 +670,35 @@ msgstr "Durata del turno:"
 msgid "Dynamite"
 msgstr "Dinamite"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "FINE DEL GIOCO"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Volume effetti"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energia"
+
+#: src/tool/error.cpp:63
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Errore in %s: %lu"
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Errore in %s:%lu (Wormux %s) : %s"
+
+#: src/include/action_handler.cpp:210
+#, fuzzy, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+"Errore inizializzando  la rete: Il client %s non è d'accordo con te!! - %s"
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Errore nel caricamento della squadra:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -574,7 +706,22 @@ msgstr ""
 "Errore nella creazione della directory \"%s\" : impossibile salvare il file "
 "di configurazione."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Errore nell'eliminazione della cartella \"%s\" : Impossibile eliminare la "
+"squadra personalizzata."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Errore nell'eliminazione del file \"%s\" : Impossibile eliminare la squadra "
+"personalizzata."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -584,35 +731,38 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Errore: connessione impossibile a %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr ""
-"Errore: impossibile connettersi all'indice del server per gestire il gioco"
+"Errore: impossibile connettersi all'indice del server per ospitare il gioco"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Errore: impossibile connettersi all'indice del server per cercare un gioco "
 "su internet"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Errore: impossibile avviare il server"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Errore: il tuo server non è raggiungibile da internet. Controlla la "
-"configurazione del tuo firewall"
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Errore: impossibile trovare l'aspetto \"%s\" per la squadra \"%s\"."
@@ -625,23 +775,32 @@ msgstr "Lanciafiamme"
 msgid "Football Bomb"
 msgstr "Bomba Football"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Schermo intero ?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Schermo intero ?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Partita"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Modalità di gioco"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Nome partita:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Lancia-Gnu"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr "Grafica"
 
@@ -649,11 +808,15 @@ msgstr "Grafica"
 msgid "Grapple"
 msgstr "Corda Ninja"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Gravità"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granata"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inizializzazione terreno..."
 
@@ -661,16 +824,16 @@ msgstr "Inizializzazione terreno..."
 msgid "Gun"
 msgstr "Pistola"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Directory HOME (environment variable $HOME) non esiste!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Buon gioco!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Comandante"
 
@@ -683,7 +846,11 @@ msgstr "Comandante:"
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Gestione della partita"
 
@@ -725,7 +892,11 @@ msgstr ""
 "Utilizzo: Click Sinitro sull'obbiettivo\n"
 "una munizione al turno"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Muoviti, sei troppo lento !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -733,7 +904,8 @@ msgstr ""
 "Se trovi un bug o se vuoi fare una richiesta specifica invia un email (in "
 "inglese, per favore) a :"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Energia iniziale"
 
@@ -748,7 +920,7 @@ msgstr ""
 "Fuoco: tieni premuto Spazio fino alla potenza voluta\n"
 "una munizione al turno"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inizializzazione"
 
@@ -756,31 +928,43 @@ msgstr "Inizializzazione"
 msgid "Initialise map"
 msgstr "Inizializzazione mappa"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inizializzazione suoni"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inizializzazione squadre"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
-msgstr "E' presente!"
+msgstr "E' un regalo!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Venite su #wormux in irc.freenode.net per trovare nuovi avversari."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Caccia i giocatori indicati da <nickname> fuori dal gioco"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Lingua"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Caricamento mappe :"
 
@@ -788,7 +972,7 @@ msgstr "Caricamento mappe :"
 msgid "Load teams:"
 msgstr "Caricamento squadre :"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Squadre in locale:"
 
@@ -796,13 +980,13 @@ msgstr "Squadre in locale:"
 msgid "LowGrav"
 msgstr "Antigravità"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "connessione manuale"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Mappa"
 
@@ -815,11 +999,15 @@ msgstr "Mappa %s, creata da :"
 msgid "Maps"
 msgstr "Mappa"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Energia iniziale"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Numero massimo di giocatori:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Numero massimo di FPS:"
 
@@ -827,39 +1015,44 @@ msgstr "Numero massimo di FPS:"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr "Varie"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Il più accurato"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Il più maldestro"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Il più traditore"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Il più utile"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Il più inutile"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Il più violento"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Paracadute"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Volume Musica"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Musica ?"
 
@@ -867,32 +1060,48 @@ msgstr "Musica ?"
 msgid "Network Game"
 msgstr "Gioco online"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Inizializzazione della rete"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Nuovo gioco online in"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Avviso nuovo giocatore?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Nessun elemento <%s> trovato nel file di conf. xml!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Nessuno!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Numero di caratteri:"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Numero di squadre:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opzioni"
@@ -905,42 +1114,55 @@ msgstr "Opzioni"
 msgid "Parachute"
 msgstr "Paracadute"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Il paracadute è attivato automaticamente."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr "Password:"
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pausa"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Gioca"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Giocatore"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Energia giocatore:"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Nome del giocatore?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Nome del giocatore?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Lanciatore di puzzole"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr "batttaglie pubbliche"
 
@@ -948,7 +1170,7 @@ msgstr "batttaglie pubbliche"
 msgid "Quit"
 msgstr "Esci"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Esci da Wormux"
 
@@ -956,19 +1178,24 @@ msgstr "Esci da Wormux"
 msgid "Quit battle"
 msgstr "abbandona battaglia"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Avvia il gioco"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "mappa casuale"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Lettura del file di configurazione default"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Lettura di un file di configurazione personale"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Risoluzione"
 
@@ -976,33 +1203,33 @@ msgstr "Risoluzione"
 msgid "Riot Bomb"
 msgstr "Bomba Antisommossa"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Avvia il gioco"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Dice:"
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr "Dimensione zona di scorrimento"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Scorrimento sui bordi"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Indirizzo server:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Server disponibile su Internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Modalità server"
 
@@ -1010,10 +1237,36 @@ msgstr "Modalità server"
 msgid "Shotgun"
 msgstr "Cannamozza"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Opzioni"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Salta Turno"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Schiaffo"
+
+#: src/weapon/slap.cpp:74
+#, fuzzy
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Schiaffeggia il nemico per farlo saltare un po'."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Fucile da Cecchino"
@@ -1022,28 +1275,35 @@ msgstr "Fucile da Cecchino"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Qualcuno ha messo una Trappola Esplosiva nella scatola!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Siacenti, attualmente non ci sono partite in attesa di giocatori"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Suono"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Effetti sonori ?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Frequenza del suono"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Opzioni del suono"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Avvia una nuova partita"
 
@@ -1063,18 +1323,27 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Siringa"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+#, fuzzy
+msgid "Talk in network battle"
+msgstr "Torna alla battaglia"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr "Grafici squadre"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr "statistiche squadre"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Squadre"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Editor squadre"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teletrasporto"
@@ -1088,11 +1357,11 @@ msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr ""
 "La Bomba Football  ha lasciato il campo di battaglia prima di esplodere"
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Lo Gnu ha lasciato il campo di battaglia prima di esplodere"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "La puzzola ha lasciato il campo di battaglia prima di esplodere"
 
@@ -1105,6 +1374,15 @@ msgid "The ball left the battlefield before exploding"
 msgstr ""
 "La pallina rimbalzina ha lasciato il campo di battaglia prima di esplodere"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Le versioni del client e del server sono incompatibili (locale=%s, server=%"
+"s). Prova un altro server."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
@@ -1114,7 +1392,7 @@ msgstr ""
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "La granata disco ha lasciato la pista daa ballo prima di esplodere"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "Il gioco è stato interrotto dato che ti sei disconnesso"
 
@@ -1122,7 +1400,7 @@ msgstr "Il gioco è stato interrotto dato che ti sei disconnesso"
 msgid "The grenade left the battlefield before exploding"
 msgstr "La granata ha lasciato il campo di battaglia prima di esplodere"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Gli altri ti stanno aspettando! Muoviti! :-)"
 
@@ -1139,14 +1417,19 @@ msgstr "Il server rifiuta la connessione."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Il server rifiuta la connessione: password errata!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Questa è solo %i squadra."
 msgstr[1] "Questi sono è solo %i squadre."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Ora"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1170,7 +1453,7 @@ msgstr ""
 "Fuoco: Spazio\n"
 "Una munizione epr turno"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Attrezzi"
 
@@ -1178,12 +1461,12 @@ msgstr "Attrezzi"
 msgid "Unable to contact host."
 msgstr "Impossibile contattare l'host."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Impossibile aprire la directory delle mappe (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Impossibile aprire la directory delle mappe personali (%s)!"
@@ -1192,83 +1475,108 @@ msgstr "Impossibile aprire la directory delle mappe personali (%s)!"
 msgid "Unable to use this port!"
 msgstr "Impossibile usare questa porta!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Comando sconosciuto"
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(illimitato)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Senza nome"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versione"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Verifica versione fallita: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Attendere! %i giocatore non è ancora pronto!"
 msgstr[1] "Attendere! %i giocatori non sono ancora pronti!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "In attesa del server, puoi chattare o disconnetterti"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Armi"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Sito web: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Che vergogna per %s: E' stato ucciso da una semplice pistola!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Particelle di vento?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Vincitore"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Avvio in corso..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Versione Wormux"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "CRC mappa errato!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Nome mappa errato!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Squadra errata!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Sei da solo :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Sei da solo..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Hai bisogno almeno di una mappa valida!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Hai bisogno almeno di due squadre valide !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Non puoi giocare senza scegliere una squadra!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Bersaglio mancato!"
 
@@ -1276,7 +1584,7 @@ msgstr "Bersaglio mancato!"
 msgid "aka"
 msgstr "alias"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1286,15 +1594,20 @@ msgstr ""
 "Bombardamento: Click Sinistro sill'obbiettivo\n"
 "un bombatrdamento per turno"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "Impossibile caricare configurazione"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "completo"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "Errore nel parsing del file di configurazione"
 
@@ -1302,15 +1615,15 @@ msgstr "Errore nel parsing del file di configurazione"
 msgid "from"
 msgstr "da"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "Nessun file di configurazione!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Scaricamento musica"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Caricamento impostazione suono: %s"
@@ -1320,65 +1633,50 @@ msgstr "o Caricamento impostazione suono: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o File audio aperto a %d Hz %d bit"
 
-#~ msgid "Connect !"
-#~ msgstr "Connessione!"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Connessione ad un gioco su internet"
-
-#~ msgid "Refresh"
-#~ msgstr "Aggiorna"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Errore nel caricamento della squadra %s :"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Errore nel caricamento del file di configurazione : %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Errore nel caricamento del file di configurazione default: %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Errore nel caricamento del modo del gioco %s (file %s) :"
+#~ msgid "Automatically join a game"
+#~ msgstr "Unisciti automaticamente a una partita"
 
 #, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "Errore XML nell'avvio della mappa '%s' :"
+#~ msgid ""
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
+#~ msgstr ""
+#~ "Nessun server pubblico disponibile e impostazioni di connessione manuale "
+#~ "errati. Prova a collegarti manualmente."
 
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
 #~ msgstr ""
-#~ "%s cerca di connettersi con una versione differente: cliente=%s, server=%"
-#~ "s."
+#~ "Errore: il tuo server non è raggiungibile da internet. Controlla la "
+#~ "configurazione del tuo firewall"
 
-#~ msgid "And the winner is..."
-#~ msgstr "ed il vincitore è..."
+#, fuzzy
+#~ msgid "  Most sold-out  :  "
+#~ msgstr "  Most sold-out :  %s (%i).\n"
 
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Muoviti, sei troppo lento !!"
+#, fuzzy
+#~ msgid "  Most useful   :  "
+#~ msgstr "  Il più utile :  %s (%i).\n"
 
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Sei sicuro di voler uscire ? (S/N)"
+#, fuzzy
+#~ msgid "  Most useless  :  "
+#~ msgstr "  Il meno utile  :  %s (%i).\n"
 
 #, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Inizializzazione della rete"
+#~ msgid "  Most violent  :  "
+#~ msgstr "  Il più violento  :  %s (%i).\n"
 
-#~ msgid "(current)"
-#~ msgstr "(corrente)"
+#~ msgid " has joined the party"
+#~ msgstr "si è unito alla partita"
 
-#~ msgid ""
-#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
-#~ "blowtorch, submachine gun) and surely many other things don't work either!"
-#~ msgstr ""
-#~ "Alcune armi sono disattivate, poiché sono all'origine di bug conosciuti "
-#~ "(Corda Ninja, Fiamma Ossidrica, Mitragliatrice) e sicuramente potrebbero "
-#~ "essercene degli altri!"
+#~ msgid " has left the party"
+#~ msgstr "è uscito dalla partita"
 
-#~ msgid ""
-#~ "WARNING!! Network is still under developement and therefore a little "
-#~ "experimental."
-#~ msgstr ""
-#~ "ATTENZIONE! La rete è ancora in sviluppo e perciò in via sperimentale."
+#~ msgid "%s has lost %u point of energy."
+#~ msgid_plural "%s has lost %u points of energy."
+#~ msgstr[0] "Il giocatore '%s' ha perso %u punto di vita."
+#~ msgstr[1] "Il giocatore '%s' ha perso %u punti di vita."
 
 #~ msgid "%s team has won %u Gnu!"
 #~ msgid_plural "%s team has won %u Gnus!"
@@ -1405,81 +1703,10 @@ msgstr "o File audio aperto a %d Hz %d bit"
 #~ msgstr[0] "La squadra %s ha vinto %u arma inaspettata!"
 #~ msgstr[1] "La squadra %s ha vinto %u armi inaspettate!"
 
-#~ msgid ""
-#~ "WARNING! Disconnections are not yet handled. So you have to restart "
-#~ "Wormux after each disconnection!"
-#~ msgstr ""
-#~ "ATTENZIONE! Le disconnessioni non sono gestite. Dovete riavviare Wormux "
-#~ "dopo ogni disconnessione!"
-
-#~ msgid "Remote"
-#~ msgstr "Distante"
-
-#~ msgid "Ninjarope"
-#~ msgstr "Corda Ninja"
-
-#, fuzzy
-#~ msgid "Error while exporting file %s:"
-#~ msgstr "Errore nell'esportazione del gioco modo %s (file %s):"
-
-#~ msgid "Error while loading game mode %s from memory:"
-#~ msgstr "Errore nel caricamento del gioco modo %s dalla memoria:"
-
-#~ msgid "Unexpected exception caught..."
-#~ msgstr "Errore inatteso intercettato..."
-
-#~ msgid "C++ exception caught:"
-#~ msgstr "Eccezione C++:"
-
-#~ msgid "Failed to initialize network library!"
-#~ msgstr "Impossibile inizializzare la libreria di rete!"
-
-#~ msgid "Initialisation of TTF library failed: %s"
-#~ msgstr "Inizializzazione delle librerie TTF fallita: %s"
-
-#~ msgid "Unable to initialize SDL library: %s"
-#~ msgstr "Impossibile avviare le librerie SDL: %s"
-
-#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
 #~ msgstr ""
-#~ "Hai bisogno di almeno due squadre : cambia le impostazione nel menu "
-#~ "'Opzioni' !"
-
-#~ msgid "general: "
-#~ msgstr "generale"
-
-#~ msgid " has joined the party"
-#~ msgstr "si è unito alla partita"
-
-#~ msgid " has left the party"
-#~ msgstr "è uscito dalla partita"
-
-#~ msgid "Find a random position for characters"
-#~ msgstr "Trova una posizione casuale"
-
-#, fuzzy
-#~ msgid "  Most sold-out  :  "
-#~ msgstr "  Most sold-out :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most useful   :  "
-#~ msgstr "  Il più utile :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most useless  :  "
-#~ msgstr "  Il meno utile  :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most violent  :  "
-#~ msgstr "  Il più violento  :  %s (%i).\n"
-
-#~ msgid "%s has lost %u point of energy."
-#~ msgid_plural "%s has lost %u points of energy."
-#~ msgstr[0] "Il giocatore '%s' ha perso %u punto di vita."
-#~ msgstr[1] "Il giocatore '%s' ha perso %u punti di vita."
-
-#~ msgid "%s team has won.\n"
-#~ msgstr "La squadra %s vince.\n"
+#~ "%s cerca di connettersi con una versione differente: cliente=%s, server=%"
+#~ "s."
 
 #, fuzzy
 #~ msgid "'%s has won %u Anvil"
@@ -1499,6 +1726,9 @@ msgstr "o File audio aperto a %d Hz %d bit"
 #~ msgstr[0] "Il giocatore '%s vince %u attaccho aereo !"
 #~ msgstr[1] "Il giocatore '%s vince %u attacchi aerei !"
 
+#~ msgid "(current)"
+#~ msgstr "(corrente)"
+
 #~ msgid "* Couldn't initialize SDL: "
 #~ msgstr "* Impossibile avviare le librerie SDL:"
 
@@ -1522,28 +1752,65 @@ msgstr "o File audio aperto a %d Hz %d bit"
 #~ msgid "Baseball"
 #~ msgstr "Baseball"
 
+#~ msgid "C++ exception caught:"
+#~ msgstr "Eccezione C++:"
+
 #~ msgid "ClanLib error :"
 #~ msgstr "Errore ClanLib :"
 
+#~ msgid "Connect !"
+#~ msgstr "Connessione!"
+
+#~ msgid "Connect to an internet game"
+#~ msgstr "Connessione ad un gioco su internet"
+
 #, fuzzy
 #~ msgid "Connected to "
 #~ msgstr "Fine della partita"
 
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Sei sicuro di voler uscire ? (S/N)"
+
 #~ msgid "Duration of the end of a turn:"
 #~ msgstr "Durata della fine del turno :"
 
 #~ msgid "End of the game!\n"
 #~ msgstr "Fine della partita !\n"
 
-#~ msgid "Energy:"
-#~ msgstr "Vita:"
-
 #~ msgid "Error during loading skin %s:"
 #~ msgstr "Errore nel caricamento della skin %s:"
 
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Errore nel caricamento della squadra %s :"
+
+#, fuzzy
+#~ msgid "Error while exporting file %s:"
+#~ msgstr "Errore nell'esportazione del gioco modo %s (file %s):"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Errore nel caricamento del file di configurazione : %s"
+
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Errore nel caricamento del file di configurazione default: %s"
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Errore nel caricamento del modo del gioco %s (file %s) :"
+
+#~ msgid "Error while loading game mode %s from memory:"
+#~ msgstr "Errore nel caricamento del gioco modo %s dalla memoria:"
+
+#~ msgid "Failed to initialize network library!"
+#~ msgstr "Impossibile inizializzare la libreria di rete!"
+
+#~ msgid "Find a random position for characters"
+#~ msgstr "Trova una posizione casuale"
+
 #~ msgid "Info"
 #~ msgstr "Informazione"
 
+#~ msgid "Initialisation of TTF library failed: %s"
+#~ msgstr "Inizializzazione delle librerie TTF fallita: %s"
+
 #~ msgid "Is it a gift?"
 #~ msgstr "È un regalo ?"
 
@@ -1558,24 +1825,39 @@ msgstr "o File audio aperto a %d Hz %d bit"
 #~ msgid "Load weapon %s"
 #~ msgstr "Caricamento mappa %s"
 
+#, fuzzy
+#~ msgid "Network deinitialization"
+#~ msgstr "Inizializzazione della rete"
+
+#~ msgid "Ninjarope"
+#~ msgstr "Corda Ninja"
+
 #~ msgid "Number of players per team:"
 #~ msgstr "Numero di giocatori per squadra :"
 
-#~ msgid "Pause"
-#~ msgstr "Pausa"
-
 #~ msgid "Please tell us your opinion of Wormux via email:"
 #~ msgstr "Perpiacere dai la tua impressione di Wormux via email:"
 
+#~ msgid "Refresh"
+#~ msgstr "Aggiorna"
+
+#~ msgid "Remote"
+#~ msgstr "Distante"
+
 #~ msgid "Riot bomb"
 #~ msgstr "Bazooka automatico"
 
-#~ msgid "Select the teams:"
-#~ msgstr "Seleziona la squadra:"
-
 #~ msgid "Select the world:"
 #~ msgstr "Seleziona la mappa:"
 
+#~ msgid ""
+#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
+#~ "blowtorch, submachine gun) and surely many other things don't work either!"
+#~ msgstr ""
+#~ "Alcune armi sono disattivate, poiché sono all'origine di bug conosciuti "
+#~ "(Corda Ninja, Fiamma Ossidrica, Mitragliatrice) e sicuramente potrebbero "
+#~ "essercene degli altri!"
+
 #~ msgid "Sound error :"
 #~ msgstr "Errore sonoro :"
 
@@ -1596,17 +1878,33 @@ msgstr "o File audio aperto a %d Hz %d bit"
 #~ msgid "Unable to contact top server!"
 #~ msgstr "Impossibile aprire la directory delle mappe (%s)!"
 
+#~ msgid "Unable to initialize SDL library: %s"
+#~ msgstr "Impossibile avviare le librerie SDL: %s"
+
 #, fuzzy
 #~ msgid "Unable to join the game..."
 #~ msgstr "Impossibile aprire la directory delle skin (%s)!"
 
-#~ msgid "Unknow action"
-#~ msgstr "Azione ignota"
+#~ msgid "Unexpected exception caught..."
+#~ msgstr "Errore inatteso intercettato..."
 
 #, fuzzy
 #~ msgid "Use sound?"
 #~ msgstr "Usa il suono"
 
+#~ msgid ""
+#~ "WARNING! Disconnections are not yet handled. So you have to restart "
+#~ "Wormux after each disconnection!"
+#~ msgstr ""
+#~ "ATTENZIONE! Le disconnessioni non sono gestite. Dovete riavviare Wormux "
+#~ "dopo ogni disconnessione!"
+
+#~ msgid ""
+#~ "WARNING!! Network is still under developement and therefore a little "
+#~ "experimental."
+#~ msgstr ""
+#~ "ATTENZIONE! La rete è ancora in sviluppo e perciò in via sperimentale."
+
 #~ msgid "Wait for map"
 #~ msgstr "Aspetto la mappa"
 
@@ -1626,6 +1924,15 @@ msgstr "o File audio aperto a %d Hz %d bit"
 #~ msgid "Weapon:"
 #~ msgstr "Armi :"
 
+#, fuzzy
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "Errore XML nell'avvio della mappa '%s' :"
+
+#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgstr ""
+#~ "Hai bisogno di almeno due squadre : cambia le impostazione nel menu "
+#~ "'Opzioni' !"
+
 #~ msgid "[Music] Error : Unable to load music file: %s"
 #~ msgstr "[Music] Errore: Impossibile scaricare il file di musica: %s"
 
@@ -1646,3 +1953,6 @@ msgstr "o File audio aperto a %d Hz %d bit"
 
 #~ msgid "[Sound] Error: File %s does not exist"
 #~ msgstr "[Sound] Errore: il File %s non esiste"
+
+#~ msgid "general: "
+#~ msgstr "generale"
diff --git a/po/lv.po b/po/lv.po
index caa05fd..8024e9a 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wormux-lv\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2007-08-25 12:48+0300\n"
 "Last-Translator: Raivis Dejus <orvils at gmail.com>\n"
 "Language-Team: Latvian <locale at laka.lv>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Karte %s nav atrasta :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
@@ -31,7 +31,7 @@ msgstr[0] "%i spēlētājs pieslēdzies"
 msgstr[1] "%i spēlētāji pieslēgušies"
 msgstr[2] "%i spēlētāju pieslēgušies"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
@@ -39,52 +39,62 @@ msgstr[0] "%i spēlētājs gatavs"
 msgstr[1] "%i spēlētāji gatavi"
 msgstr[2] "%i spēlētāju gatavi"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s ) ir nomiris."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> aka %s no %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> no %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "%s komanda"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s komanda - attālināta"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s izdara pašnāvību !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s izdara pašnāvību !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s ) ir nomiris."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s iekrita ūdenī."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s nokrita no kartes!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s ir miris, jo bija pārāk neveikls!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -93,16 +103,11 @@ msgstr[0] "%s ir ieguvis %u enerģijas punktu!"
 msgstr[1] "%s ir ieguvis %u enerģijas punktus!"
 msgstr[2] "%s ir ieguvis %u enerģijas punktus!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, fuzzy, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s ir manjaks, viņš nogalināja %s komandas dalībnieku!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s ir miris, jo bija pārāk neveikls!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -127,7 +132,7 @@ msgstr[0] "%s komanda ir ieguvusi %u bazuku!"
 msgstr[1] "%s komanda ir ieguvusi %u bazukas!"
 msgstr[2] "%s komanda ir ieguvusi %u bazukas!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, fuzzy, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
@@ -135,7 +140,7 @@ msgstr[0] "%s komanda ir ieguvusi %u lēkājošo bumbu!"
 msgstr[1] "%s komanda ir ieguvusi %u lēkājošās bumbas!"
 msgstr[2] "%s komanda ir ieguvusi %u lēkājošās bumbas!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
@@ -143,7 +148,7 @@ msgstr[0] "%s komanda ir ieguvusi %u gaisa uzlidojumu!"
 msgstr[1] "%s komanda ir ieguvusi %u gaisa uzlidojumus!"
 msgstr[2] "%s komanda ir ieguvusi %u gaisa uzlidojumus!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -155,7 +160,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, fuzzy, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -214,7 +219,7 @@ msgstr[0] "%s komanda ir ieguvusi %u Ä·ekarbumbu!"
 msgstr[1] "%s komanda ir ieguvusi %u Ä·ekarbumbas!"
 msgstr[2] "%s komanda ir ieguvusi %u Ä·ekarbumbas!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, fuzzy, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -255,7 +260,7 @@ msgstr[0] "%s komanda ir ieguvusi %u dumpja bumbu!"
 msgstr[1] "%s komanda ir ieguvusi %u dumpja bumbas!"
 msgstr[2] "%s komanda ir ieguvusi %u dumpja bumbas!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -279,7 +284,7 @@ msgstr[0] "%s komanda ir ieguvusi %u pistoli!"
 msgstr[1] "%s komanda ir ieguvusi %u pistoles!"
 msgstr[2] "%s komanda ir ieguvusi %u pistoles!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
@@ -287,7 +292,7 @@ msgstr[0] "%s komanda ir ieguvusi %u raķešsomu!"
 msgstr[1] "%s komanda ir ieguvusi %u raķešsomas!"
 msgstr[2] "%s komanda ir ieguvusi %u raķešsomas!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, fuzzy, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -303,7 +308,7 @@ msgstr[0] "%s komanda ir ieguvusi %u mīnu!"
 msgstr[1] "%s komanda ir ieguvusi %u mīnas!"
 msgstr[2] "%s komanda ir ieguvusi %u mīnas!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
@@ -311,7 +316,7 @@ msgstr[0] "%s komanda ir ieguvusi %u parašūtu!"
 msgstr[1] "%s komanda ir ieguvusi %u parašūtus!"
 msgstr[2] "%s komanda ir ieguvusi %u parašūtus!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, fuzzy, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -335,7 +340,15 @@ msgstr[0] "%s komanda ir ieguvusi %u bisi!"
 msgstr[1] "%s komanda ir ieguvusi %u bises!"
 msgstr[2] "%s komanda ir ieguvusi %u bises!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "%s komanda ir ieguvusi %u āķi!"
+msgstr[1] "%s komanda ir ieguvusi %u āķus!"
+msgstr[2] "%s komanda ir ieguvusi %u āķus!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -384,7 +397,7 @@ msgstr[0] "%s komanda ir ieguvusi %u gajiena izlaišanu!"
 msgstr[1] "%s komanda ir ieguvusi %u gajiena izlaišanas!"
 msgstr[2] "%s komanda ir ieguvusi %u gajiena izlaišanas!"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, fuzzy, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -392,16 +405,26 @@ msgstr[0] "%s komanda ir ieguvusi %u tux šāvēju!"
 msgstr[1] "%s komanda ir ieguvusi %u tux šāvējus!"
 msgstr[2] "%s komanda ir ieguvusi %u tux šāvējus!"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(mirusi)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr ""
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -410,14 +433,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(bezgalība)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Gaisa uzlidojums"
 
@@ -425,10 +452,19 @@ msgstr "Gaisa uzlidojums"
 msgid "Airhammer"
 msgstr "Perforators"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Visas komandas"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Spēlēt"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Un uzvarētājs ir..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -443,7 +479,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Lakta"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autori:"
 
@@ -467,6 +503,15 @@ msgstr "Beisbola nūja"
 msgid "Bazooka"
 msgstr "Bazuka"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleportācija"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Gāzes deglis"
@@ -479,8 +524,9 @@ msgstr "Lēkājosā bumba"
 msgid "Bye bye tux..."
 msgstr "Attā attā tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Nevar atrast komandu %s!"
@@ -490,24 +536,72 @@ msgstr "Nevar atrast komandu %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Nevar atvēŗt komandas mapi (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Nevar atvēŗt komandas mapi (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Nevar atvēŗt komandas mapi (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Rakstzīmju skaits"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Paršūts"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Paršūts"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Klienta režīms"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Visneveiklākais"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Ķekarbumba"
@@ -521,7 +615,12 @@ msgstr "Bazuka"
 msgid "Commit Suicide"
 msgstr "Izdarīt pašnvību"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "Kļūda ielādējot konfigurācijas failu: %s"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Pieslēgties spēlei"
 
@@ -529,11 +628,11 @@ msgstr "Pieslēgties spēlei"
 msgid "Connected !"
 msgstr "Pieslēdzies !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Būvniecība"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Kontrolē: "
 
@@ -542,7 +641,7 @@ msgstr "Kontrolē: "
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr ""
@@ -551,11 +650,32 @@ msgstr ""
 msgid "Credits"
 msgstr "Veidotāji"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Disko granāta"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Gājiena ilgums"
 
@@ -563,30 +683,51 @@ msgstr "Gājiena ilgums"
 msgid "Dynamite"
 msgstr "Dinamīts"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "SPÄ’LES BEIGAS"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Kļūda %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Kļūda ielādējot komandu :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr "Kļūda veidojot mapi \"%s\": nevar sglabāt konfigurācijas failu."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "Kļūda veidojot mapi \"%s\": nevar sglabāt konfigurācijas failu."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "Kļūda veidojot mapi \"%s\": nevar sglabāt konfigurācijas failu."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -596,31 +737,37 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Kļūda: Nevar pieslēgties %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Kļūda: Nevar sazināties ar indeksa serveri, lai izvietotu spēli"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Kļūda: Nevar sazināties ar indeksa serveri, lai meklētu interneta spēles"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Kļūda: Nevar sākt serveri"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Kļūda: Nevar atrast ķermeni \"%s\" komandai \"%s\"."
@@ -634,23 +781,33 @@ msgstr ""
 msgid "Football Bomb"
 msgstr "Dumpja bumba"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Pa visu ekrānu?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Pa visu ekrānu?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "Klienta režīms"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr ""
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnu šāvējs"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -658,11 +815,15 @@ msgstr ""
 msgid "Grapple"
 msgstr "Āķis"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granāta"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Laukuma veidošana..."
 
@@ -670,16 +831,16 @@ msgstr "Laukuma veidošana..."
 msgid "Gun"
 msgstr "Pistole"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "MĀJAS mape (vides mainīgias $HOME) nav atrasts!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Lai jums jauka spēle!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Virspavēlnieks"
 
@@ -692,7 +853,11 @@ msgstr "Virspavēlnieks: "
 msgid "Help"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Izveidot spēli"
 
@@ -736,7 +901,11 @@ msgstr ""
 "Kā to izmantot : kreizais klikšķis uz mērķa\n"
 "munīcija gājienā"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Pasteidzies, tu esi par lēnu !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -744,7 +913,8 @@ msgstr ""
 "Ja esat atraduši kādu kļūdu vai jums ir kādi ieteikumi vai vēlmes sūtiet "
 "mums epastu (angļu valodā lūdzu):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Enerģija"
 
@@ -759,7 +929,7 @@ msgstr ""
 "Šaut: turiet atstarpes taustiņu līdz sasniegts vēlamais šāviena spēks\n"
 "munīcija gājienā"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inicializācija"
 
@@ -767,33 +937,45 @@ msgstr "Inicializācija"
 msgid "Initialise map"
 msgstr "Gatavo karti"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Gatavo skaņas"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Gatavo komandas"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Tā ir dāvana!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Raķešsoma"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 "Pievienojies #wormux kanālam irc.freenode.net serverī, lai atrastu "
 "pretiniekus."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr ""
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Ielādē kartes:"
 
@@ -801,7 +983,7 @@ msgstr "Ielādē kartes:"
 msgid "Load teams:"
 msgstr "Ielādē komandas:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Lokālās komandas:"
 
@@ -809,13 +991,13 @@ msgstr "Lokālās komandas:"
 msgid "LowGrav"
 msgstr "Antigravitācija"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "Kartes"
@@ -829,11 +1011,16 @@ msgstr "Karte %s, autors:  "
 msgid "Maps"
 msgstr "Kartes"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Enerģija"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "MAksimālais spēlētāju skaits:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maksimālais FPS"
 
@@ -841,40 +1028,45 @@ msgstr "Maksimālais FPS"
 msgid "Mine"
 msgstr "MÄ«na"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "MÅ«zika?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr ""
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Visneveiklākais"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Vis nodevīgākais"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Vis noderīgākais"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Vis bezjēdzīgākais"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Vis asiņainākais"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Paršūts"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "MÅ«zika?"
 
@@ -882,33 +1074,49 @@ msgstr "MÅ«zika?"
 msgid "Network Game"
 msgstr "Tīkla spēle"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Tīkla inicializācija"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
 msgstr "Tīkla spēle"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "<%s> elementi nav atrasti xml konfigurācijas failā!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Neviens!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Rakstzīmju skaits"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Komandu skaits:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Iestatījumi"
@@ -922,42 +1130,55 @@ msgstr "Iestatījumi"
 msgid "Parachute"
 msgstr "Paršūts"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Parašūts aktivizējas automātiski."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Spēlēt"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Spēlētājs"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Spēlētāja enerģija?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Spēlētāja vārds?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Spēlētāja vārds?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Sesku šāvējs"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Ports:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr ""
 
@@ -965,7 +1186,7 @@ msgstr ""
 msgid "Quit"
 msgstr "Iziet"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Iziet no Wormux"
 
@@ -973,21 +1194,26 @@ msgstr "Iziet no Wormux"
 msgid "Quit battle"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Sākt spēli"
+
+#: src/menu/map_selection_box.cpp:228
 #, fuzzy
 msgid "Random map"
 msgstr "Ielādē kartes:"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 #, fuzzy
 msgid "Reading default config file"
 msgstr "Lasa personisko konfigurācijas failu"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Lasa personisko konfigurācijas failu"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Izšķirtspēja"
 
@@ -995,34 +1221,34 @@ msgstr "Izšķirtspēja"
 msgid "Riot Bomb"
 msgstr "Dumpja bumba"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Sākt spēli"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Teikt: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "Ritināt karti"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Ritināt karti"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Servera adrese:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Serveris pieejams internetā"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Servera režīms"
 
@@ -1030,10 +1256,35 @@ msgstr "Servera režīms"
 msgid "Shotgun"
 msgstr "Bise"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Iestatījumi"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Izlaist gājienu"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Snaiperšautene"
@@ -1042,29 +1293,36 @@ msgstr "Snaiperšautene"
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr ""
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "Skaņas"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Skaņas efekti?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Skaņas frekvence"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Skaņas"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Sāk jaunu spēli"
 
@@ -1084,20 +1342,28 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Šļirce"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr ""
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "Komandas"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "Komandas"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Komandas"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportācija"
@@ -1111,11 +1377,11 @@ msgstr "Ķekarbumba nokrita no spēles laukuma pirms paguva uzsprāgt."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Ķekarbumba nokrita no spēles laukuma pirms paguva uzsprāgt."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnu nokrita no spēles laukuma pirms paguva uzsprāgt"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Sesks nokrita no spēles laukuma pirms paguva uzsprāgt"
 
@@ -1127,6 +1393,13 @@ msgstr "Automātiksā raķete izgāja no spēles laukuma..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Bumba nokrita no spēles laukuma pirms paguva uzsprāgt"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "Savienojuma noildze. Pārbaudiet vai tam netraucē ugunssiena!"
@@ -1135,7 +1408,7 @@ msgstr "Savienojuma noildze. Pārbaudiet vai tam netraucē ugunssiena!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Disko granāta nokrita no spēles laukuma pirms paguva uzsprāgt"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1143,7 +1416,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr "Granāta nokrita no spēles laukuma pirms paguva uzsprāgt"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Citi gaida uz tevi! Dari kaut ko :-)"
 
@@ -1161,7 +1434,7 @@ msgstr "Serveris noraidīja savienojumu."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Serveris noraidīja savienojumu."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
@@ -1169,7 +1442,12 @@ msgstr[0] "Ir tikai %i komanda."
 msgstr[1] "Ir tikai %i komandas."
 msgstr[2] "Ir tikai %i komandas."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1193,7 +1471,7 @@ msgstr ""
 "Šaut : atstarpes taustiņš\n"
 "munīcija gājienā"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "RÄ«ki"
 
@@ -1201,12 +1479,12 @@ msgstr "RÄ«ki"
 msgid "Unable to contact host."
 msgstr "Nevar pieslēgties."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Nevar atvērt karšu mapi (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, fuzzy, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Nevar atvērt karšu mapi (%s)!"
@@ -1215,20 +1493,29 @@ msgstr "Nevar atvērt karšu mapi (%s)!"
 msgid "Unable to use this port!"
 msgstr "Nevar izmantot Å¡o portu!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(bezgalība)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versija"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
@@ -1236,63 +1523,79 @@ msgstr[0] "Pagaidi! %i spēlētājs vēl nav gatavs!"
 msgstr[1] "Pagaidi! %i spēlētāji vēl nav gatavs!"
 msgstr[2] "Pagaidi! %i spēlētāju vēl nav gatavs!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Gaida uz serveri, jūs varat atcelt vai tērzēt!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Ieroči"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Mākas lapa: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Kauns un negods %s - viņu nogalināja ar vienkāršu ieroci!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Vējš?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Uzvarētājs"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux ielādējas..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux versija "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "JÅ«s esat viens pats :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "JÅ«s esat viens pats..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Jums nepieciešama vismaz viena derīga karte !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Jums nepieciešamas vismaz divas derīgas komandas !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr ""
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Jūs netrāpijāt!"
 
@@ -1300,7 +1603,7 @@ msgstr "Jūs netrāpijāt!"
 msgid "aka"
 msgstr "aka"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1310,15 +1613,20 @@ msgstr ""
 "Bombardēšana : kreisais klikšķis uz mērķa\n"
 "bombardēšana gājienā"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr ""
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "darīts"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 #, fuzzy
 msgid "error parsing the config file"
 msgstr "Lasa personisko konfigurācijas failu"
@@ -1327,16 +1635,16 @@ msgstr "Lasa personisko konfigurācijas failu"
 msgid "from"
 msgstr "no"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 #, fuzzy
 msgid "no configuration file!"
 msgstr "Kļūda ielādējot konfigurācijas failu: %s"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Ielādē mūsiku"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Ielādē skaņas profilu: %s"
@@ -1346,50 +1654,6 @@ msgstr "o Ielādē skaņas profilu: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Atver skaņu %d Hz %d bit"
 
-#~ msgid "Connect !"
-#~ msgstr "Pieslēgties !"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Pieslēgties spēlei internetā"
-
-#~ msgid "Refresh"
-#~ msgstr "Atjaunināt"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Kļūda ielādējot komandas datus %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Kļūda ielādējot konfigurācijas failu: %s"
-
-#, fuzzy
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Kļūda ielādējot konfigurācijas failu: %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Kļūda ielādējot spēles režīmu %s (fails %s):"
-
-#, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "XML kļūda ielādējot karti '%s' :"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr ""
-#~ "%s mēģina pieslēgties ar atšķirīgu programmas versiju : klientam=%s, man=%"
-#~ "s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "Un uzvarētājs ir..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Pasteidzies, tu esi par lēnu !!"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Vai tiešām vēlaties iziet? (Y/N)"
-
-#, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Tīkla inicializācija"
-
 #~ msgid "%s team has won %u Gnu!"
 #~ msgid_plural "%s team has won %u Gnus!"
 #~ msgstr[0] "%s komanda ir ieguvusi %u Gnu!"
@@ -1420,9 +1684,43 @@ msgstr "o Atver skaņu %d Hz %d bit"
 #~ msgstr[1] "%s komanda ir ieguvusi %u negaidītus ieročus!"
 #~ msgstr[2] "%s komanda ir ieguvusi %u negaidītus ieročus!"
 
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr ""
+#~ "%s mēģina pieslēgties ar atšķirīgu programmas versiju : klientam=%s, man=%"
+#~ "s."
+
 #~ msgid "(current)"
 #~ msgstr "(pašreizējā)"
 
+#~ msgid "Connect !"
+#~ msgstr "Pieslēgties !"
+
+#~ msgid "Connect to an internet game"
+#~ msgstr "Pieslēgties spēlei internetā"
+
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Vai tiešām vēlaties iziet? (Y/N)"
+
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Kļūda ielādējot komandas datus %s:"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Kļūda ielādējot konfigurācijas failu: %s"
+
+#, fuzzy
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Kļūda ielādējot konfigurācijas failu: %s"
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Kļūda ielādējot spēles režīmu %s (fails %s):"
+
+#, fuzzy
+#~ msgid "Network deinitialization"
+#~ msgstr "Tīkla inicializācija"
+
+#~ msgid "Refresh"
+#~ msgstr "Atjaunināt"
+
 #~ msgid ""
 #~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
 #~ "blowtorch, submachine gun) and surely many other things don't work either!"
@@ -1443,3 +1741,7 @@ msgstr "o Atver skaņu %d Hz %d bit"
 #~ msgstr ""
 #~ "UZMANĪBU!! Tīkla spēle joprojām tiek veidota un tapēs tajā ir iespējamas "
 #~ "sīkas kļūdiņas."
+
+#, fuzzy
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "XML kļūda ielādējot karti '%s' :"
diff --git a/po/nb.po b/po/nb.po
index ef7344e..4d6ff3a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,80 +7,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.8\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2007-12-26 21:33-0000\n"
-"Last-Translator: Christian LOMSDALEN <christian at vindstille.net>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-05-26 21:38+0100\n"
+"Last-Translator: Christian Lomsdalen <christian at vindstille.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! %s-kartet ble ikke funnet :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i spiller tilkoblet"
 msgstr[1] "%i spillere tilkoblet"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] " %i spiller klar"
 msgstr[1] " %i spillere klare"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) døde."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> dit %s fra %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> fra %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "%s -laget"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s -laget - Fjernstyrt"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s tok selvmord !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s bps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s tok selvmord !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s) døde."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s har falt i vannet"
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s har falt av kartet !"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s døde fordi han klønet det til!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -88,16 +98,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s har fått %u livspoeng !"
 msgstr[1] "%s har fått %u livspoeng !"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s er sinnsyk, han har drept et medlem av %s-laget !"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s døde fordi han klønet det til!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -121,21 +126,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "%s-laget har vunnet %u Cluster kanon !"
 msgstr[1] "%s-laget har vunnet %u Cluster kanoner !"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "%s-laget har vunnet %u Gnu, Spreng alle Cowboy !"
 msgstr[1] "%s-laget har vunnet %u Gnuer, Spreng alle Cowboy !"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "%s-laget har vunnet %u luftangrep !"
 msgstr[1] "%s-laget har vunnet %u luftangrep !"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -150,7 +155,7 @@ msgstr[1] ""
 "%s laget har vunnet %u lufthammere! Ikke bråk for mye med dem! På forhånd "
 "takk,Naboene"
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -206,7 +211,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "%s-laget har vunnet %u klasebombe !"
 msgstr[1] "%s-laget har vunnet %u klasebomber !"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -242,7 +247,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "%s-laget har vunnet %u fotballbombe !"
 msgstr[1] "%s-laget har vunnet %u fotballbomber !"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -263,14 +268,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "%s-laget har vunnet %u pistol !"
 msgstr[1] "%s-laget har vunnet %u pistoler !"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "%s-laget har vunnet %u jetmotor !"
 msgstr[1] "%s-laget har vunnet %u jetmotorer !"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -285,14 +290,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "%s-laget har vunnet %u mine !"
 msgstr[1] "%s-laget har vunnet %u miner !"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "%s-laget har vunnet %u fallskjerm !"
 msgstr[1] "%s-laget har vunnet %u fallskjermer !"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -313,7 +318,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "%s-laget har vunnet %u hagle !"
 msgstr[1] "%s-laget har vunnet %u hagler !"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "%s-laget har vunnet %u slag !"
+msgstr[1] "%s-laget har vunnet %u slag !"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -360,7 +372,7 @@ msgstr[1] ""
 "%s-laget har vunnet %u muligheter til å hoppe over en runde, du vil elske "
 "det !"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -369,16 +381,26 @@ msgstr[0] ""
 msgstr[1] ""
 "%s-laget har vunnet %u Tux-kastere, har du aldri sett en flygende pingvin?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "%s laget ble meiet ned"
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(død)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(systemspråk)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(ukjent tid)"
 
@@ -387,7 +409,7 @@ msgstr "(ukjent tid)"
 msgid "(unlimited)"
 msgstr "(uendelig)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -396,7 +418,11 @@ msgstr ""
 "En ny versjon, %s, er tilgjengelig, din versjon er %s. Du bør sjekke om en "
 "oppdatering er tilgjengelig for ditt operativsystem!"
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Luftangrep"
 
@@ -404,10 +430,19 @@ msgstr "Luftangrep"
 msgid "Airhammer"
 msgstr "Lufthammer"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Alle lag"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Spill"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Og vinneren er..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -421,7 +456,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Ambolt"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Forfattere :"
 
@@ -445,6 +480,15 @@ msgstr "Balltre"
 msgid "Bazooka"
 msgstr "Rakettkaster"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleportering"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Sveiseapparat"
@@ -457,8 +501,9 @@ msgstr "Sprettball"
 msgid "Bye bye tux..."
 msgstr "Hadé tux!!"
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Kan ikke finne %s-laget !"
@@ -468,24 +513,72 @@ msgstr "Kan ikke finne %s-laget !"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Kan ikke åpne den personlige lagmappen (%s) !"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Kan ikke åpne lagmappen (%s) !"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Kan ikke åpne den personlige lagmappen (%s) !"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Antall lagmedlemmer"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Fallskjerm"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Fallskjerm"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Sjekke oppdateringer online?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Velg tilfeldig mellom forskjellige kart"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Mottagermodus"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Mest klønete"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Klasebombe"
@@ -498,7 +591,12 @@ msgstr "Cluster kanon"
 msgid "Commit Suicide"
 msgstr "Ta selvmord"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "Konfigurasjonsfilen ble ikke funnet!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Koble til et spill"
 
@@ -506,11 +604,11 @@ msgstr "Koble til et spill"
 msgid "Connected !"
 msgstr "Tilkoblet !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Konstruer"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Kontrollert av: "
 
@@ -519,7 +617,7 @@ msgstr "Kontrollert av: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Kunne ikke hente siste versjon fra %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Kunne ikke laste filen %s"
@@ -528,11 +626,32 @@ msgstr "Kunne ikke laste filen %s"
 msgid "Credits"
 msgstr "Heder og ære"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Skade per runde i dødsmodus"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Diskogranat"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Viser denne meldingen"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Tidsrom før dødsmodus"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Varighet per runde"
 
@@ -540,31 +659,54 @@ msgstr "Varighet per runde"
 msgid "Dynamite"
 msgstr "Dynamitt"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "Spillet er slutt"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Effektsvolum"
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Liv"
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Feil i %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Lasting av %s-laget feilet :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr ""
 "Katalogen \"%s\" kunne ikke lages: konfigurasjonsfilen kunne ikke lagres"
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Katalogen \"%s\" kunne ikke lages: konfigurasjonsfilen kunne ikke lagres"
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Katalogen \"%s\" kunne ikke lages: konfigurasjonsfilen kunne ikke lagres"
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -574,34 +716,38 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Tilkobling til %s:%s feilet"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Tilkobling til Oversiktstjener for å starte et spill feilet"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Tilkobling til Oversiktstjener feilet i forsøket på å søke etter et "
 "internettspill"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Start av tjener feilet"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Feil: Din server er ikke tilgjengelig fra internett, sjekk "
-"brannmurinstillingene dine."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Kan ikke finne utseendet \"%s\" til \"%s\"-laget."
@@ -614,35 +760,48 @@ msgstr "Flammekaster"
 msgid "Football Bomb"
 msgstr "Fotballbombe"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Full skjerm ?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Full skjerm ?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
-msgstr ""
+msgstr "Spill"
+
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Spill modus:"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Spill navn:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnu-kaster"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
-msgstr ""
+msgstr "Grafikk"
 
 #: src/weapon/grapple.cpp:166
 msgid "Grapple"
 msgstr "Entrehaker"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Tyngdekraft"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granat"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Laster kart ..."
 
@@ -650,16 +809,16 @@ msgstr "Laster kart ..."
 msgid "Gun"
 msgstr "Pistol"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "HOME mappen(miljøvariabel $HOME) kunne ikke bli funnet !"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Ha et godt spill !"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Kommandant"
 
@@ -672,7 +831,11 @@ msgstr "Kommandant"
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Hold et spill"
 
@@ -707,7 +870,11 @@ msgid ""
 "an ammo per turn"
 msgstr "Hvordan bruke den : venstreklikk på måleten ammo per runde"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Kjapp deg, du er for treg !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -715,7 +882,8 @@ msgstr ""
 "Hvis du finner en feil eller ønsker en funksjon, send oss gjerne en epost "
 "(på engelsk):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Livspoeng ved start"
 
@@ -729,7 +897,7 @@ msgstr ""
 "Første skytevinkel : Opp/NedSkyt : Hold mellomromstasten nede til riktig "
 "styrke er nådden ammo per runde"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Starter"
 
@@ -737,31 +905,43 @@ msgstr "Starter"
 msgid "Initialise map"
 msgstr "Laster kart"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Laster lyder"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Laster lagene"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Det er en gave !"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Rakettryggsekk"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Oppsøk #wormux-fr på  irc.freenode.net for å finne motstandere."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Spillerne som <nickname> har valgt ut er sparket ut av spillet"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "språk"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Last kart :"
 
@@ -769,22 +949,21 @@ msgstr "Last kart :"
 msgid "Load teams:"
 msgstr "Last lagene :"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Lokale lag :"
 
 #: src/weapon/lowgrav.cpp:49
 msgid "LowGrav"
-msgstr "Lav gravitet"
+msgstr "Lav tyngdekraft"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
-msgstr ""
+msgstr "Manuell tilkobling"
 
-#: src/menu/game_menu.cpp:84
-#, fuzzy
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Kart"
 
@@ -797,11 +976,16 @@ msgstr "%s-kartet, er laget av :"
 msgid "Maps"
 msgstr "Kart"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Livspoeng ved start"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Maksimalt antall deltagere :"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maksimum BPS"
 
@@ -809,72 +993,93 @@ msgstr "Maksimum BPS"
 msgid "Mine"
 msgstr "Mine"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
-msgstr ""
+msgstr "Diverse"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Mest treffsikker"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Mest klønete"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Mest utsolgt"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Mest brukbar"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Mest ubrukbar"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Mest voldelig"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Fallskjerm"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Musikkvolum"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
-msgstr ""
+msgstr "Musikk?"
 
 #: src/menu/main_menu.cpp:63
 msgid "Network Game"
 msgstr "Nettverksspill"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Starter nettverk ..."
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Nytt nettverksspill på"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Ikke noe element <%s> kunne bli funnet i konfigurasjonsfilet for XML !"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Ingen!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Antall lagmedlemmer"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Antall lag :"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Alternativer"
@@ -887,51 +1092,63 @@ msgstr "Alternativer"
 msgid "Parachute"
 msgstr "Fallskjerm"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Fallskjermen blir automatisk aktivert."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
+msgstr "Passord:"
+
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
 msgstr ""
 
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Spill"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Spiller"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Spillers livsenergi ?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Spillers navn ?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Spillers navn ?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Ilder-kaster"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port :"
 
-#: src/menu/network_connection_menu.cpp:155
-#, fuzzy
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
-msgstr "Forlat slaget"
+msgstr "Offentlige kamper"
 
 #: src/menu/main_menu.cpp:75
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Avslutt Wormux"
 
@@ -939,19 +1156,24 @@ msgstr "Avslutt Wormux"
 msgid "Quit battle"
 msgstr "Forlat slaget"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Spill spillet"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Tilfeldig kart"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Laster standard konfigurasjonsfil"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Laster personlig konfigurasjonsfil"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Resolusjon"
 
@@ -959,34 +1181,33 @@ msgstr "Resolusjon"
 msgid "Riot Bomb"
 msgstr "Opprørsbombe"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Spill spillet"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Si: "
 
-#: src/menu/options_menu.cpp:84
-#, fuzzy
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
-msgstr "Rull på kanten"
+msgstr "Størrelse på rullekant"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Rull på kanten"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Tjeneradresse :"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Tjener er tilgjengelig på internett"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Tjenermodus"
 
@@ -994,10 +1215,35 @@ msgstr "Tjenermodus"
 msgid "Shotgun"
 msgstr "Hagle"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Alternativer"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Hopp over en runde"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Slag"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Slå fienden for å få han til å hoppe litt"
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Snikskytterrifle"
@@ -1006,30 +1252,35 @@ msgstr "Snikskytterrifle"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Noen har plassert en felle i krateret!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Beklager, for øyeblikket er det ingen spill som venter på spillere"
 
-#: src/menu/options_menu.cpp:178
-#, fuzzy
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Lyder"
 
-#: src/menu/options_menu.cpp:149
-#, fuzzy
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
-msgstr "Lydstyrke ?"
+msgstr "Lydeffekter?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Lydstyrke ?"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Lyder"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Laster et nytt spill"
 
@@ -1049,20 +1300,27 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Sprøyte"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
 #, fuzzy
+msgid "Talk in network battle"
+msgstr "Tilbake til slaget"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
-msgstr "Lag"
+msgstr "Laggrafer"
 
-#: src/menu/results_menu.cpp:378
-#, fuzzy
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
-msgstr "Lag"
+msgstr "Lagstatistikk"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Lag"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportering"
@@ -1075,11 +1333,11 @@ msgstr "Klasebomben forsvant fra kampplassen uten å eksplodere."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Fotballbomben forsvant fra kampplassen uten å eksplodere."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnu'en forsvant fra kampplassen uten å eksplodere."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Ilderen forsvant fra kampplassen uten å eksplodere."
 
@@ -1091,17 +1349,24 @@ msgstr "Den laserstyrte raketten forsvant fra kampplassen uten å eksplodere."
 msgid "The ball left the battlefield before exploding"
 msgstr "Sprettballen forsvant fra kampplassen uten å eksplodere."
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Tjener og klientversjonene er ukompatible (klient=%s, tjener=%s).Vennligst "
+"prøv en annen tjener."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
-msgstr ""
-"Tilkoblingen brukte for lang tid. Sjekk om en brannmur blokkerer for "
-"tilkoblingen !"
+msgstr "Tilkoblingen brukte for lang tid. Sjekk om en brannmur blokkerer!"
 
 #: src/weapon/disco_grenade.cpp:127
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Diskogranaten har forlatt dansegulvet uten å eksplodere"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "Spillet ble avbrutt fordi du ble frakoblet."
 
@@ -1109,7 +1374,7 @@ msgstr "Spillet ble avbrutt fordi du ble frakoblet."
 msgid "The grenade left the battlefield before exploding"
 msgstr "Granaten forsvant fra kampplassen uten å eksplodere."
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "De andre venter på deg, Våkn opp :-)"
 
@@ -1126,14 +1391,19 @@ msgstr "Tjeneren nektet tilkoblingen"
 msgid "The server rejected the connection: wrong password!"
 msgstr "Tjeneren nektet tilkoblingen: feil passord!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Det er i øyeblikket %i lag."
 msgstr[1] "Det er i øyeblikket %i lag."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Tid"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1155,7 +1425,7 @@ msgstr ""
 "Opp/NedSkyt : Hold mellomromstasten nede til riktig styrke er nådden ammo "
 "per runde"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Verktøy"
 
@@ -1163,12 +1433,12 @@ msgstr "Verktøy"
 msgid "Unable to contact host."
 msgstr "Umulig å koble til tjeneren."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "kunne ikke åpne kartmappen (%s) !"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "kunne ikke åpne den personlige kartmappen (%s) !"
@@ -1177,83 +1447,108 @@ msgstr "kunne ikke åpne den personlige kartmappen (%s) !"
 msgid "Unable to use this port!"
 msgstr "Kunne ikke bruke denne porten  !"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Ukjent kommando"
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(uendelig)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versjon"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Versjonsjekken feilet fordi: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Vent ! %i spiller er ikke klar enda !"
 msgstr[1] "Vent ! %i spillere er ikke klare enda !"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Venter på server, alt du kan gjøre er å avbryte eller chatte"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "VÃ¥pen"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Webside : "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "For en skam for %s : han ble drept av en liten pistol !"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Vindpartikler ?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Vinner"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Laster Wormux ..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux versjon "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Du er alene :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Du er alene..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Du må ha i hvert fall ett godkjent kart !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Du må ha minst to godkjente lag!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Du kan ikke spille uten å ha valgt et lag"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Du bommet"
 
@@ -1261,7 +1556,7 @@ msgstr "Du bommet"
 msgid "aka"
 msgstr "kjent som"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1269,15 +1564,20 @@ msgid ""
 msgstr ""
 "angrepsretning: venstre/høyreå bombe: ventreklikk på måleten bombe per runde"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "Kunne ikke laste konfigurasjonsfilen"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "ferdig"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "Feil under lasting av konfigurasjonsfil"
 
@@ -1285,15 +1585,15 @@ msgstr "Feil under lasting av konfigurasjonsfil"
 msgid "from"
 msgstr "fra"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "Konfigurasjonsfilen ble ikke funnet!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
-msgstr "Laster musikk"
+msgstr "o Laster musikk"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Kunne ikke laste lydprofilen : %s"
@@ -1301,7 +1601,14 @@ msgstr "o Kunne ikke laste lydprofilen : %s"
 #: src/sound/jukebox.cpp:89
 #, c-format
 msgid "o Opened audio at %d Hz %d bit"
-msgstr "Åpnet lyden på %d Hz %d bit"
+msgstr "o Åpnet lydfilen på %d Hz %d bit"
+
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Feil: Din server er ikke tilgjengelig fra internett, sjekk "
+#~ "brannmurinstillingene dine."
 
 #~ msgid "Connect !"
 #~ msgstr "Koble til !"
diff --git a/po/nl.po b/po/nl.po
index daa1f4a..3402bda 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wormux 0.5\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-05-12 11:22+0100\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-03 19:11+0100\n"
 "Last-Translator: Paul Smits <paul.l.smits at gmail.com>\n"
 "Language-Team: Dutch <nl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,70 +19,80 @@ msgstr ""
 "X-Poedit-Country: NETHERLANDS\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Kaart %s niet gevonden :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i speler maakte verbinding"
 msgstr[1] "%i spelers maakten verbinding"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i speler is gereed"
 msgstr[1] "%i spelers zijn gereed"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) is overleden."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
-msgstr "%s <%s> aka %s van %s"
+msgstr "%s <%s> aka %s uit %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
-msgstr "%s <%s> van %s"
+msgstr "%s <%s> uit %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Team %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Team %s - Op afstand"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s pleegde zelfmoord !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s is in het water gevallen."
+msgid "%s from %s team commited suicide!"
+msgstr "%s van team %s pleegde zelfmoord!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:751
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s is van de kaart gevallen!"
+msgid "%s from %s team has died."
+msgstr "%s van team %s is overleden."
+
+#: src/game/game.cpp:709
+#, c-format
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s van team %s is in het water gevallen."
+
+#: src/game/game.cpp:703
+#, c-format
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s van team %s is van de kaart gevallen!"
+
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s van team %s heeft de grond te hard geraakt!"
+
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s van team %s is dood door zijn onhandigheid!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -91,16 +101,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s heeft %u punt energie gekregen!"
 msgstr[1] "%s heeft %u punten energie gekregen!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s is een psychopaat, hij vermoorde een lid van team %s!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s is dood door zijn onhandigheid!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -124,21 +129,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "Team %s heeft %u clusterbazooka gekregen!"
 msgstr[1] "Team %s heeft %u clusterbazooka's gekregen!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "Team %s heeft %u Gnu gekregen! Blaas ze allemaal op, cowboy!"
 msgstr[1] "Team %s heeft %u Gnus gekregen! Blaas ze allemaal op, cowboy!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "Team %s heeft %u luchtaanval gekregen!"
 msgstr[1] "Team %s heeft %u luchtaanvallen gekregen!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -153,7 +158,7 @@ msgstr[1] ""
 "Team %s heeft %u drilboren gekregen! Maak er niet te veel herrie mee! "
 "Bedankt, uw buren."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -209,7 +214,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "Team %s heeft %u clusterbom gekregen!"
 msgstr[1] "Team %s heeft %u clusterbommen gekregen!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -249,7 +254,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "Team %s heeft %u voetbalbom gekregen!"
 msgstr[1] "Team %s heeft %u voetbalbommen gekregen!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -270,14 +275,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "Team %s heeft %u geweer gekregen!"
 msgstr[1] "Team %s heeft %u geweren gekregen!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "Team %s heeft %u jetpack gekregen"
 msgstr[1] "Team %s heeft %u jetpacks gekregen"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -292,14 +297,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "Team %s heeft %u mijn gekregen!"
 msgstr[1] "Team %s heeft %u mijnen gekregen!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "Team %s heeft %u parachute gekregen!"
 msgstr[1] "Team %s heeft %u parachutes gekregen!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -322,7 +327,15 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "Team %s heeft %u jachtgeweer gekregen!"
 msgstr[1] "Team %s heeft %u jachtgeweren gekregen!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Team %s heeft %u slag gekregen!"
+msgstr[1] ""
+"Team %s heeft %u slagen gekregen! Probeer dit maar eens te ontwijken!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -374,7 +387,7 @@ msgstr[1] ""
 "Team %s heeft %u keer een beurt overslaan gekregen! Ik weet dat u daar gek "
 "op bent."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -384,16 +397,26 @@ msgstr[1] ""
 "Team %s heeft %u tux lanceerders gekregen! Nog nooit een pinguïn zien "
 "vliegen?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "Team %s is afgeslacht."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s nam een lid van team %s met zich mee in het graf!"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(dood)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(systeemtaal)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(onbekende tijd)"
 
@@ -402,7 +425,7 @@ msgstr "(onbekende tijd)"
 msgid "(unlimited)"
 msgstr "(onbegrensd)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -411,7 +434,11 @@ msgstr ""
 "Er is een nieuwe versie, %s, beschikbaar. Uw versie is %s. Controleer of er "
 "een update beschikbaar is voor uw besturingssysteem!"
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Aangepast team toevoegen"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Luchtaanval"
 
@@ -419,10 +446,18 @@ msgstr "Luchtaanval"
 msgid "Airhammer"
 msgstr "Drilboor"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Alle teams"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Altijd"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "En de winnaar is..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -437,7 +472,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Aambeeld"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Auteurs:"
 
@@ -461,6 +496,14 @@ msgstr "Honkbalknuppel"
 msgid "Bazooka"
 msgstr "Bazooka"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Alvorens actie"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Blitz"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Snijbrander"
@@ -473,8 +516,9 @@ msgstr "Stuiterbal"
 msgid "Bye bye tux..."
 msgstr "Dag dag tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Kan team %s niet vinden!"
@@ -484,24 +528,69 @@ msgstr "Kan team %s niet vinden!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Kan persoonlijke-teamsdirectory niet openen (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Kan teams directory niet openen (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Kan aangepaste teamsdirectory niet openen (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Camera centreren op karakter"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Actief karakter veranderen"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Richthoek veranderen"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Wapencategorie veranderen"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Wapenteller veranderen"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Karakter"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Karakter schakeling"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Online op updates controleren?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Kies een willekeurige kaart"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Klassiek"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Klik: Camera op het karakter richten"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Client modus"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Onhandigste"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Clusterbom"
@@ -514,7 +603,11 @@ msgstr "Clusterbazooka"
 msgid "Commit Suicide"
 msgstr "Pleeg Zelfmoord"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Configuratie menu"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Verbind met spel"
 
@@ -522,11 +615,11 @@ msgstr "Verbind met spel"
 msgid "Connected !"
 msgstr "Verbonden !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Bouw"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Bestuurd door: "
 
@@ -535,7 +628,7 @@ msgstr "Bestuurd door: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Kon de laatste versie van %s niet verwerven"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Kon bestand %s niet openen"
@@ -544,11 +637,32 @@ msgstr "Kon bestand %s niet openen"
 msgid "Credits"
 msgstr "Credits"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Schade per beurt tijdens doodsmodus"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Aangepast team verwijderen"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Disco Granaat"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Laat dit bericht zien"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Slepen: Camera bewegen"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Duur voor doodsmodus"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Duur van een beurt"
 
@@ -556,24 +670,36 @@ msgstr "Duur van een beurt"
 msgid "Dynamite"
 msgstr "Dynamiet"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "EINDE VAN HET SPEL"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Effecten volume"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energie"
+
+#: src/tool/error.cpp:63
+#, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Fout in %s:%lu (Wormux %s) : %s"
+
+#: src/include/action_handler.cpp:210
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Fout in %s:%lu"
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+"Fout bij het initialiseren van het netwerk: Client %s is het niet met je "
+"eens!! - %s"
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Fout bij het laden van team :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -581,7 +707,22 @@ msgstr ""
 "Fout bij het aanmaken van directory \"%s\": kon configuratiebestand niet "
 "opslaan."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Fout bij het verwijderen van het pad \"%s\": kon het aangepaste team niet "
+"wissen."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Fout bij het verwijderen van het bestand \"%s\": kon configuratiebestand "
+"niet wissen."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -591,32 +732,38 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Fout: Kon niet verbinden met %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Fout: Kon indexserver niet bereiken om een spel te hosten"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "Fout: Kon indexserver niet bereiken om naar een internetspel te zoeken"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Fout: Kon server niet starten"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 "Fout: Uw server is niet bereikbaar vanaf het internet. Controleer uw "
-"firewall configuratie."
+"firewall instellingen: TCP Poort %s moet connecties van buitenaf toestaan. "
+"Contoleer uw router configuratie wanneer u niet direct met het internet "
+"verbonden bent: TCP Poort %s moet doorgestuurd worden naar deze computer."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Fout: kan het lichaam \"%s\" voor het team \"%s\" niet vinden."
@@ -629,23 +776,31 @@ msgstr "Vlammenwerper"
 msgid "Football Bomb"
 msgstr "Voetbalbom"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Volledig scherm / venster"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Volledig scherm?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Spel"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Spelmodus"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Spel naam:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnu Lanceren"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr "Grafisch"
 
@@ -653,11 +808,15 @@ msgstr "Grafisch"
 msgid "Grapple"
 msgstr "Haak"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Zwaartekracht"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granaat"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Initialiseren van de grond..."
 
@@ -665,16 +824,16 @@ msgstr "Initialiseren van de grond..."
 msgid "Gun"
 msgstr "Geweer"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Kon HOME directory (omgevingsvariabele $HOME) niet vinden!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Succes!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Hoofdcommandant"
 
@@ -687,7 +846,11 @@ msgstr "Hoofdcommandant: "
 msgid "Help"
 msgstr "Help"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Hoge sprong"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Host een spel"
 
@@ -729,7 +892,11 @@ msgstr ""
 "Hoe te gebruiken : klik met de linkermuisknop op het doel\n"
 "slechts een per beurt"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Snel, u bent te langzaam !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -737,7 +904,8 @@ msgstr ""
 "Als u een bug hebt gevonden of een feature wilt aanvragen stuur ons dan een "
 "e-mail (graag in het Engels):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Initiële energie"
 
@@ -752,7 +920,7 @@ msgstr ""
 "Vuur : houd de spatiebalk ingedrukt tot de gewenste sterkte\n"
 "slechts een per beurt"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Initialisatie"
 
@@ -760,31 +928,43 @@ msgstr "Initialisatie"
 msgid "Initialise map"
 msgstr "Initialiseer kaart"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Initialiseer geluiden"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Initialiseer teams"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "Het is een cadeau!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Bezoek #wormux op irc.freenode.net om tegenstanders te vinden."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Sprong"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Achterwaartse sprong"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Kickt de spelers onder de naam <nickname> uit het spel"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Taal"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Kaarten worden geladen:"
 
@@ -792,7 +972,7 @@ msgstr "Kaarten worden geladen:"
 msgid "Load teams:"
 msgstr "Teams worden geladen:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Lokale teams:"
 
@@ -800,13 +980,13 @@ msgstr "Lokale teams:"
 msgid "LowGrav"
 msgstr "LageZwaartekracht"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "Handmatige verbinding"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Kaart"
 
@@ -819,11 +999,15 @@ msgstr "Kaart %s, gemaakt door :"
 msgid "Maps"
 msgstr "Kaarten"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Maximale energie"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Max aantal spelers:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maximum FPS"
 
@@ -831,39 +1015,43 @@ msgstr "Maximum FPS"
 msgid "Mine"
 msgstr "Mijn"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr "Overigen"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Nauwkeurigste"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Onhandigste"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Meest uitverkocht"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Meest zinvol"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Meest zinloos"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Meest gewelddadig"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Camera met muis of pijltjestoetsen bewegen"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Bewegen"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Muziek volume"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Muziek?"
 
@@ -871,32 +1059,48 @@ msgstr "Muziek?"
 msgid "Network Game"
 msgstr "Netwerk Spel"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Netwerk wordt geïnitialiseerd"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Nooit"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Nieuw netwerkspel op"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Waarschuwing bij nieuwe speler?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Element <%s> niet gevonden het xml config bestand!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Niemand!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Aantal tekens"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Aantal teams:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "Op een karakter: Veranderen wie actief is"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "Op het slagveld: Een doelwit selecteren"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opties"
@@ -909,42 +1113,54 @@ msgstr "Opties"
 msgid "Parachute"
 msgstr "Parachute"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Parachute wordt automatisch geactiveerd."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr "Wachtwoord:"
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pauze"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Spelen"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Speel meerdere keren"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Speler"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Energie van speler?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Naam van speler"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Naam van speler?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
-msgstr "Poolkat Lanceren"
+msgstr "Stinkdier Lanceren"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr "Openbare gevechten"
 
@@ -952,7 +1168,7 @@ msgstr "Openbare gevechten"
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Wormux afsluiten"
 
@@ -960,19 +1176,23 @@ msgstr "Wormux afsluiten"
 msgid "Quit battle"
 msgstr "Beëindig gevecht"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Spel afsluiten"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Willekeurige kaart"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Standaard configbestand wordt gelezen"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Persoonlijk config bestand wordt gelezen"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Resolutie"
 
@@ -980,33 +1200,33 @@ msgstr "Resolutie"
 msgid "Riot Bomb"
 msgstr "Rellenbom"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Spel wordt gestart"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Zeg: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr "Scroll-rand grootte"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Scroll bij de rand"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Serveradres:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Server beschikbaar op internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Server modus"
 
@@ -1014,10 +1234,34 @@ msgstr "Server modus"
 msgid "Shotgun"
 msgstr "Jachtgeweer"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Wapenmenu weergeven"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Interface verbergen"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Minikaart verbergen"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Beurt overslaan"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Slaan"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Sla de vijand om hem een beetje te laten springen."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Nauwkeuriger richten en lopen"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Scherpschuttersgeweer"
@@ -1026,28 +1270,38 @@ msgstr "Scherpschuttersgeweer"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Iemand heeft een fopcadeau gemaakt!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Sorry, er is op dit moment geen spel dat op spelers wacht"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Sorry, uw versie wordt niet meer ondersteund. Ondersteunde versies zijn %s. "
+"U kunt een nieuwere versie downloaden op http://www.wormux.org/wiki/download."
+"php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Geluid"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Geluidseffecten?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Geluids- frequentie"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Geluiden"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Starten van een nieuw spel"
 
@@ -1067,18 +1321,26 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Injectienaald"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Chatten tijdens netwerkstrijd"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr "Team grafieken"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr "Team statistieken"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Teams"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Team-editor"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportatie"
@@ -1091,13 +1353,13 @@ msgstr "De Clusterbom heeft het slagveld verlaten alvorens te ontploffen."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "De voetbalbom heeft het slagveld verlaten alvorens te ontploffen."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "De Gnu heeft het slagveld verlaten alvorens te ontploffen"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
-msgstr "De Poolkat heeft het slagveld verlaten alvorens te ontploffen"
+msgstr "Het Stinkdier heeft het slagveld verlaten alvorens te ontploffen"
 
 #: src/weapon/auto_bazooka.cpp:175
 msgid "The automatic rocket has left the battlefield..."
@@ -1107,6 +1369,15 @@ msgstr "De automatische raket heeft het slagveld verlaten..."
 msgid "The ball left the battlefield before exploding"
 msgstr "De bal heeft het slagveld verlaten alvorens te ontploffen"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"De versie van de client en die van de server zijn niet compatibel (lokaal=%"
+"s, server=%s). Probeer een andere server."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
@@ -1116,7 +1387,7 @@ msgstr ""
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "De disco granaat heeft de dansvloer verlaten alvorens te ontploffen"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "Het spel is onderbroken omdat uw verbinding verbroken is."
 
@@ -1124,7 +1395,7 @@ msgstr "Het spel is onderbroken omdat uw verbinding verbroken is."
 msgid "The grenade left the battlefield before exploding"
 msgstr "De granaat heeft het slagveld verlaten alvorens te ontploffen"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "De anderen wachten op u! Wakker worden :-)"
 
@@ -1141,14 +1412,19 @@ msgstr "De server weigerde de verbinding."
 msgid "The server rejected the connection: wrong password!"
 msgstr "De server weigerde de verbinding. Verkeerd wachtwoord!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Er is maar %i team."
 msgstr[1] "Er zijn maar %i teams."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Tijd"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1172,7 +1448,7 @@ msgstr ""
 "Vuur : spatiebalk\n"
 "slechts een per beurt"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Gereedschap"
 
@@ -1180,12 +1456,12 @@ msgstr "Gereedschap"
 msgid "Unable to contact host."
 msgstr "Kon geen verbinding maken met host."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Kon kaarten directory niet openen (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Kon persoonlijke-kaartendirectory niet openen (%s)!"
@@ -1194,84 +1470,108 @@ msgstr "Kon persoonlijke-kaartendirectory niet openen (%s)!"
 msgid "Unable to use this port!"
 msgstr "Kon deze poort niet gebruiken!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Onbekend commando"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Onbegrensd"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Naamloos"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versie"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Versie verificatie mislukt omdat: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Wacht! %i speler is nog niet klaar!"
 msgstr[1] "Wacht! %i spelers zijn nog niet klaar!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 "Wachten op de server, het enige wat u nu kunt doen is annuleren of chatten!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Wapen: Vuren / Bonuskist: snel laten vallen"
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Wapens"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Website: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Wat een schande voor %s - hij is gedood door een simpel geweer!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Wind deeltjes?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
-msgstr "Winaar"
+msgstr "Winnaar"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux wordt gestart..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux versie "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "Verkeerde kaart CRC!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Verkeerde kaartnaam!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Verkeerd team!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "U bent alleen :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "U bent alleen..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "U heeft minimaal één geldige kaart nodig !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "U heeft minimaal twee geldige teams nodig !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "U kunt pas spelen als u een team heeft geselecteerd !"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "U schoot mis!"
 
@@ -1279,7 +1579,7 @@ msgstr "U schoot mis!"
 msgid "aka"
 msgstr "aka"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1289,15 +1589,20 @@ msgstr ""
 "Bombarderen: klik met de linkermuisknop op het doel\n"
 "een bombardement per beurt"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "kan de configuratie niet laden"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "aangepaste speler"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "klaar"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "fout bij het analyseren van het configuratiebestand"
 
@@ -1305,15 +1610,15 @@ msgstr "fout bij het analyseren van het configuratiebestand"
 msgid "from"
 msgstr "uit"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "geen configuratiebestand!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Muziek wordt geladen"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Geluidsprofiel wordt geladen: %s"
@@ -1323,64 +1628,52 @@ msgstr "o Geluidsprofiel wordt geladen: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Audio geopend met %d Hz %d bit"
 
-#~ msgid "Connect !"
-#~ msgstr "Verbind !"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Verbind met een internetspel"
-
-#~ msgid "Refresh"
-#~ msgstr "Verversen"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Fout bij het laden van gegevens van team %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Fout bij het laden van configuratiebestand: %s"
+#~ msgid "Automatically join a game"
+#~ msgstr "Automatisch een spel vinden"
 
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Fout bij het laden van standaardconfiguratiebestand: %s"
+#~ msgid ""
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
+#~ msgstr ""
+#~ "Geen openbare servers beschikbaar en incorrecte handmatige verbinding. "
+#~ "Probeer handmatig te verbinden."
 
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Fout bij het laden van spel modus %s (bestand %s):"
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Fout: Uw server is niet bereikbaar vanaf het internet. Controleer uw "
+#~ "firewall configuratie."
 
 #, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "XML fout bij het laden van kaart '%s' :"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s probeert te verbinden met een andere versie : client=%s, ik=%s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "En de winnaar is..."
+#~ msgid "  Most sold-out  :  "
+#~ msgstr "  Meest uitverkocht :  %s (%i).\n"
 
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Snel, u bent te langzaam !!"
+#, fuzzy
+#~ msgid "  Most useful   :  "
+#~ msgstr "  Meest zinvol  :  %s (%i).\n"
 
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Wilt u echt afsluiten? (Y/N)"
+#, fuzzy
+#~ msgid "  Most useless  :  "
+#~ msgstr "  Meest zinloos  : %s (%i).\n"
 
 #, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Netwerk wordt geïnitialiseerd"
+#~ msgid "  Most violent  :  "
+#~ msgstr "  Meest gewelddadig  : %s (%i).\n"
 
-#~ msgid "(current)"
-#~ msgstr "(huidige)"
+#~ msgid " has joined the party"
+#~ msgstr " is bij het feest gekomen"
 
-#, fuzzy
-#~ msgid ""
-#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
-#~ "blowtorch, submachine gun) and surely many other things don't work either!"
-#~ msgstr ""
-#~ "Enkele wapens zijn uitgeschakeld vanwege bugs (ninja touw, drilboor, "
-#~ "snijbrander, automatisch geweer) en waarschijnlijk werken veel andere "
-#~ "dingen ook niet!"
+#~ msgid " has left the party"
+#~ msgstr " heeft het feest verlaten"
 
-#~ msgid ""
-#~ "WARNING!! Network is still under developement and therefore a little "
-#~ "experimental."
-#~ msgstr ""
-#~ "WAARSCHUWING!! Netwerk is nog in ontwikkeling en daarom experimenteel."
+#~ msgid "%s has lost %u point of energy."
+#~ msgid_plural "%s has lost %u points of energy."
+#~ msgstr[0] "%s verloor %u punt energie"
+#~ msgstr[1] "%s verloor %u punten energie"
+
+#~ msgid "%s is stupidly dead because he gone out of the map ..."
+#~ msgstr "%s is stom dood gegaan, omdat hij van het terrein afging ..."
 
 #, fuzzy
 #~ msgid "%s team has won %u Gnu!"
@@ -1412,111 +1705,8 @@ msgstr "o Audio geopend met %d Hz %d bit"
 #~ msgstr[0] "Team %s heeft %u %s gekregen!"
 #~ msgstr[1] "Team %s heeft %u %sen gekregen!"
 
-#~ msgid ""
-#~ "WARNING! Disconnections are not yet handled. So you have to restart "
-#~ "Wormux after each disconnection!"
-#~ msgstr ""
-#~ "WAARSCHUWING! Verbroken verbindingen worden nog niet afgehandeld. Daarom "
-#~ "moet u Wormux opnieuw starten na elke verbroken verbinding!"
-
-#~ msgid "Remote"
-#~ msgstr "Via netwerk"
-
-#~ msgid "Ninjarope"
-#~ msgstr "Ninja touw"
-
-#, fuzzy
-#~ msgid "Error while exporting file %s:"
-#~ msgstr "Fout bij het exporteren van spelmodus %s (bestand %s):"
-
-#~ msgid "Error while loading game mode %s from memory:"
-#~ msgstr "Fout bij het laden van spelmodus %s uit het geheugen:"
-
-#~ msgid "Unexpected exception caught..."
-#~ msgstr "Onverwachte uitzondering gevangen..."
-
-#~ msgid "C++ exception caught:"
-#~ msgstr "C++ uitzondering gevangen:"
-
-#~ msgid "Failed to initialize network library!"
-#~ msgstr "Kon netwerkbibliotheek niet initialiseren!"
-
-#~ msgid "Initialisation of TTF library failed: %s"
-#~ msgstr "Kon TTF bibliotheek niet initialiseren: %s"
-
-#~ msgid "Unable to initialize SDL library: %s"
-#~ msgstr "Kon SDL bibliotheek niet initialiseren: %s"
-
-#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
-#~ msgstr ""
-#~ "U heeft minimaal twee teams nodig om te spelen: verander dit in 'Opties "
-#~ "menu' !"
-
-#~ msgid "general: "
-#~ msgstr "algemeen:"
-
-#~ msgid " has joined the party"
-#~ msgstr " is bij het feest gekomen"
-
-#~ msgid " has left the party"
-#~ msgstr " heeft het feest verlaten"
-
-#~ msgid "* Couldn't initialize SDL: "
-#~ msgstr "* Kon SDL niet initialiseren: "
-
-#~ msgid "Find a random position for characters"
-#~ msgstr "Zoek een willekeurige positie voor de spelers"
-
-#~ msgid "Initialise objects"
-#~ msgstr "Initialiseer objecten"
-
-#~ msgid "[Music] Error : Unable to load music file: %s"
-#~ msgstr "[Muziek] Fout : Kon muziekbestand niet laden: %s"
-
-#~ msgid "[Music] Error : file %s does not exist"
-#~ msgstr "[Muziek] Fout : bestand %s bestaat niet"
-
-#~ msgid "[Music] Error : file %s not found"
-#~ msgstr "[Muziek] Fout : bestand %s niet gevonden"
-
-#~ msgid "[Music] Unable to find music file: %s"
-#~ msgstr "[Muziek] Kon muziekbestand niet vinden: %s"
-
-#~ msgid "[Music] Unable to find profile: %s"
-#~ msgstr "[Muziek] Kon profiel niet vinden: %s"
-
-#~ msgid "[Sound] Error : file %s not found"
-#~ msgstr "[Geluid] Fout : bestand %s niet gevonden"
-
-#~ msgid "[Sound] Error: File %s does not exist"
-#~ msgstr "[Geluid] Fout: Bestand %s bestaat niet"
-
-#, fuzzy
-#~ msgid "  Most sold-out  :  "
-#~ msgstr "  Meest uitverkocht :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most useful   :  "
-#~ msgstr "  Meest zinvol  :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most useless  :  "
-#~ msgstr "  Meest zinloos  : %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most violent  :  "
-#~ msgstr "  Meest gewelddadig  : %s (%i).\n"
-
-#~ msgid "%s has lost %u point of energy."
-#~ msgid_plural "%s has lost %u points of energy."
-#~ msgstr[0] "%s verloor %u punt energie"
-#~ msgstr[1] "%s verloor %u punten energie"
-
-#~ msgid "%s is stupidly dead because he gone out of the map ..."
-#~ msgstr "%s is stom dood gegaan, omdat hij van het terrein afging ..."
-
-#~ msgid "%s team has won.\n"
-#~ msgstr "Team %s heeft gewonnen.\n"
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "%s probeert te verbinden met een andere versie : client=%s, ik=%s."
 
 #, fuzzy
 #~ msgid "'%s has won %u Anvil"
@@ -1536,6 +1726,12 @@ msgstr "o Audio geopend met %d Hz %d bit"
 #~ msgstr[0] "'%s heeft %u luchtaanval gekregen"
 #~ msgstr[1] "'%s heeft %u luchtaanvallen gekregen"
 
+#~ msgid "(current)"
+#~ msgstr "(huidige)"
+
+#~ msgid "* Couldn't initialize SDL: "
+#~ msgstr "* Kon SDL niet initialiseren: "
+
 #~ msgid "<infinite_background> needs <is_open> to be set to work correctly!!"
 #~ msgstr ""
 #~ "Om <infinite_background> goed te laten werken moet <is_open> ingesteld "
@@ -1557,9 +1753,18 @@ msgstr "o Audio geopend met %d Hz %d bit"
 #~ msgid "Baseball"
 #~ msgstr "Honkbalknuppel"
 
+#~ msgid "C++ exception caught:"
+#~ msgstr "C++ uitzondering gevangen:"
+
 #~ msgid "ClanLib error :"
 #~ msgstr "ClanLib fout :"
 
+#~ msgid "Connect !"
+#~ msgstr "Verbind !"
+
+#~ msgid "Connect to an internet game"
+#~ msgstr "Verbind met een internetspel"
+
 #, fuzzy
 #~ msgid "Connected to "
 #~ msgstr "Einde van het spel"
@@ -1567,6 +1772,9 @@ msgstr "o Audio geopend met %d Hz %d bit"
 #~ msgid "Dead of %s (%s)."
 #~ msgstr "Dood van %s (%s)."
 
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Wilt u echt afsluiten? (Y/N)"
+
 #~ msgid "Drawn game :-("
 #~ msgstr "Gelijkspel :-("
 
@@ -1576,18 +1784,46 @@ msgstr "o Audio geopend met %d Hz %d bit"
 #~ msgid "End of the game!\n"
 #~ msgstr "Einde van het spel!\n"
 
-#~ msgid "Energy:"
-#~ msgstr "Energie:"
-
 #~ msgid "Error during loading skin %s:"
 #~ msgstr "Fout bij het laden van skin %s:"
 
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Fout bij het laden van gegevens van team %s:"
+
+#, fuzzy
+#~ msgid "Error while exporting file %s:"
+#~ msgstr "Fout bij het exporteren van spelmodus %s (bestand %s):"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Fout bij het laden van configuratiebestand: %s"
+
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Fout bij het laden van standaardconfiguratiebestand: %s"
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Fout bij het laden van spel modus %s (bestand %s):"
+
+#~ msgid "Error while loading game mode %s from memory:"
+#~ msgstr "Fout bij het laden van spelmodus %s uit het geheugen:"
+
+#~ msgid "Failed to initialize network library!"
+#~ msgstr "Kon netwerkbibliotheek niet initialiseren!"
+
+#~ msgid "Find a random position for characters"
+#~ msgstr "Zoek een willekeurige positie voor de spelers"
+
 #~ msgid "Info"
 #~ msgstr "Info"
 
 #~ msgid "Init data"
 #~ msgstr "Initialiseren van gegevens"
 
+#~ msgid "Initialisation of TTF library failed: %s"
+#~ msgstr "Kon TTF bibliotheek niet initialiseren: %s"
+
+#~ msgid "Initialise objects"
+#~ msgstr "Initialiseer objecten"
+
 #~ msgid "Is it a gift?"
 #~ msgstr "Is het een geschenk?"
 
@@ -1598,6 +1834,13 @@ msgstr "o Audio geopend met %d Hz %d bit"
 #~ msgid "Load skins:"
 #~ msgstr "Skins worden geladen:"
 
+#, fuzzy
+#~ msgid "Network deinitialization"
+#~ msgstr "Netwerk wordt geïnitialiseerd"
+
+#~ msgid "Ninjarope"
+#~ msgstr "Ninja touw"
+
 #~ msgid "Number of players per team:"
 #~ msgstr "Aantal spelers per team:"
 
@@ -1607,21 +1850,30 @@ msgstr "o Audio geopend met %d Hz %d bit"
 #~ msgid "PAUSE"
 #~ msgstr "Pause"
 
-#~ msgid "Pause"
-#~ msgstr "Pauze"
-
 #~ msgid "Please tell us your opinion of Wormux via email:"
 #~ msgstr "Vertel ons a.u.b. uw mening over Wormux via e-mail:"
 
+#~ msgid "Refresh"
+#~ msgstr "Verversen"
+
+#~ msgid "Remote"
+#~ msgstr "Via netwerk"
+
 #~ msgid "Riot bomb"
 #~ msgstr "Riot bomb"
 
-#~ msgid "Select the teams:"
-#~ msgstr "Selecteer de teams:"
-
 #~ msgid "Select the world:"
 #~ msgstr "Selecteer de wereld:"
 
+#, fuzzy
+#~ msgid ""
+#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
+#~ "blowtorch, submachine gun) and surely many other things don't work either!"
+#~ msgstr ""
+#~ "Enkele wapens zijn uitgeschakeld vanwege bugs (ninja touw, drilboor, "
+#~ "snijbrander, automatisch geweer) en waarschijnlijk werken veel andere "
+#~ "dingen ook niet!"
+
 #~ msgid "Sound error :"
 #~ msgstr "Fout met het geluid :"
 
@@ -1645,17 +1897,33 @@ msgstr "o Audio geopend met %d Hz %d bit"
 #~ msgid "Unable to contact top server!"
 #~ msgstr "Kon kaarten directory niet openen (%s)!"
 
+#~ msgid "Unable to initialize SDL library: %s"
+#~ msgstr "Kon SDL bibliotheek niet initialiseren: %s"
+
 #, fuzzy
 #~ msgid "Unable to join the game..."
 #~ msgstr "Kon skins directory niet openen (%s)!"
 
-#~ msgid "Unknow action"
-#~ msgstr "Onbekende actie"
+#~ msgid "Unexpected exception caught..."
+#~ msgstr "Onverwachte uitzondering gevangen..."
 
 #, fuzzy
 #~ msgid "Use sound?"
 #~ msgstr "Gebruik geluid"
 
+#~ msgid ""
+#~ "WARNING! Disconnections are not yet handled. So you have to restart "
+#~ "Wormux after each disconnection!"
+#~ msgstr ""
+#~ "WAARSCHUWING! Verbroken verbindingen worden nog niet afgehandeld. Daarom "
+#~ "moet u Wormux opnieuw starten na elke verbroken verbinding!"
+
+#~ msgid ""
+#~ "WARNING!! Network is still under developement and therefore a little "
+#~ "experimental."
+#~ msgstr ""
+#~ "WAARSCHUWING!! Netwerk is nog in ontwikkeling en daarom experimenteel."
+
 #~ msgid "Wait for map"
 #~ msgstr "Wacht op kaart"
 
@@ -1674,3 +1942,36 @@ msgstr "o Audio geopend met %d Hz %d bit"
 
 #~ msgid "Weapon:"
 #~ msgstr "Wapen:"
+
+#, fuzzy
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "XML fout bij het laden van kaart '%s' :"
+
+#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgstr ""
+#~ "U heeft minimaal twee teams nodig om te spelen: verander dit in 'Opties "
+#~ "menu' !"
+
+#~ msgid "[Music] Error : Unable to load music file: %s"
+#~ msgstr "[Muziek] Fout : Kon muziekbestand niet laden: %s"
+
+#~ msgid "[Music] Error : file %s does not exist"
+#~ msgstr "[Muziek] Fout : bestand %s bestaat niet"
+
+#~ msgid "[Music] Error : file %s not found"
+#~ msgstr "[Muziek] Fout : bestand %s niet gevonden"
+
+#~ msgid "[Music] Unable to find music file: %s"
+#~ msgstr "[Muziek] Kon muziekbestand niet vinden: %s"
+
+#~ msgid "[Music] Unable to find profile: %s"
+#~ msgstr "[Muziek] Kon profiel niet vinden: %s"
+
+#~ msgid "[Sound] Error : file %s not found"
+#~ msgstr "[Geluid] Fout : bestand %s niet gevonden"
+
+#~ msgid "[Sound] Error: File %s does not exist"
+#~ msgstr "[Geluid] Fout: Bestand %s bestaat niet"
+
+#~ msgid "general: "
+#~ msgstr "algemeen:"
diff --git a/po/pl.po b/po/pl.po
index 94234b3..24a41d9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,6 +1,6 @@
 # translation of pl.po to
 # Bartosz Feński aka fEnIo <fenio at debian.org>, 2004-2005.
-# Paweł Dyda <pawel.dyda at gazeta.pl>, 2007.
+# Paweł Dyda <pawel.dyda at gazeta.pl>, 2007, 2008.
 # Michał D. <emdek at epf.pl>, 2007.
 # translation of wormux.po to
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-05-02 14:31+0100\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-03 00:56+0100\n"
 "Last-Translator: Paweł Dyda <pawel.dyda at gazeta.pl>\n"
 "Language-Team:  <pl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Nie odnaleziono mapy %s :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
@@ -36,7 +36,7 @@ msgstr[0] "%i podłączony gracz"
 msgstr[1] "%i podłączonych graczy"
 msgstr[2] "%i podłączonych graczy"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
@@ -44,51 +44,61 @@ msgstr[0] "%i gracz jest gotowy"
 msgstr[1] "%i graczy jest gotowych"
 msgstr[2] "%i graczy jest gotowych"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (drużyna %s) zginął."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> znany jako %s z %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> z %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Drużyna %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Drużyna %s - zdalna"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s popełnił samobójstwo!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s kl/s"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s z drużyny %s popełnił samobójstwo!"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "%s z drużyny %s zginął."
+
+#: src/game/game.cpp:709
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s wpadł do wody."
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s z drużyny %s wpadł do wody!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:703
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s wypadł poza mapę!"
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s z drużyny %s wypadł poza mapę!"
+
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s z drużyny %s uderzył w ziemię zbyt mocno!"
+
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s z drużyny %s zginął przez swoją niezdarność!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -98,16 +108,11 @@ msgstr[0] "%s wygrał %u punkt energii!"
 msgstr[1] "%s wygrał %u punkty energii!"
 msgstr[2] "%s wygrał %u punktów energii!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s jest psychopatą, zabił %s - członka swojej drużyny!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s zginął przez swoją niezdarność!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -132,7 +137,7 @@ msgstr[0] "Drużyna %s zyskała %u granatnik!"
 msgstr[1] "Drużyna %s zyskała %u granatniki!"
 msgstr[2] "Drużyna %s zyskała %u granatników!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
@@ -143,7 +148,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Drużyna %s zyskała %u wyrzutni Gnu! Wysadźcie ich wszystkich w powietrze!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
@@ -151,7 +156,7 @@ msgstr[0] "Drużyna %s zyskała %u atak powietrzny!"
 msgstr[1] "Drużyna %s zyskała %u ataki powietrzne!"
 msgstr[2] "Drużyna %s zyskała %u ataków powietrznych!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -169,7 +174,7 @@ msgstr[2] ""
 "Drużyna %s zyskała %u młotów pneumatycznych! Nie rób nimi zbyt wiele hałasu. "
 "Dziękujemy, twoi sąsiedzi."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -234,7 +239,7 @@ msgstr[0] "Drużyna %s zyskała %u bombę rozpryskową!"
 msgstr[1] "Drużyna %s zyskała %u bomby rozpryskowe!"
 msgstr[2] "Drużyna %s zyskała %u bomb rozpryskowych!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -279,7 +284,7 @@ msgstr[0] "Drużyna %s zyskała %u bombę futbolową!"
 msgstr[1] "Drużyna %s zyskała %u bomby futbolowe!"
 msgstr[2] "Drużyna %s zyskała %u bomb futbolowych!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -303,7 +308,7 @@ msgstr[0] "Drużyna %s zyskała %u pistolet!"
 msgstr[1] "Drużyna %s zyskała %u pistolety!"
 msgstr[2] "Drużyna %s zyskała %u pistoletów!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
@@ -311,7 +316,7 @@ msgstr[0] "Drużyna %s zyskała %u plecak odrzutowy! Super!"
 msgstr[1] "Drużyna %s zyskała %u plecaki odrzutowe! Super!"
 msgstr[2] "Drużyna %s zyskała %u plecaków odrzutowych! Super!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -332,7 +337,7 @@ msgstr[0] "Drużyna %s zyskała %u minę!"
 msgstr[1] "Drużyna %s zyskała %u miny!"
 msgstr[2] "Drużyna %s zyskała %u min!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
@@ -340,7 +345,7 @@ msgstr[0] "Drużyna %s zyskała %u spadochron!"
 msgstr[1] "Drużyna %s zyskała %u spadochrony!"
 msgstr[2] "Drużyna %s zyskała %u spadochronów!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -364,7 +369,15 @@ msgstr[0] "Drużyna %s zyskała %u strzelbę!"
 msgstr[1] "Drużyna %s zyskała %u strzelby!"
 msgstr[2] "Drużyna %s zyskała %u strzelb!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Drużyna %s zyskała %u spoliczkowanie!"
+msgstr[1] "Drużyna %s zyskała %u spoliczkowania!"
+msgstr[2] "Drużyna %s zyskała %u spoliczkowań!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -417,7 +430,7 @@ msgstr[0] "Drużyna %s zyskała %u pominięcie tury! Ulubiona broń, nie?"
 msgstr[1] "Drużyna %s zyskała %u pominięcia tury! Ulubiona broń, nie?"
 msgstr[2] "Drużyna %s zyskała %u pominięć tury! Ulubiona broń, nie?"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -431,16 +444,26 @@ msgstr[2] ""
 "Drużyna %s zyskała %u wyrzutni tuksów! Widzieliście już kiedyś latającego "
 "pingwina?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "Drużyna %s została unicestwiona."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s zabrał ze sobą członka drużyny %s w wieczną podróż!"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(martwy)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(język systemu)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(brak danych)"
 
@@ -449,7 +472,7 @@ msgstr "(brak danych)"
 msgid "(unlimited)"
 msgstr "(bez ograniczeń)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -458,7 +481,11 @@ msgstr ""
 "Dostępna jest nowsza wersja - %s. Aktualna wersja to %s. Możesz chcieć "
 "sprawdzić dostępność aktualizacji dla twojego systemu operacyjnego."
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Dodaj własną drużynę"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Atak powietrzny"
 
@@ -466,10 +493,18 @@ msgstr "Atak powietrzny"
 msgid "Airhammer"
 msgstr "MÅ‚ot pneumatyczny"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Wszystkie drużyny:"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Zawsze"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Zwycięstwo przypadło w udziale..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -484,7 +519,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Kowadło"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autorzy:"
 
@@ -508,6 +543,14 @@ msgstr "Kij bejsbolowy"
 msgid "Bazooka"
 msgstr "Wyrzutnia rakiet"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Przed działaniem"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "BÅ‚yskawiczny"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Palnik"
@@ -520,8 +563,9 @@ msgstr "OdbijajÄ…ca siÄ™ kula"
 msgid "Bye bye tux..."
 msgstr "Pa, pa SuperTux"
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Odnalezienie drużyny %s nie powiodło się!"
@@ -531,24 +575,69 @@ msgstr "Odnalezienie drużyny %s nie powiodło się!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Nie można otworzyć dodatkowego katalogu drużyn (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Nie można otworzyć katalogu drużyn (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Nie można otworzyć katalogu własnych drużyn (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Ześrodkowuje kamerę na postaci"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Zmień aktywną postać"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Zmień kąt celownika"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Zmień kategorię uzbrojenia"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Zmień uzbrojenie"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Postać"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Przełączanie postaci"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
-msgstr "Czy sprawdzać dostępność aktualizacji?"
+msgstr "Sprawdzanie dostępności aktualizacji"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Wybiera mapÄ™ drogÄ… losowania"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Klasyczny"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Kliknij, aby ześrodkować kamerę na postaci"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Tryb klienta"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Naj. niezdarny"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Bomba rozpryskowa"
@@ -561,7 +650,11 @@ msgstr "Granatnik"
 msgid "Commit Suicide"
 msgstr "Pas samobójcy"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Menu konfiguracji"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Dołącz do gry"
 
@@ -569,11 +662,11 @@ msgstr "Dołącz do gry"
 msgid "Connected !"
 msgstr "Dołączono!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Konstruktor"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Kontrolowany przez: "
 
@@ -582,7 +675,7 @@ msgstr "Kontrolowany przez: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Nie można pobrać ostatniej wersji z %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Nie można otworzyć pliku %s"
@@ -591,11 +684,32 @@ msgstr "Nie można otworzyć pliku %s"
 msgid "Credits"
 msgstr "Podziękowania"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Utrata energii podczas trybu nagłej śmieci"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Usuń własną drużynę"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Granat Disco"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Wyświetla to powiadomienie"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Przeciągnij i upuść, aby przesunąć kamerę"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Czas do rozpoczęcia trybu nagłej śmierci"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Czas trwania tury"
 
@@ -603,24 +717,34 @@ msgstr "Czas trwania tury"
 msgid "Dynamite"
 msgstr "Dynamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "KONIEC GRY"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Głośność efektów"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energia"
+
+#: src/tool/error.cpp:63
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "BÅ‚Ä…d w %s:%lu"
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "BÅ‚Ä…d w %s:%lu (Wormux w wersji %s): %s"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr "BÅ‚Ä…d inicjalizacji sieci: Klient %s nie jest zgodny z Twoim - %s"
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Błąd podczas wczytywania drużyny:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -628,7 +752,19 @@ msgstr ""
 "Błąd podczas tworzenia katalogu \"%s\": nie można zachować pliku "
 "konfiguracyjnego."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Błąd podczas usuwania katalogu \"%s\". Nie można usunąć własnej drużyny."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "Błąd podczas usuwania pliku \"%s\".Nie można usunąć własnej drużyny."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -638,36 +774,42 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Błąd: Połączenie z %s:%s nie powiodło się"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
 msgstr ""
 "Błąd: nie udało się skontaktować z serwerem indeksującym w celu "
 "zarejestrowania serwera gry"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Błąd: nie udało się skontaktować z serwerem indeksującym w celu znalezienia "
 "gry internetowej"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Błąd: Nie można uruchomić serwera"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Błąd: Twój serwer nie jest dostępny z Internetu. Sprawdź konfigurację zapory "
-"sieciowej."
+"Błąd: Twój serwer nie jest dostępny z Internetu. Sprawdź ustawienia zapory "
+"sieciowej: port TCP %s musi być otwarty. Jeżeli komputer nie jest podłączony "
+"bezpośrednio do Internetu, sprawdź konfigurację routera: połączenia TCP "
+"przychodzące na port %s muszą być przekierowywane do Twojego komputera. "
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Błąd: nie mogę odnaleźć skórki \"%s\" dla drużyny \"%s\"."
@@ -680,23 +822,31 @@ msgstr "Miotacz płomieni"
 msgid "Football Bomb"
 msgstr "Bomba futbolowa"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Pełny ekran/okno"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Pełny ekran"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Gra"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Tryb gry"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Nazwa gry:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Wyrzutnia Gnu"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr "Grafika"
 
@@ -704,11 +854,15 @@ msgstr "Grafika"
 msgid "Grapple"
 msgstr "WyciÄ…garka"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Ciążenie"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granat"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inicjalizacja powierzchni..."
 
@@ -716,17 +870,17 @@ msgstr "Inicjalizacja powierzchni..."
 msgid "Gun"
 msgstr "Pistolet"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr ""
 "Katalog domowy (zmienna środowiskowa $HOME) nie mógł zostać odnaleziony!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Życzymy miłej gry!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Głównodowodzący"
 
@@ -739,7 +893,11 @@ msgstr "Głównodowodzący: "
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Wysoki skok"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Uruchom serwer gry"
 
@@ -781,15 +939,20 @@ msgstr ""
 "Sposób użycia: kliknij lewym klawiszem na celu\n"
 "amunicji na turÄ™"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Pospieszcie się, jesteście zbyt wolni!!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
 msgstr ""
-"Jeśli znalazłeś błąd lub brakuje Ci jakiejś funkcjonalności to wyślij do nas "
-"e-mail (prosimy aby był w języku angielskim):"
+"Jeżeli znajdziesz błąd lub brakuje Ci jakiejś funkcjonalności to wyślij do "
+"nas e-mail (prosimy aby był w języku angielskim):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Energia poczÄ…tkowa"
 
@@ -804,7 +967,7 @@ msgstr ""
 "Oddanie strzału: przytrzymaj spację aż do osiągnięcia pożądanej siły\n"
 "amunicji na turÄ™"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inicjalizacja"
 
@@ -812,32 +975,44 @@ msgstr "Inicjalizacja"
 msgid "Initialise map"
 msgstr "Inicjalizacja mapy"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inicjalizacja dźwięków"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inicjalizacja drużyn"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "To prezent!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Plecak odrzutowy"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 "Wejdź na kanał #wormux na serwerze irc.freenode.net aby znaleźć przeciwników"
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Skok"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Skok wstecz"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Wykopuje gracza o wskazanym <nicku> z gry"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Język"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Wczytywanie map:"
 
@@ -845,7 +1020,7 @@ msgstr "Wczytywanie map:"
 msgid "Load teams:"
 msgstr "Wczytywanie drużyn:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Drużyny lokalne:"
 
@@ -853,13 +1028,13 @@ msgstr "Drużyny lokalne:"
 msgid "LowGrav"
 msgstr "Obniżona grawitacja"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "Połączenie manualne"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Mapa"
 
@@ -872,11 +1047,15 @@ msgstr "Mapa %s, stworzona przez:"
 msgid "Maps"
 msgstr "Mapy"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Maksymalna energia"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Maksymalna liczba graczy:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maksymalna liczba kl/s"
 
@@ -884,39 +1063,43 @@ msgstr "Maksymalna liczba kl/s"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr "Różne"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Naj. celny"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Naj. niezdarny"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Naj. sprzedajny"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Naj. użyteczny"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Naj. bezużyteczny"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Naj. okrutny"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Przesuń kamerę za pomocą myszki lub klawiatury"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Przesuń postać"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Odtwarzanie muzyki"
 
@@ -924,32 +1107,48 @@ msgstr "Odtwarzanie muzyki"
 msgid "Network Game"
 msgstr "Gra sieciowa"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Inicjalizacja sieci"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Nigdy"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Nowa gra sieciowa o "
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Ostrzeganie o nowych graczach"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Element <%s> nie został odnaleziony w pliku konfiguracyjnym xml!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Nikt!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Liczba postaci"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Liczba drużyn:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "Na postaci: zmiana aktywnej"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "Na mapie: wybór celu"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opcje"
@@ -962,42 +1161,54 @@ msgstr "Opcje"
 msgid "Parachute"
 msgstr "Spadochron"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Spadochron jest aktywowany automatycznie."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr "Hasło:"
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pauza"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Graj"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Graj kilka razy"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Gracz"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Wyświetlanie energii graczy"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Nazwa gracza"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Wyświetlanie imion graczy"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Wyrzutnia skunksów"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr "Bitwy publiczne"
 
@@ -1005,27 +1216,31 @@ msgstr "Bitwy publiczne"
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
-msgstr "Wyjdź z programu Wormux"
+msgstr "Wyjście z programu Wormux"
 
 #: src/menu/pause_menu.cpp:63
 msgid "Quit battle"
 msgstr "Wyjdź"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Zakończ grę"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Losowa mapa"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Odczytywanie domyślnego pliku konfiguracyjnego"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Odczytywanie pliku konfiguracji osobistej"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Rozdzielczość"
 
@@ -1033,33 +1248,33 @@ msgstr "Rozdzielczość"
 msgid "Riot Bomb"
 msgstr "Riotbomba"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Uruchom grÄ™"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Powiedz:"
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr "Rozmiar obramowania"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Przewijaj na obramowaniu"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Adres serwera:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Serwer dostępny w Internecie"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Tryb serwera"
 
@@ -1067,10 +1282,34 @@ msgstr "Tryb serwera"
 msgid "Shotgun"
 msgstr "Strzelba"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Pokaż menu uzbrojenia"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Ukrycie/pokazanie interfejsu"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Ukrycie/pokazanie miniatury mapy"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Pominięcie tury"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Policzek"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Spoliczkuj wroga, aby trochę podskoczył"
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Mniejszy kąt celowania i wolniejszy chód"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Snajperka"
@@ -1079,28 +1318,38 @@ msgstr "Snajperka"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Ktoś wsadził minę pułapkę do kontenera!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Przykro nam, ale aktualnie nie ma gry oczekujÄ…cej na graczy"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Przykro nam, ale wsparcie dla tej wersji zostało zakończone. Wspierane "
+"wersje to %s. Możesz pobrać zaktualizowaną wersję ze strony http://www."
+"wormux.org/wiki/download.php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Odtwarzanie efektów dźwiękowych"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Częstotliwość dźwięku"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Dźwięki"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Uruchamianie nowej gry"
 
@@ -1120,18 +1369,26 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Strzykawka"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Czatuj w bitwie sieciowej"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr "Wykresy drużyn"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr "Statystyki drużyn"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Drużyny"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Edytor drużyn"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportacja"
@@ -1144,11 +1401,11 @@ msgstr "Bomba rozpryskowa opuściła pole bitwy zanim mogła wybuchnąć."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Bomba futbolowa opuściła pole bitwy zanim mogła wybuchnąć."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnu opuściła pole bitwy zanim wybuchła"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Skunks opuścił pole bitwy zanim wybuchł"
 
@@ -1160,6 +1417,15 @@ msgstr "Kierowana rakieta opuściła pole bitwy..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Kula opuściła pole bitwy zanim wybuchła"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Wersje oprogramowania serwera i klienta sÄ… niezgodne (wersja klienta: %s, "
+"wersja serwera: %s). Spróbuj połączyć się z innym serwerem."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
@@ -1170,7 +1436,7 @@ msgstr ""
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Granat Disco opuścił pole bitwy zanim wybuchł"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "Gra została przerwana z powodu rozłączenia."
 
@@ -1178,7 +1444,7 @@ msgstr "Gra została przerwana z powodu rozłączenia."
 msgid "The grenade left the battlefield before exploding"
 msgstr "Granat opuścił pole bitwy zanim wybuchł"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Inne drużyny czekają na Ciebie! Obudź się :-)"
 
@@ -1195,7 +1461,7 @@ msgstr "Serwer odrzucił połączenie."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Serwer odrzucił połączenie: nieprawidłowe hasło!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
@@ -1203,7 +1469,12 @@ msgstr[0] "Jest tylko %i drużyna."
 msgstr[1] "Są tylko %i drużyny."
 msgstr[2] "Jest tylko %i drużyn."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Czas"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1227,7 +1498,7 @@ msgstr ""
 "Oddanie strzału: spacja\n"
 "amunicji na turÄ™"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Narzędzia"
 
@@ -1235,12 +1506,12 @@ msgstr "Narzędzia"
 msgid "Unable to contact host."
 msgstr "Nie udało się skontaktować z hostem."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Nie można otworzyć katalogu map (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Nie można otworzyć osobistego katalogu map (%s)!"
@@ -1249,20 +1520,28 @@ msgstr "Nie można otworzyć osobistego katalogu map (%s)!"
 msgid "Unable to use this port!"
 msgstr "Nie można użyć tego portu!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Nieznane polecenie"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Bez ograniczeń"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Nienazwane"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Wersja"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Weryfikacja wersji nie powiodła się, gdyż: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
@@ -1270,64 +1549,80 @@ msgstr[0] "Zaczekaj! %i gracz nie jest jeszcze gotowy!"
 msgstr[1] "Zaczekaj! %i graczy nie jest jeszcze gotowych!"
 msgstr[2] "Zaczekaj! %i graczy nie jest jeszcze gotowych!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 "Oczekiwanie na odpowiedź serwera, możesz tylko anulować lub z kimś pogadać!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Uzbrojenie: strzał / Prezent: przyspieszenie opadania"
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Uzbrojenie"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Strona domowa: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Co za wstyd! %s został zabity zwykłym pistoletem!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Wyświetlanie wskaźników wiatru"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Zwycięzca"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux - uruchamianie..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux - wersja programu"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "Nieprawidłowa suma kontrolna mapy!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Nieprawidłowa nazwa mapy!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Nieprawidłowa drużyna!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Nikogo tu nie ma :/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Nikogo tu nie ma..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Musisz mieć przynajmniej jedną prawidłową mapę!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Musisz ustawić przynajmniej dwie drużyny!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Nie można rozpocząć gry przed wybraniem drużyny!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Pudło!"
 
@@ -1335,7 +1630,7 @@ msgstr "Pudło!"
 msgid "aka"
 msgstr "znany jako"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1345,15 +1640,20 @@ msgstr ""
 "Bombardowanie: kliknij lewym klawiszem na celu\n"
 "bombardowań na turę"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "błąd odczytu pliku konfiguracyjnego"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "Nazwa własnej drużyny"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "gotowe"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "błąd podczas interpretowania pliku konfiguracyjnego"
 
@@ -1361,15 +1661,15 @@ msgstr "błąd podczas interpretowania pliku konfiguracyjnego"
 msgid "from"
 msgstr "do"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "brak pliku konfiguracyjnego!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Wczytywanie muzyki"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Wczytywanie profilu dźwięków: %s"
@@ -1379,33 +1679,9 @@ msgstr "o Wczytywanie profilu dźwięków: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Otworzono plik audio - %d Hz %d bit"
 
-#~ msgid "Connect !"
-#~ msgstr "Dołącz!"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Dołącz do gry internetowej"
-
-#~ msgid "Refresh"
-#~ msgstr "Odśwież"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Błąd wczytywania danych drużyny %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "BÅ‚Ä…d podczas wczytywania pliku konfiguracyjnego %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Błąd podczas wczytywania domyślnego pliku konfiguracyjnego (%s)"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "BÅ‚Ä…d podczas wczytywania trybu gry %s (plik %s):"
-
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "BÅ‚Ä…d XML podczas wczytywania mapy '%s': "
-
 #~ msgid ""
-#~ "The client and server versions are incompatible (local=%s, server=%s). "
-#~ "Please try another server."
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
 #~ msgstr ""
-#~ "Wersje oprogramowania serwera i klienta sÄ… niezgodne (wersja klienta: %s, "
-#~ "wersja serwera: %s). Spróbuj połączyć się z innym serwerem."
+#~ "Żaden publiczny serwer nie jest dostępny i wprowadzono nieprawidłowe "
+#~ "ustawienia połączenia. Spróbuj innych ustawień połączenia."
diff --git a/po/pt.po b/po/pt.po
index 9e3efc9..8c279e8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,88 +1,99 @@
+# translation of pt.po to portuguese
 # This file is distributed under the same license as the wormux package.
 # Copyright (C) 2007 THE wormux'S COPYRIGHT HOLDER, 2004.
 #
 # Bruno Pires <bruno.pires at utbm.fr>, 2006.
-# Bruno Queiros <brunomiguelqueiros at gmail.com>, 2006.
-# Bruno Queiros <brunoqueiros at portugalmail.com>, 2007.
-# Bruno Queiros <brunomiguelqueiros at sapo.pt>, 2007.
+# Bruno Queiros <brunomiguelqueiros at gmail.com>, 2006-2008.
+# Bruno Queiros <brunoqueiros at portugalmail.com>, 2008.
+# Bruno Queirós <brunoqueiros at portugalmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: wormux_0.8beta3-1_pt\n"
+"Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2007-12-23 16:29+0000\n"
-"Last-Translator: Bruno Queiros <brunomiguelqueiros at sapo.pt>\n"
-"Language-Team:  <pt at li.org>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-11 20:59+0100\n"
+"Last-Translator: Bruno Queirós <brunoqueiros at portugalmail.com>\n"
+"Language-Team: portuguese <pt at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
-msgstr "! O mapa %s não encontrado :-("
+msgstr "! Mapa %s não encontrado :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i jogador ligado"
 msgstr[1] "%i jogadores ligados"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i jogador pronto"
 msgstr[1] "%i jogadores prontos"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) morreu."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> também conhecido por %s de %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> de %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Equipa %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
-msgstr "Equipa %s - Remota"
-
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s suicidou-se !"
+msgstr "Equipa - Remota %s"
 
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s da equipa %s suicidou-se !"
+
+#: src/game/game.cpp:751
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s caiu à água."
+msgid "%s from %s team has died."
+msgstr "%s da equipa %s morreu."
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:709
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s saiu do mapa!"
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s da equipa %s caiu à água."
+
+#: src/game/game.cpp:703
+#, c-format
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s da equipa %s saiu do mapa!"
+
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s da equipa %s bateu no chão com muita força!"
+
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s da equipa %s morreu porque é um trapalhão!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -91,16 +102,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s ganhou %u ponto de energia !"
 msgstr[1] "%s ganhou %u pontos de energia !"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s é um psicopata, matou um membro da equipa %s !"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s morreu porque é um trapalhão!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -118,27 +124,27 @@ msgid "%s team has skipped its turn."
 msgstr "A equipa %s passou a vez."
 
 #: src/weapon/cluzooka.cpp:396
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u Cluster bazookas!"
 msgid_plural "%s team has won %u Cluster bazookas!"
-msgstr[0] "A equipa %s ganhou %u bazooka!"
-msgstr[1] "A equipa %s ganhou %u bazookas!"
+msgstr[0] "A equipa %s ganhou %u bazookas Cluster!"
+msgstr[1] "A equipa %s ganhou %u bazookas Cluster!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "A equipa %s ganhou %u Gnu! Rebenta com eles todos, cowboy!"
 msgstr[1] "A equipa %s ganhou %u Gnus! Rebenta com eles todos, cowboy!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "A equipa %s ganhou %u ataque aéreo!"
 msgstr[1] "A equipa %s ganhou %u ataques aéreos!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -153,7 +159,7 @@ msgstr[1] ""
 "A equipa %s ganhou %u martelos pneumáticos! Não faças muito barulho com "
 "eles! Obrigado, os teus vizinhos."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -209,7 +215,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "A equipa %s ganhou %u bomba cluster!"
 msgstr[1] "A equipa %s ganhou %u bombas cluster!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -244,13 +250,13 @@ msgstr[0] "A equipa %s ganhou %u lança-chamas!"
 msgstr[1] "A equipa %s ganhou %u lança-chamas!"
 
 #: src/weapon/footbomb.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
-msgstr[0] "A equipa %s ganhou %u bomba motim!"
-msgstr[1] "A equipa %s ganhou %u bombas motim!"
+msgstr[0] "A equipa %s ganhou %u bomba futebol!"
+msgstr[1] "A equipa %s ganhou %u bombas futebol!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -271,14 +277,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "A equipa %s ganhou %u arma!"
 msgstr[1] "A equipa %s ganhou %u armas!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "A equipa %s ganhou %u jetpack! Porreiro!"
 msgstr[1] "A equipa %s ganhou %u jetpacks! Porreiro!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -292,14 +298,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "A equipa %s ganhou %u mina!"
 msgstr[1] "A equipa %s ganhou %u minas!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "A equipa %s ganhou %u páraquedas!"
 msgstr[1] "A equipa %s ganhou %u páraquedas!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -320,17 +326,24 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "A equipa %s ganhou %u caçadeira!"
 msgstr[1] "A equipa %s ganhou %u caçadeiras!"
 
-#: src/weapon/snipe_rifle.cpp:246
-#, fuzzy, c-format
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "A equipa %s ganhou %u estalada!"
+msgstr[1] "A equipa %s ganhou %u estaladas! Desvia-te delas!"
+
+#: src/weapon/snipe_rifle.cpp:247
+#, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
 "%s team has won %u sniper rifles! Aim and shoot between the eyes!"
 msgstr[0] ""
-"A equipa %s ganhou %u espingarda de atirador furtivo! Acerta-lhe entre os "
-"olhos!"
+"A equipa %s ganhou %u espingarda de atirador furtivo! Aponte e acerte-lhe "
+"entre os olhos!"
 msgstr[1] ""
-"A equipa %s ganhou %u espingardas de atirador furtivo! Acerta-lhe entre os "
-"olhos!"
+"A equipa %s ganhou %u espingardas de atirador furtivo! Aponte e acerte-lhe "
+"entre os olhos!"
 
 #: src/weapon/submachine_gun.cpp:144
 #, c-format
@@ -344,7 +357,8 @@ msgstr[1] "A equipa %s ganhou %u metralhadoras subautomáticas!"
 msgid "%s team has won %u suicide!"
 msgid_plural "%s team has won %u suicides! Use them all for an extra bonus!"
 msgstr[0] "A equipa %s ganhou %u suícidio!"
-msgstr[1] "A equipa %s ganhou %u suicídios!"
+msgstr[1] ""
+"A equipa %s ganhou %u suicídios! Utiliza-os a todos para um bónus extra!"
 
 #: src/weapon/syringe.cpp:115
 #, c-format
@@ -367,41 +381,57 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "A equipa %s ganhou %u mudança de turno! Eu sei que o vais adorar."
 msgstr[1] "A equipa %s ganhou %u mudanças de turno! Eu sei que o vais adorar."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] ""
-"A equipa %s ganhou %u lançador de tux! Nunca viste um penguim voador?"
+"A equipa %s ganhou %u lançador de tux! Nunca viste um pinguim voador?"
 msgstr[1] ""
-"A equipa %s ganhou %u lançadores de tux! Nunca viste um penguim voador?"
+"A equipa %s ganhou %u lançadores de tux! Nunca viste um pinguim voador?"
+
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "A equipa %s foi team was fragged down."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s levou um membro da equipa %s para a sepultura com ele!"
 
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(morto)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(linguagem do sistema)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
-msgstr ""
+msgstr "(tempo desconhecido)"
 
 #. Display number of ammo
 #: src/interface/interface.cpp:196
 msgid "(unlimited)"
 msgstr "(ilimitadas)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
+"Uma nova versão %s está dispoinível, a sua versão actual é is %s.Pode "
+"verificar se existe uma actualização disponível para o seu SO!"
+
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Adicionar uma equipa personalizada"
 
-#: src/weapon/air_attack.cpp:209
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Ataque Aéreo"
 
@@ -409,10 +439,18 @@ msgstr "Ataque Aéreo"
 msgid "Airhammer"
 msgstr "Martelo Pneumático"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Todas as equipas"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Sempre"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "E o vencedor é..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -427,7 +465,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Bigorna"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autores:"
 
@@ -437,7 +475,7 @@ msgstr "Bazooka Automática"
 
 #: src/menu/pause_menu.cpp:51
 msgid "Back to battle"
-msgstr ""
+msgstr "De volta à batalha"
 
 #: src/network/net_error_msg.cpp:42
 msgid "Bad socket ..."
@@ -451,6 +489,14 @@ msgstr "Taco de Baseball"
 msgid "Bazooka"
 msgstr "Bazooka"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Antes da acção"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Blitz"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Maçarico"
@@ -463,8 +509,9 @@ msgstr "Bola Saltitona"
 msgid "Bye bye tux..."
 msgstr "Adeus adeus tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Incapaz de encontrar a equipa %s!"
@@ -474,38 +521,86 @@ msgstr "Incapaz de encontrar a equipa %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Incapaz de abrir o directório dA equipa pessoais (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Incapaz de abrir o directório dA equipa (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Incapaz de abrir o directório das equipas personalizadas (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Centrar câmara na personagem"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Mudar personagem activa"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Mudar ângulo de pontaria"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Mudar categoria das armas"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Mudar contagem decrescente da arma"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Personagem"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Alteração de personagem"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
-msgstr ""
+msgstr "Procurar por actualizações online?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Escolher aleatóriamente entre os diferentes mapas"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Clássico"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Clique: Centrar câmara em personagem"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Modo cliente"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Mais trapalhão"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Bomba Cluster"
 
 #: src/weapon/cluzooka.cpp:389
-#, fuzzy
 msgid "Cluzooka"
-msgstr "Bazooka"
+msgstr "Cluzooka"
 
 #: src/weapon/suicide.cpp:42
 msgid "Commit Suicide"
 msgstr "Cometer Suicídio"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Menu de configuração"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Ligar ao jogo"
 
@@ -513,33 +608,54 @@ msgstr "Ligar ao jogo"
 msgid "Connected !"
 msgstr "Ligado !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Construção"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Controlado por:"
 
 #: src/network/download.cpp:81
 #, c-format
 msgid "Couldn't fetch last version from %s"
-msgstr ""
+msgstr "Não foi possível obter a última versão do %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
-msgstr ""
+msgstr "Não foi possível abrir o ficheiro %s"
 
 #: src/menu/main_menu.cpp:72
 msgid "Credits"
 msgstr "Créditos"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Estragos por turno durante o modo de morte"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Apagar equipa personalizada"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Granada Disco"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Mostra esta mensagem"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Drag&drop: Mover camera"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Duração antes do modo de morte"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Duração do turno:"
 
@@ -547,24 +663,34 @@ msgstr "Duração do turno:"
 msgid "Dynamite"
 msgstr "Dinamite"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "FIM DE JOGO"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
-msgstr ""
+msgstr "Volume dos efeitos"
+
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energia"
+
+#: src/tool/error.cpp:63
+#, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Erro em %s:%lu (Wormux %s) : %s"
 
-#: src/tool/error.cpp:82
+#: src/include/action_handler.cpp:210
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Erro em %s.%lu"
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr "Erro ao iniciar rede: O cliente %s não concorda consigo!! - %s"
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Erro ao carregar a equipa :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -572,7 +698,20 @@ msgstr ""
 "Erro ao criar o directório \"%s\": incapaz de guardar o ficheiro de "
 "configuração."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Erro ao apagar o directório \"%s\": incapaz de apagar a equipa personalizada."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Erro ao apagar o ficheiro \"%s\": incapaz de apagar a equipa personalizada."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -582,32 +721,41 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Erro: Incapaz de ligar a %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Erro: Incapaz de contactar o servidor de index para receber um jogo"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Erro: Incapaz de contactar o servidor de index para procurar por um jogo na "
 "internet"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Erro: Incapaz de iniciar servidor"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
+"Erro: O seu servidor não pode ser acedido através da internet. Verifique a "
+"configuração da sua firewall: Porta TCP %s tem que aceitar ligações do "
+"exterior. Se não está ligado directamente à internet, verifique a "
+"configuração do seu router: Porta TCP %s tem que ser re-encaminhada para o "
+"seu computador."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Erro: não consegui encontrar o skin \"%s\" para a equipa \"%s\"."
@@ -617,39 +765,50 @@ msgid "Flame Thrower"
 msgstr "Lança Chamas"
 
 #: src/weapon/footbomb.cpp:158
-#, fuzzy
 msgid "Football Bomb"
-msgstr "Bomba Motim"
+msgstr "Bomba Futebol"
+
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Ecrã inteiro / janela"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Ecrã inteiro?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
-msgstr ""
+msgstr "Jogo"
+
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Modo de jogo"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
-msgstr ""
+msgstr "Nome do jogo:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Lança Gnus"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
-msgstr ""
+msgstr "Gráficos"
 
 #: src/weapon/grapple.cpp:166
 msgid "Grapple"
 msgstr "Gancho"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Gravidade"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granada"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Iniciando o jogo..."
 
@@ -657,16 +816,16 @@ msgstr "Iniciando o jogo..."
 msgid "Gun"
 msgstr "Pistola"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Directório HOME (variável de ambiente $HOME) não pode ser encontrada!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Tenha um bom jogo!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Comandante principal"
 
@@ -677,9 +836,13 @@ msgstr "Comandante principal: "
 
 #: src/menu/main_menu.cpp:69 src/menu/pause_menu.cpp:59
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
+
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Salto alto"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Criar um Jogo"
 
@@ -722,15 +885,20 @@ msgstr ""
 "Como usá-lo : click esquerdo no alvo\n"
 "uma munição por turno"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Rápido, tu és lento demais !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
 msgstr ""
 "Se encontrou um bug ou tem sugestões para melhorar o jogo envie-nos um "
-"email, em inglês:"
+"email, (em inglês, por favor):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Energia inicial"
 
@@ -746,7 +914,7 @@ msgstr ""
 "desejada\n"
 "uma munição por turno"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inicialização"
 
@@ -754,31 +922,43 @@ msgstr "Inicialização"
 msgid "Initialise map"
 msgstr "Inicialização do mapa"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inicialização dos sons"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inicialização dA equipa"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "É um presente!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Visite #wormux em irc.freenode.net para encontrar alguns adversários."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Salto"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Salto atrás"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Expulsa os jogadores designados por <nickname> do jogo"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Linguagem"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Carregar mapas:"
 
@@ -786,7 +966,7 @@ msgstr "Carregar mapas:"
 msgid "Load teams:"
 msgstr "Carregar equipas:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Equipas locais:"
 
@@ -794,16 +974,15 @@ msgstr "Equipas locais:"
 msgid "LowGrav"
 msgstr "Baixa Gravidade"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
-msgstr ""
+msgstr "Ligação manual"
 
-#: src/menu/game_menu.cpp:84
-#, fuzzy
+#: src/menu/game_menu.cpp:78
 msgid "Map"
-msgstr "Mapas"
+msgstr "Mapa"
 
 #: src/map/map.cpp:294
 #, c-format
@@ -814,11 +993,15 @@ msgstr "O mapa %s, é uma criação de :"
 msgid "Maps"
 msgstr "Mapas"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Energia máxima"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Número  máximo de jogadores:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Máximo de FPS"
 
@@ -826,40 +1009,43 @@ msgstr "Máximo de FPS"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
-#, fuzzy
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
-msgstr "Música?"
+msgstr "Misc"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Mais preciso"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Mais trapalhão"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Mais vendido"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Mais útil"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Mais inútil"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Mais violento"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Mover camera com o rato ou setas"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Mover personagem"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
-msgstr ""
+msgstr "Volume da música"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Música?"
 
@@ -867,110 +1053,140 @@ msgstr "Música?"
 msgid "Network Game"
 msgstr "Jogo em Rede"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Iniciando a rede"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Nunca"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
-#, fuzzy
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
-msgstr "Jogo em Rede"
+msgstr "Novo jogo em rede em "
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Aviso de novo jogador?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Nenhum elemento <%s> encontrado no ficheiro de configuração xml!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Ninguém!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Número de jogadores"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Número de equipas:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "Numa personagem: Muda a que estiver activa"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "Num mapa: Escolher um alvo"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opções"
 
 #: src/menu/pause_menu.cpp:55
-#, fuzzy
 msgid "Options menu"
-msgstr "Opções"
+msgstr "Menu Opções"
 
 #: src/weapon/parachute.cpp:68
 msgid "Parachute"
 msgstr "Pára-quedas"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Pára-quedas activado automaticamente."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
-msgstr ""
+msgstr "Palavra-passe:"
+
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pausa"
 
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Jogar"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Jogar várias vezes"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Jogador"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Mostrar a energia dos jogadores?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Nome do jogador"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Mostrar o nome dos jogadores?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Lança-Doninhas"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
-msgstr ""
+msgstr "Batalhas públicas"
 
 #: src/menu/main_menu.cpp:75
 msgid "Quit"
 msgstr "Sair"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
-msgstr "Sair Wormux"
+msgstr "Sair do Wormux"
 
 #: src/menu/pause_menu.cpp:63
 msgid "Quit battle"
-msgstr ""
+msgstr "Sair da batalha"
+
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Sair do jogo"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Mapa aleatório"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Lendo o ficheiro de configuração por defeito"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Lendo ficheiro de configuração pessoal"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Resolução"
 
@@ -978,34 +1194,33 @@ msgstr "Resolução"
 msgid "Riot Bomb"
 msgstr "Bomba Motim"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Iniciar jogo"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Diz: "
 
-#: src/menu/options_menu.cpp:84
-#, fuzzy
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
-msgstr "Mover a janela nas extremidades"
+msgstr "Tamanho do limite do scroll"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Mover a janela nas extremidades"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Endereço do servidor:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Servidor disponível na Internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Modo servidor"
 
@@ -1013,41 +1228,74 @@ msgstr "Modo servidor"
 msgid "Shotgun"
 msgstr "Caçadeira"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Mostrar menu das armas"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Mostrar/ocultar interface"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Mostrar/ocultar mini-mapa"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Passar a jogada"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Estalada"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Dar uma estalada ao inimigo para fazê-lo saltar um bocado."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Ângulo de pontaria e distância do passo mais pequeno"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Espingarda de Precisão"
 
 #: src/object/bonus_box.cpp:86
 msgid "Someone put a booby trap into the crate!"
-msgstr ""
+msgstr "Alguém colocou uma armadilha no baú!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Desculpa, de momento, nenhum jogo está à espera de jogadores"
 
-#: src/menu/options_menu.cpp:178
-#, fuzzy
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Desculpe, a sua versão já não é suportada. As versões suportadas são %s. "
+"Você pode fazer o download de uma versão actualizada em http://www.wormux."
+"org/wiki/download.php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
-msgstr "Sons"
+msgstr "Som"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Efeitos sonoros?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Frequência sonora"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Iniciando um novo jogo"
 
@@ -1067,20 +1315,26 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Seringa"
 
-#: src/menu/results_menu.cpp:389
-#, fuzzy
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Falar em batalha em rede"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
-msgstr "Equipas"
+msgstr "Gráficos das equipas"
 
-#: src/menu/results_menu.cpp:378
-#, fuzzy
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
-msgstr "Equipas"
+msgstr "Estatísticas das equipas"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Equipas"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Editor de equipas"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleporte"
@@ -1090,15 +1344,14 @@ msgid "The Cluster Bomb has left the battlefield before it could explode."
 msgstr "A Bomba Cluster saiu do campo de batalha antes de poder explodir."
 
 #: src/weapon/footbomb.cpp:111
-#, fuzzy
 msgid "The Football Bomb has left the battlefield before it could explode."
-msgstr "A Bomba Cluster saiu do campo de batalha antes de poder explodir."
+msgstr "A Bomba Futebol saiu do campo de batalha antes que pudesse explodir."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "O Gnu saiu do campo de batalha antes de explodir"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "A Doninha saiu do campo de batalha antes de explodir"
 
@@ -1110,6 +1363,15 @@ msgstr "O míssil teleguiado saiu do campo de batalha..."
 msgid "The ball left the battlefield before exploding"
 msgstr "A bola saiu do campo de batalha antes de explodir"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"As versões do cliente e servidor são incompatíveis (local=%s, servidor=%s). "
+"Por favor tente outro servidor."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "A ligação expirou. Verifique a firewall!"
@@ -1118,15 +1380,15 @@ msgstr "A ligação expirou. Verifique a firewall!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "A Granada Disco saiu da pista de dança antes que pudesse explodir"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
-msgstr ""
+msgstr "O jogo foi interrompido porque você foi desligado."
 
 #: src/weapon/grenade.cpp:58
 msgid "The grenade left the battlefield before exploding"
 msgstr "A granada saiu do campo de batalha antes de explodir"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Os outros estão à sua espera! Acorda :-)"
 
@@ -1140,18 +1402,22 @@ msgid "The server rejected the connection."
 msgstr "O servidor rejeitou a ligação."
 
 #: src/network/net_error_msg.cpp:51
-#, fuzzy
 msgid "The server rejected the connection: wrong password!"
-msgstr "O servidor rejeitou a ligação."
+msgstr "O servidor rejeitou a ligação: palavra-passe errada!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Existe apenas %i equipa."
 msgstr[1] "Existem apenas %i equipas."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Tempo"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1176,7 +1442,7 @@ msgstr ""
 "Disparar : barra de espaços\n"
 "uma munição por turno"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Ferramentas"
 
@@ -1184,12 +1450,12 @@ msgstr "Ferramentas"
 msgid "Unable to contact host."
 msgstr "Incapaz de contactar servidor."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Incapaz de abrir o diretório dos mapas (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Incapaz de abrir o diretório dos mapas pessoais (%s)!"
@@ -1198,83 +1464,107 @@ msgstr "Incapaz de abrir o diretório dos mapas pessoais (%s)!"
 msgid "Unable to use this port!"
 msgstr "Incapaz de usar esta porta!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Comando desconhecido"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Ilimitada"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Sem nome"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versão"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
-msgstr ""
+msgstr "A verificação da versão falhou porque: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Espere. A equipa %i ainda não está pronta!"
 msgstr[1] "Espere. A equipa %i ainda não estão prontas."
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "À espera do servidor, tudo que pode fazer é cancelar ou conversar!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Arma: Caixa Fogo / Bonus: cai mais depressa"
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Armas"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Página Internet: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Que vergonha para o %s : foi morto por uma simples pistola!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Mostrar as partículas do vento?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Vencedor"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "A iniciar wormux..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux versão "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "CRC de mapa errado!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Nome de mapa errado!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Equipa errada!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Você está sozinho :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Você está sozinho..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Você precisa no mínimo de um mapa válido!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Você precisa de pelo menos duA equipa válidas!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Não será capaz de jogar antes de escolher uma equipa !"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "O seu tiro falhou!"
 
@@ -1282,7 +1572,7 @@ msgstr "O seu tiro falhou!"
 msgid "aka"
 msgstr "também conhecido como"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1292,33 +1582,36 @@ msgstr ""
 "Bombardear : clic esquerdo no alvo\n"
 "um bombardeamento por turno"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
-msgstr ""
+msgstr "não foi possível carregar a configuração"
+
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "jogador personalizado"
 
-#: src/map/ground.cpp:60
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "feito"
 
-#: src/map/maps_list.cpp:82
-#, fuzzy
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
-msgstr "Lendo o ficheiro de configuração por defeito"
+msgstr "Erro ao ler o ficheiro de configuração"
 
 #: src/menu/credits_menu.cpp:79
 msgid "from"
 msgstr "de"
 
-#: src/map/maps_list.cpp:71
-#, fuzzy
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
-msgstr "Erro ao carregar o ficheiro de configuração : %s"
+msgstr "nenhum ficheiro de configuração!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o A carregar música"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o carregar o perfil de som : %s"
@@ -1327,40 +1620,3 @@ msgstr "o carregar o perfil de som : %s"
 #, c-format
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Audio aberto a %d Hz %d bit"
-
-#~ msgid "Connect !"
-#~ msgstr "Ligar !"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Ligar a um jogo internet"
-
-#~ msgid "Refresh"
-#~ msgstr "Recarregar"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Erro ao carregar a informação da equipa %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Erro ao carregar o ficheiro de configuração : %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Erro ao carregar o ficheiro de configuração padrão : %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Erro ao carregar o modo de jogo %s (ficheiro %s):"
-
-#, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "Erro XML durante o carregamento do mapa '%s' :"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s tenta ligar com uma versão diferente : cliente=%s, eu=%s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "E o vencedor é..."
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Você quer mesmo sair ?(Y/N)"
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Rápido, tu és lento demais !!"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 83e06da..472e586 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,80 +8,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2006-10-26 22:52-0200\n"
-"Last-Translator: Romulo Fernandes <razor85 at users.sourceforge.net>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-06-18 00:01-0300\n"
+"Last-Translator: Renan Valente Rangel <rvr777 at gmail.com>\n"
 "Language-Team: Portuguese/Brazil <razor85 at users.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Mapa %s não encontrado :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i jogador conectado"
 msgstr[1] "%i jogadores conectados"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i jogador pronto"
 msgstr[1] "%i jogadores prontos"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) bateu as botas."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> aka %s de %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> de %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
-msgstr "%s Equipe"
+msgstr "Equipe %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
-msgstr "%s Equipe - Remoto"
-
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s cometeu suicídio !"
+msgstr "Equipe %s - Remoto"
 
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s cometeu suicídio !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s) bateu as botas."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s caiu na água."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s caiu pra fora do mapa!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s está morto porque é um desajeitado!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -89,16 +99,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s ganhou %u ponto de energia!"
 msgstr[1] "%s ganhou %u pontos de energia!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s é um psicopata, ele matou um jogador da equipe %s !"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s está morto porque é um desajeitado!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -113,30 +118,30 @@ msgstr "A equipe %s já possui munição infinita para %s!"
 #: src/weapon/skip_turn.cpp:57
 #, c-format
 msgid "%s team has skipped its turn."
-msgstr "a equipe %s pulou a vez."
+msgstr "A equipe %s pulou a vez."
 
 #: src/weapon/cluzooka.cpp:396
 #, fuzzy, c-format
 msgid "%s team has won %u Cluster bazookas!"
 msgid_plural "%s team has won %u Cluster bazookas!"
-msgstr[0] "A equipe '%s' ganhou %u bazookas!"
+msgstr[0] "A equipe '%s' ganhou %u bazooka!"
 msgstr[1] "A equipe '%s' ganhou %u bazookas!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "%s ganhou %u Gnu! Estoure a cabeça deles cowboy!"
 msgstr[1] "%s ganhou %u Gnus! Estoure a cabeça deles cowboy!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "%s ganhou %u Ataque aéreo!"
 msgstr[1] "%s ganhou %u Ataques aéreos!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -151,7 +156,7 @@ msgstr[1] ""
 "%s ganhou %u britadeiras! Não faça muito barulho com ela! Obrigado, seus "
 "vizinhos."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -207,7 +212,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "A equipe '%s' ganhou %u bomba de agrupamento!"
 msgstr[1] "A equipe '%s' ganhou %u bombas de agrupamento!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -244,10 +249,10 @@ msgstr[1] "A equipe '%s' ganhou %u lança chamas!"
 #, fuzzy, c-format
 msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
-msgstr[0] "A equipe '%s' ganhou %u bomba motin!"
-msgstr[1] "A equipe '%s' ganhou %u bombas motin!"
+msgstr[0] "A equipe '%s' ganhou %u futebomba!"
+msgstr[1] "A equipe '%s' ganhou %u futebombas!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -268,14 +273,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "A equipe '%s' ganhou %u revolver!"
 msgstr[1] "A equipe '%s' ganhou %u revolveres!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "%s ganhou %u jetpack! Groovy!"
 msgstr[1] "%s ganhou %u jetpacks! Groovy!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -289,14 +294,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "A equipe '%s' ganhou %u mina!"
 msgstr[1] "A equipe '%s' ganhou %u minas!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "A equipe '%s' ganhou %u paraquedas!"
 msgstr[1] "A equipe '%s' ganhou %u paraquedas!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -319,13 +324,20 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "A equipe '%s' ganhou %u espingarda!"
 msgstr[1] "A equipe '%s' ganhou %u espingardas!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
 #, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "A equipe '%s' ganhou %u tapa!"
+msgstr[1] "A equipe '%s' ganhou %u tapas!"
+
+#: src/weapon/snipe_rifle.cpp:247
+#, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
 "%s team has won %u sniper rifles! Aim and shoot between the eyes!"
-msgstr[0] "A equipe '%s' ganhou %u snipe rifle! Acerte entre os olhos!"
-msgstr[1] "A equipe '%s' ganhou %u snipe rifle! Acerte entre os olhos!"
+msgstr[0] "A equipe '%s' ganhou %u rifle sniper! Acerte entre os olhos!"
+msgstr[1] "A equipe '%s' ganhou %u rifles sniper! Acerte entre os olhos!"
 
 #: src/weapon/submachine_gun.cpp:144
 #, c-format
@@ -365,7 +377,7 @@ msgstr[0] ""
 msgstr[1] ""
 "A equipe '%s' ganhou %u pular turno! Eu sabia que você ia adorar isso."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -374,16 +386,26 @@ msgstr[0] ""
 msgstr[1] ""
 "A equipe '%s' ganhou %u lançadores de tux! Nunca viu um pinguin voador?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "A equipe %s foi derrotada."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(morto)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(idioma do sistema)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -392,14 +414,20 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(ilimitado)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
+"Uma nova versão %s está disponível. Sua versao é a %s. Você pode querer "
+"checar se uma atualização está disponível para o seu SO!"
+
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Ataque aéreo"
 
@@ -407,9 +435,18 @@ msgstr "Ataque aéreo"
 msgid "Airhammer"
 msgstr "Britadeira"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
-msgstr "Todos as equipes"
+msgstr "Todas as equipes"
+
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Jogar"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "E o vencedor é..."
 
 #: src/weapon/baseball.cpp:58
 msgid ""
@@ -425,7 +462,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Bigorna"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autores:"
 
@@ -449,6 +486,15 @@ msgstr "Taco de baseball"
 msgid "Bazooka"
 msgstr "Bazooka"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleporte"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Maçarico"
@@ -461,8 +507,9 @@ msgstr "Bola pula pula"
 msgid "Bye bye tux..."
 msgstr "Adeus tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Não foi possível encontrar a equipe %s!"
@@ -472,24 +519,72 @@ msgstr "Não foi possível encontrar a equipe %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Não foi possível abrir diretório (%s) das equipes!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Não foi possível abrir diretório (%s) das equipes!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Não foi possível abrir diretório (%s) das equipes!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Número de personagens"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Paraquedas"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Paraquedas"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Verificar atualizações online?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Escolher de format aleatória entre os mapas"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Modo de cliente"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Mais desajeitado"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Bomba de agrupamentos"
@@ -497,13 +592,18 @@ msgstr "Bomba de agrupamentos"
 #: src/weapon/cluzooka.cpp:389
 #, fuzzy
 msgid "Cluzooka"
-msgstr "Bazooka"
+msgstr "Cluzooka"
 
 #: src/weapon/suicide.cpp:42
 msgid "Commit Suicide"
 msgstr "Cometer suicídio"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "arquivo de configuração não encontrado!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Conectar ao jogo"
 
@@ -511,11 +611,11 @@ msgstr "Conectar ao jogo"
 msgid "Connected !"
 msgstr "Conectado !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Construir"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Controlado por: "
 
@@ -524,7 +624,7 @@ msgstr "Controlado por: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Falha ao receber ultima versão de %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Falha ao abrir arquivo %s"
@@ -533,11 +633,32 @@ msgstr "Falha ao abrir arquivo %s"
 msgid "Credits"
 msgstr "Créditos"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Granada Festiva"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Mostrar essa mensagem"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Duração de uma rodada:"
 
@@ -545,24 +666,34 @@ msgstr "Duração de uma rodada:"
 msgid "Dynamite"
 msgstr "Dinamite"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "FIM DO JOGO"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
-msgstr ""
+msgstr "Volume de efeitos"
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energia"
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Erro em %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Erro ao carregar a equipe :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -570,7 +701,22 @@ msgstr ""
 "Erro ao criar o directório \"%s\": não foi possível salvar o arquivo de "
 "configuração."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Erro ao criar o directório \"%s\": não foi possível salvar o arquivo de "
+"configuração."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Erro ao criar o directório \"%s\": não foi possível salvar o arquivo de "
+"configuração."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -580,35 +726,39 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Erro: Não foi possível conectar a %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr ""
 "Erro: Não foi possível fazer contato com o servidor para sediar um jogo!"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Não foi possível fazer contato com o servidor para procurar um jogo de "
 "internet!"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Não foi possível iniciar o servidor"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Erro: O seu servidor não pode ser acessado pela internet. Verifique a "
-"configuração do seu firewall"
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Erro: não foi possível localizar o corpo \"%s\" para a equipe \"%s\"."
@@ -620,37 +770,51 @@ msgstr "Lança Chamas"
 #: src/weapon/footbomb.cpp:158
 #, fuzzy
 msgid "Football Bomb"
-msgstr "Bomba Motim"
+msgstr "Futebomba"
+
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Tela cheia?"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Tela cheia?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
-msgstr ""
+msgstr "Jogo"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Modo de jogo"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Nome do jogo:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Lançador Gnu"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
-msgstr ""
+msgstr "Gráficos"
 
 #: src/weapon/grapple.cpp:166
 msgid "Grapple"
 msgstr "Gancho"
 
+#: src/menu/game_mode_editor.cpp:94
+#, fuzzy
+msgid "Gravity"
+msgstr "Gravidade"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granada"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inicialização do terreno..."
 
@@ -658,16 +822,16 @@ msgstr "Inicialização do terreno..."
 msgid "Gun"
 msgstr "Pistola"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Directório HOME (variável de ambiente $HOME) não pode ser encontrado!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Tenha um bom jogo!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Comandante"
 
@@ -680,7 +844,11 @@ msgstr "Comandante: "
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Sediar um jogo"
 
@@ -723,7 +891,11 @@ msgstr ""
 "Como usá-la : clique com o botão esquerdo sobre o alvo\n"
 "uma munição por rodada"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Corra, você está muito devagar !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -731,7 +903,8 @@ msgstr ""
 "Se você encontrou algum bug ou tem alguma sugestão, envie-nos um email (em "
 "inglês, por favor):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Energia inicial"
 
@@ -747,7 +920,7 @@ msgstr ""
 "desejada\n"
 "uma munição por rodada"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inicialização"
 
@@ -755,31 +928,44 @@ msgstr "Inicialização"
 msgid "Initialise map"
 msgstr "Inicializar mapa"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inicializar sons"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inicializar equipes"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "É um presente!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Visite #wormux em irc.freenode.net para saber mais"
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+#, fuzzy
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Desconecta os jogadores designados pelo <nickname>"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Idioma"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Carregar mapas:"
 
@@ -787,7 +973,7 @@ msgstr "Carregar mapas:"
 msgid "Load teams:"
 msgstr "Carregar equipes:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Carregar equipes:"
 
@@ -795,16 +981,15 @@ msgstr "Carregar equipes:"
 msgid "LowGrav"
 msgstr "Baixa gravidade"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
-msgstr ""
+msgstr "Conexão manual"
 
-#: src/menu/game_menu.cpp:84
-#, fuzzy
+#: src/menu/game_menu.cpp:78
 msgid "Map"
-msgstr "Mapas"
+msgstr "Mapa"
 
 #: src/map/map.cpp:294
 #, c-format
@@ -815,52 +1000,62 @@ msgstr "Mapa %s, uma criação de :"
 msgid "Maps"
 msgstr "Mapas"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Energia inicial"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Número máximo de jogadores:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
-msgstr "FPS Máximo:"
+msgstr "FPS Máximo"
 
 #: src/weapon/mine.cpp:213
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
-msgstr "Música?"
+msgstr "Outros"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Mais preciso"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Mais desajeitado"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Mais interessante"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Mais útil"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Mais inútil"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Mais violento"
 
-#: src/menu/options_menu.cpp:143
-msgid "Music volume"
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Paraquedas"
+
+#: src/menu/options_menu.cpp:207
+msgid "Music volume"
+msgstr "Volume da música"
+
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Música?"
 
@@ -868,91 +1063,118 @@ msgstr "Música?"
 msgid "Network Game"
 msgstr "Jogo em Rede"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Inicialização do terreno..."
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
-msgstr "Jogo em Rede"
+msgstr "Novo jogo em rede "
+
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
 
-#: src/weapon/weapon.cpp:657
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Elemento <%s> não encontrado no arquivo de configuração xml!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Ninguém"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Número de personagens"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Número de equipes:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opções"
 
 #: src/menu/pause_menu.cpp:55
-#, fuzzy
 msgid "Options menu"
-msgstr "Opções"
+msgstr "Menu de opções"
 
 #: src/weapon/parachute.cpp:68
 msgid "Parachute"
 msgstr "Paraquedas"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Paraquedas é ativado automaticamente."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
+msgstr "Senha:"
+
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
 msgstr ""
 
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Jogar"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Jogador"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Mostrar a energia dos jogadores?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Mostrar o nome dos jogadores?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Mostrar o nome dos jogadores?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Lançador de doninha"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/menu/network_connection_menu.cpp:155
-#, fuzzy
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
-msgstr "Sair da batalha"
+msgstr "Batalhas públicas"
 
 #: src/menu/main_menu.cpp:75
 msgid "Quit"
 msgstr "Sair"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Sair do Wormux"
 
@@ -960,19 +1182,24 @@ msgstr "Sair do Wormux"
 msgid "Quit battle"
 msgstr "Sair da batalha"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Iniciar jogo"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Mapa aleatório:"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Lendo arquivo de configuração padrão"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Lendo arquivo de configuração pessoal"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Resolução"
 
@@ -980,34 +1207,34 @@ msgstr "Resolução"
 msgid "Riot Bomb"
 msgstr "Bomba Motim"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Iniciar jogo"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Diz: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
-msgstr "Mover a tela na borda"
+msgstr "Tamanho da borda de rolagem"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Mover a tela na borda"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Endereço do servidor:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Servidor disponível na Internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Modo do Servidor"
 
@@ -1015,10 +1242,36 @@ msgstr "Modo do Servidor"
 msgid "Shotgun"
 msgstr "Espingarda"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Menu de opções"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Pular a vez"
 
+#: src/weapon/slap.cpp:73
+#, fuzzy
+msgid "Slap"
+msgstr "Tapa"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Rifle Sniper"
@@ -1027,29 +1280,35 @@ msgstr "Rifle Sniper"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Alguém colocou uma armadilha no caixote!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Desculpe, atualmente nenhum jogo está esperando jogadores"
 
-#: src/menu/options_menu.cpp:178
-#, fuzzy
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Sons"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Efeitos sonoros?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Frequência do som"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Iniciando um novo jogo"
 
@@ -1069,20 +1328,27 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Seringa"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
 #, fuzzy
+msgid "Talk in network battle"
+msgstr "Retornar a batalha"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
-msgstr "Equipes"
+msgstr "Gráfico das equipes"
 
-#: src/menu/results_menu.cpp:378
-#, fuzzy
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
-msgstr "Equipes"
+msgstr "Estatísticas das equipes"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Equipes"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleporte"
@@ -1094,13 +1360,13 @@ msgstr "A bomba de agrupamentos deixou o cenário antes que explodisse"
 #: src/weapon/footbomb.cpp:111
 #, fuzzy
 msgid "The Football Bomb has left the battlefield before it could explode."
-msgstr "A bomba de agrupamentos deixou o cenário antes que explodisse"
+msgstr "A Futebomba deixou o cenário antes que explodisse"
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "O Gnu deixou o cenário antes que explodisse"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "A doninha deixou o cenário antes que explodisse"
 
@@ -1112,6 +1378,15 @@ msgstr "O míssil automático deixou o campo de batalha..."
 msgid "The ball left the battlefield before exploding"
 msgstr "A bola pula pula deixou o cenário antes que explodisse"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"As versões do cliente e do servidor são incompatíveis (local=%s, servidor=%"
+"s). Por favor tente outro servidor."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "A conexão expirou. Verifique se não existe um firewall no caminho!"
@@ -1120,7 +1395,7 @@ msgstr "A conexão expirou. Verifique se não existe um firewall no caminho!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "A granada festiva deixou o cenário antes que explodisse"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "O jogo foi interrompido porque você foi desconectado."
 
@@ -1128,7 +1403,7 @@ msgstr "O jogo foi interrompido porque você foi desconectado."
 msgid "The grenade left the battlefield before exploding"
 msgstr "A granada deixou o cenário antes que explodisse"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Os outros estão esperando por você! ACORDA!"
 
@@ -1142,18 +1417,22 @@ msgid "The server rejected the connection."
 msgstr "O servidor rejeitou a conexão."
 
 #: src/network/net_error_msg.cpp:51
-#, fuzzy
 msgid "The server rejected the connection: wrong password!"
-msgstr "O servidor rejeitou a conexão."
+msgstr "O servidor rejeitou a conexão: senha incorreta!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Existe apenas %i equipe"
 msgstr[1] "Existe apenas %i equipes"
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1178,7 +1457,7 @@ msgstr ""
 "Atirar : tecla de espaço\n"
 "uma munição por rodada"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Ferramentas"
 
@@ -1186,12 +1465,12 @@ msgstr "Ferramentas"
 msgid "Unable to contact host."
 msgstr "Não foi possível fazer contato com o servidor!"
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Não foi possível abrir diretório (%s) dos mapas!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Não foi possível abrir diretório (%s) dos mapas!"
@@ -1200,84 +1479,109 @@ msgstr "Não foi possível abrir diretório (%s) dos mapas!"
 msgid "Unable to use this port!"
 msgstr "Não foi possível usar essa porta!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Comando desconhecido"
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(ilimitado)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Sem nome"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versão"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
-msgstr ""
+msgstr "Verificação de versão falhou porque: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Espere! %i jogador ainda não está pronto!"
 msgstr[1] "Espere! %i jogaderes ainda não estão prontos!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 "Esperando pelo servidor, tudo que você pode fazer é conversar ou cancelar!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Armas:"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Site: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Que vergonha para o %s - ele foi morto por uma simples arma!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Partículas de vento?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Vencedor"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Iniciando wormux..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux versão "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Você está sozinho :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Você está sozinho..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Você precisa de pelo menos um mapa válido !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Você precisa de pelo menos duas equipes válidas !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Você não vai conseguir jogar antes de selecionar uma equipe !"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Você errou o tiro!"
 
@@ -1285,7 +1589,7 @@ msgstr "Você errou o tiro!"
 msgid "aka"
 msgstr "aka"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1295,33 +1599,36 @@ msgstr ""
 "Bombardear : clicar com o botão esquerdo no alvo\n"
 "um bombardeio por rodada"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "falha ao carregar configuração"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "pronto"
 
-#: src/map/maps_list.cpp:82
-#, fuzzy
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
-msgstr "Lendo arquivo de configuração padrão"
+msgstr "Erro ao ler arquivo de configuração"
 
 #: src/menu/credits_menu.cpp:79
 msgid "from"
 msgstr "de"
 
-#: src/map/maps_list.cpp:71
-#, fuzzy
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
-msgstr "Erro ao carregar o arquivo de configuração: %s"
+msgstr "arquivo de configuração não encontrado!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Carregando música"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Carregando perfil de som: %s"
@@ -1331,14 +1638,25 @@ msgstr "o Carregando perfil de som: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Audio carregado a %d Hz %d bit"
 
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Erro: O seu servidor não pode ser acessado pela internet. Verifique a "
+#~ "configuração do seu firewall"
+
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr ""
+#~ "%s está tentando conectar com uma versão diferente: cliente=%s, eu=%s."
+
 #~ msgid "Connect !"
 #~ msgstr "Conectar !"
 
 #~ msgid "Connect to an internet game"
 #~ msgstr "Conectar a um jogo de internet"
 
-#~ msgid "Refresh"
-#~ msgstr "Atualizar"
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Você deseja mesmo sair? (Y/N)"
 
 #~ msgid "Error loading team's data %s:"
 #~ msgstr "Erro ao carregar as informações (%s) da equipe :"
@@ -1353,29 +1671,12 @@ msgstr "o Audio carregado a %d Hz %d bit"
 #~ msgstr "Erro ao carregar o modo de jogo %s (arquivo %s):"
 
 #, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "Erro XML durante o carregamento do mapa '%s' :"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr ""
-#~ "%s está tentando conectar com uma versão diferente: cliente=%s, eu=%s."
-
-#~ msgid ""
-#~ "The client and server versions are incompatible (local=%s, server=%s). "
-#~ "Please try another server."
-#~ msgstr ""
-#~ "As versões do cliente e do servidor são incompatíveis (local=%s, servidor="
-#~ "%s). Por favor tente outro servidor."
-
-#~ msgid "And the winner is..."
-#~ msgstr "E o vencedor é..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Corra, você está muito devagar !!"
+#~ msgid "Network deinitialization"
+#~ msgstr "Inicialização do terreno..."
 
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Você deseja mesmo sair? (Y/N)"
+#~ msgid "Refresh"
+#~ msgstr "Atualizar"
 
 #, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Inicialização do terreno..."
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "Erro XML durante o carregamento do mapa '%s' :"
diff --git a/po/ro.po b/po/ro.po
index dcfe499..b1112e8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-05-11 13:50+0300\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-16 00:51+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor at gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgstr ""
 "X-Poedit-Country: ROMANIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Harta %s nu a fost găsită :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
@@ -36,7 +36,7 @@ msgstr[0] "%i jucător conectat"
 msgstr[1] "%i jucători conectați"
 msgstr[2] "%i de jucători conectați"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
@@ -44,51 +44,62 @@ msgstr[0] "%i jucător e gata"
 msgstr[1] "%i jucători sunt gata"
 msgstr[2] "%i de jucători sunt gata"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) a murit."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> cunoscut și ca %s din %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> din %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Echipa %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Echipa %s - la distanță"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s se sinucide !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s C/S"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s din echipa %s s-a sinucis !"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "%s din echipa %s a murit."
+
+#: src/game/game.cpp:709
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s a căzut în apă."
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s din echipa %s a căzut în apă!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:703
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s a căzut în afara hărții!"
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s din echipa %s a căzut în afara hărții!"
+
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s din echipa %s a lovit prea tare pământul!"
+
+# what about female names?
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s din echipa %s decedat prin propria stângăcie!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -98,17 +109,11 @@ msgstr[0] "%s a câștigat %u punct de energie!"
 msgstr[1] "%s a câștigat %u puncte de energie!"
 msgstr[2] "%s a câștigat %u de puncte de energie!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "Psihopatia sălășluiește în %s, a omorât un membru al echipei %s!"
 
-# what about female names?
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s decedat prin propria stângăcie!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -140,7 +145,7 @@ msgstr[0] "Echipa %s a câștigat %u rachetă cu schije!"
 msgstr[1] "Echipa %s a câștigat %u rachete cu schije!"
 msgstr[2] "Echipa %s a câștigat %u de rachete cu schije!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
@@ -148,7 +153,7 @@ msgstr[0] "Echipa %s a câștigat %u antilopă gnu! Rade-i pe toți!"
 msgstr[1] "Echipa %s a câștigat %u antilope gnu! Rade-i pe toți!"
 msgstr[2] "Echipa %s a câștigat %u de antilope gnu! Rade-i pe toți!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
@@ -156,7 +161,7 @@ msgstr[0] "'%s a câștigat %u atac aerian"
 msgstr[1] "'%s a câștigat %u atacuri aeriene"
 msgstr[2] "'%s a câștigat %u de atacuri aeriene"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -174,13 +179,13 @@ msgstr[2] ""
 "Echipa %s a câștigat %u de ciocane pneumatice! Nu face prea mult zgomot cu "
 "ele! Îți mulțumim, vecinii tăi."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
-msgstr[0] "Echipa %s a câștigat %u nicovală! Storcoșește tot cu ea!"
-msgstr[1] "Echipa %s a câștigat %u nicovale! Storcoșește tot cu ele!"
-msgstr[2] "Echipa %s a câștigat %u de nicovale! Storcoșește tot cu ele!"
+msgstr[0] "Echipa %s a câștigat %u nicovală! Storcește tot cu ea!"
+msgstr[1] "Echipa %s a câștigat %u nicovale! Storcește tot cu ele!"
+msgstr[2] "Echipa %s a câștigat %u de nicovale! Storcește tot cu ele!"
 
 #: src/weapon/auto_bazooka.cpp:329
 #, c-format
@@ -223,10 +228,10 @@ msgstr[0] ""
 "Echipa %s a câștigat %u lampă cu carbid! Dacă ai sub 18 ani, cere părinților "
 "voie să o folosești!"
 msgstr[1] ""
-"Echipa %s a câștigat %u lampi cu carbid! Dacă ai sub 18 ani, cere părinților "
+"Echipa %s a câștigat %u lămpi cu carbid! Dacă ai sub 18 ani, cere părinților "
 "voie să le folosești!"
 msgstr[2] ""
-"Echipa %s a câștigat %u de lampi cu carbid! Dacă ai sub 18 ani, cere "
+"Echipa %s a câștigat %u de lămpi cu carbid! Dacă ai sub 18 ani, cere "
 "părinților voie să le folosești!"
 
 #: src/weapon/bounce_ball.cpp:113
@@ -257,7 +262,7 @@ msgstr[2] "Echipa %s a câștigat %u de bombe cu schije!"
 # XXX: example: "mină" "mine" "de mine"
 # XXX: Also, I can't insert the plural termination in there which can be different depending on gender and word.
 # XXX[ro]: workaround the problem by a kludgy translation
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -317,7 +322,7 @@ msgstr[2] "Echipa %s a câștigat %u de mingii de fotbal american!"
 # XXX: example: "mină" "mine" "de mine"
 # XXX: Also, I can't insert the plural termination in there which can be different depending on gender and word.
 # XXX[ro]: workaround the problem by a kludgy translation
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -353,7 +358,7 @@ msgstr[0] "Echipa %s a câștigat %u pistol!"
 msgstr[1] "Echipa %s a câștigat %u pistoale!"
 msgstr[2] "Echipa %s a câștigat %u de pistoale!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
@@ -367,7 +372,7 @@ msgstr[2] "Echipa %s a câștigat %u de propulsoare personale! Tare!"
 # XXX: example: "mină" "mine" "de mine"
 # XXX: Also, I can't insert the plural termination in there which can be different depending on gender and word.
 # XXX[ro]: workaround the problem by a kludgy translation
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -395,7 +400,7 @@ msgstr[2] "Echipa %s a câștigat %u de mine!"
 # XXX: example: "mină" "mine" "de mine"
 # XXX: Also, I can't insert the plural termination in there which can be different depending on gender and word.
 # XXX[ro]: workaround the problem by a kludgy translation
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
@@ -409,7 +414,7 @@ msgstr[2] "Echipa %s a câștigat %u de parașute!"
 # XXX: example: "mină" "mine" "de mine"
 # XXX: Also, I can't insert the plural termination in there which can be different depending on gender and word.
 # XXX[ro]: workaround the problem by a kludgy translation
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -451,7 +456,21 @@ msgstr[2] "Echipa %s a câștigat %u de puști!"
 # XXX: example: "mină" "mine" "de mine"
 # XXX: Also, I can't insert the plural termination in there which can be different depending on gender and word.
 # XXX[ro]: workaround the problem by a kludgy translation
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Echipa %s a câștigat %u plesneală!"
+msgstr[1] "Echipa %s a câștigat %u plesneli!"
+msgstr[2] "Echipa %s a câștigat %u de plesneli!"
+
+# XXX: the topic of the phrase might change for feminine, neutral or masculine in some languages
+# XXX: example: "cocktail Molotov" "cocktail-uri Molotov" "de cocktail-uri Molotov" for Romanian.
+# XXX: example: "lansator de grenade" "lansatoare de grenade" "de lasatoare de grenade"
+# XXX: example: "mină" "mine" "de mine"
+# XXX: Also, I can't insert the plural termination in there which can be different depending on gender and word.
+# XXX[ro]: workaround the problem by a kludgy translation
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -534,7 +553,7 @@ msgstr[2] "Echipa %s a câștigat %u de salturi de tură! Sigur o să-ți placă
 # XXX: example: "mină" "mine" "de mine"
 # XXX: Also, I can't insert the plural termination in there which can be different depending on gender and word.
 # XXX[ro]: workaround the problem by a kludgy translation
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -547,16 +566,26 @@ msgstr[2] ""
 "Echipa %s a câștigat %u de lansatoare de tux! N-ai mai văzut un pinguin "
 "zburător?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "Echipa %s a fost nimicită."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s a luat cu el în mormânt un membru al echipei %s!"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(mort)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(limba sistemului)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(un moment necunoscut)"
 
@@ -565,7 +594,7 @@ msgstr "(un moment necunoscut)"
 msgid "(unlimited)"
 msgstr "(infinit)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -575,18 +604,30 @@ msgstr ""
 "doriți să verificați dacă există o versiune actualizată pentru sistemul de "
 "operare folosit."
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Adaugă o echipă particularizată"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Atac aerian"
 
 #: src/weapon/airhammer.cpp:74
 msgid "Airhammer"
-msgstr "Ciocan pnumatic"
+msgstr "Ciocan pneumatic"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Toate echipele"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "ÃŽntotdeauna"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Iar câștigătorul este..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -601,7 +642,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Nicovală"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autori:"
 
@@ -626,6 +667,14 @@ msgstr "Bâtă de basebal"
 msgid "Bazooka"
 msgstr "Proiectil reactiv"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Înaintea acțiunii"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "BliÈ›"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Lampă de sudură"
@@ -638,8 +687,9 @@ msgstr "Minge săltăreață"
 msgid "Bye bye tux..."
 msgstr "Pa pa tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Echipa %s nu poate fi găsită!"
@@ -649,24 +699,69 @@ msgstr "Echipa %s nu poate fi găsită!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Directorul personal cu echipe nu poate fi deschis (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Directorul cu echipe nu poate fi deschis (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Directorul cu echipe particularizate nu poate fi deschis (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Centrează camera pe personaj"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Schimbă personajul curent"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Schimbă unghiul de țintire"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Schimbă categoria armei"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Schimbă cronometrul armei"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Personaj"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Schimb de personaje"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Se verifică actualizările online?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Alege la întâmplare una din diferitele hărți"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Clasic"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Click: Centrează camera pe personaj"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Mod client"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Cel mai stângaci"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Bombă cu schije"
@@ -679,7 +774,11 @@ msgstr "Proiectil reactiv cu schije"
 msgid "Commit Suicide"
 msgstr "Comite suicid"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Meniu de configurare"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Conectare la joc"
 
@@ -687,11 +786,11 @@ msgstr "Conectare la joc"
 msgid "Connected !"
 msgstr "Conectat!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Construiește"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Controlat de: "
 
@@ -700,7 +799,7 @@ msgstr "Controlat de: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Nu s-a putut prelua ultima versiune de la %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Nu a fost posibilă deschiderea fișierului %s"
@@ -709,11 +808,32 @@ msgstr "Nu a fost posibilă deschiderea fișierului %s"
 msgid "Credits"
 msgstr "Merite"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Sănătatea pierdută la fiecare tură în modul mortal"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Șterge echipa particularizată"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Grenadă disco"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Afișează acest mesaj"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Tragere cu mausul: Mută camera"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Durata până la modul mortal"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Durata unei ture"
 
@@ -721,24 +841,34 @@ msgstr "Durata unei ture"
 msgid "Dynamite"
 msgstr "Dinamită"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "SFÂRȘITUL JOCULUI"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Volumul efectelor"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energie"
+
+#: src/tool/error.cpp:63
+#, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Eroare în %s:%lu (Wormux %s) : %s"
+
+#: src/include/action_handler.cpp:210
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Eroare în %s:%lu"
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr "Eroare de inițializare a rețelei: Clientul %s nu este de acord!! - %s"
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Eroare la încărcarea echipei:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -746,7 +876,22 @@ msgstr ""
 "Eroare în timpul creări directorului „%s”: fișierul de configurare nu poate "
 "fi stocat."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Eroare în timpul ștergerii directorului „%s”: echipa particularizată nu "
+"poate fi ștearsă."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Eroare în timpul ștergerii fișierului „%s”: echipa particularizată nu poate "
+"fi ștearsă."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -756,36 +901,43 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Nu a fost posibilă conectarea la %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
 msgstr ""
 "Eroare: Nu a fost posibilă contactarea la serverul index pentru a găzdui un "
 "joc"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Eroare: Nu a fost posibilă contactarea la serverul index pentru a căuta un "
 "joc pe internet"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Eroare: Nu a fost posibilă pornirea server-ului"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Eroare: Serverul nu este aceesibil din internet. Verificați configurația "
-"firewall-ului"
+"Eroare: Serverul tău nu poate fi accesat din internet. Verificați "
+"configurația firewall -ului: Portul TCP %s trebuie să accepte conexiuni "
+"dinspre exterior. Dacă nu aveți conexiune directă la internet, verificați "
+"configurația router-ului: Portul TCP %s trebuie să fie redirectat către "
+"calculatorul tău."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Eroare: corpul „%s” pentru echipa „%s” nu poate fi găsit."
@@ -798,23 +950,31 @@ msgstr "Aruncător de flăcări"
 msgid "Football Bomb"
 msgstr "Bombă-minge de fotbal"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Tot ecranul / fereastră"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Tot ecranul?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Joc"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Modul jocului"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Numele jocului:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Lansator de antilope gnu"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr "Grafică"
 
@@ -822,11 +982,15 @@ msgstr "Grafică"
 msgid "Grapple"
 msgstr "Ghiară de agățare"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Gravitație"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Grenadă"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inițializare teren..."
 
@@ -834,16 +998,16 @@ msgstr "Inițializare teren..."
 msgid "Gun"
 msgstr "Pistol"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Directorul personal (variabila de mediu $HOME) nu a putut fi găsit!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Distracție plăcută!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Comandant șef"
 
@@ -857,7 +1021,11 @@ msgstr "Comandant șef: "
 msgid "Help"
 msgstr "Ajutor"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Salt înalt"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Găzduiește un joc"
 
@@ -899,7 +1067,11 @@ msgstr ""
 "Cum se folosește : clic stânga pe țintă\n"
 "un proiectil per rundă"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Grăbește-te te miști prea încet!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -907,7 +1079,8 @@ msgstr ""
 "Dacă găsiți probleme sau doriți noi capabilități, trimiteți-ne un mesaj "
 "electronic (vă rugăm, în engleză):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Energie inițială"
 
@@ -922,7 +1095,7 @@ msgstr ""
 "Foc : țineți tasta spațiu apăsată până la puterea dorită\n"
 "un proiectil per rundă"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inițializare"
 
@@ -930,34 +1103,46 @@ msgstr "Inițializare"
 msgid "Initialise map"
 msgstr "Inițializare hartă"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inițializare sunete"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inițializare echipe"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "E un cadou!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Propulsor personal"
 
 # URM0-1: search URM0-2 for next line
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 "Intrați pe #wormux în rețeaua irc.freenode.net pentru a găsi parteneri de "
 "joc."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Salt"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Salt înapoi"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Aruncă afară din joc jucătorii indicați de <nickname>"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Limba"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Încărcare hărți:"
 
@@ -965,7 +1150,7 @@ msgstr "Încărcare hărți:"
 msgid "Load teams:"
 msgstr "Încărcare echipe:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Echipe locale:"
 
@@ -974,13 +1159,13 @@ msgid "LowGrav"
 msgstr "Gravitație scăzută"
 
 # URM1-2
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "Conectare manuală"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Hartă"
 
@@ -993,11 +1178,15 @@ msgstr "Harta %s, o creație a lui: "
 msgid "Maps"
 msgstr "Hărți"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Energie maximă"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Număr maxim de jucători:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Numărul maxim de C/S"
 
@@ -1005,39 +1194,43 @@ msgstr "Numărul maxim de C/S"
 msgid "Mine"
 msgstr "Mină"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Cel mai bun țintaș"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Cel mai stângaci"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Cel mai mare trădător"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Cel mai folositor"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Cel mai inutil"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Cel mai violent"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Mută camera cu mausul sau săgețile"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Mută personajul"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Volumul muzicii"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Muzică?"
 
@@ -1045,32 +1238,48 @@ msgstr "Muzică?"
 msgid "Network Game"
 msgstr "Joc în rețea"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Inițializare rețea"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Niciodată"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "Un nou joc în rețea pornit la "
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Avertisment la jucător nou?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Nu a fost găsit nici un element <%s> în fișierul xml de configurare!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Nimeni!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Numărul de personaje"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Numărul de echipe:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "Pe un personaj: Îl schimbă pe cel activ"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "Pe hartă: Selectează ținta"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Opțiuni"
@@ -1084,42 +1293,54 @@ msgstr "Meniul de opțiuni"
 msgid "Parachute"
 msgstr "Parașută"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Parașuta se activează automat."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr "Parola:"
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pauză"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Pornește jocul"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Joacă de câteva ori"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Jucător"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Energia jucătorului?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Numele jucătorului"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Numele jucătorului?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Lansator de sconcși"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr "Bătălii publice"
 
@@ -1127,7 +1348,7 @@ msgstr "Bătălii publice"
 msgid "Quit"
 msgstr "Ieșire"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Ieșire din Wormux"
 
@@ -1135,19 +1356,23 @@ msgstr "Ieșire din Wormux"
 msgid "Quit battle"
 msgstr "Părăsește bătălia"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Părăsește jocul"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Hartă aleatoare"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Se citește fișierul implicit de configurare"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Se citește fișierul personal de configurare"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Rezoluție"
 
@@ -1155,33 +1380,33 @@ msgstr "Rezoluție"
 msgid "Riot Bomb"
 msgstr "Cocktail Molotov"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Rulează jocul"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Spune: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr "Dimensiunea marginii de derulare"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Derulare la margine"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Adresa serverului:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Server disponibil în internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Mod server"
 
@@ -1189,10 +1414,35 @@ msgstr "Mod server"
 msgid "Shotgun"
 msgstr "Pușcă"
 
+# XXX: nu-mi place cum sună; probabil am să revin la "Opțiuni"
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Arată meniul de arme"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Arată/ascunde interfața"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Arată/ascunde mini-harta"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Sare rândul"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Plesneală"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Plesnește inamicul să sară un pic."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Unghi de țintire și pași mai mici"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Pușcă cu lunetă"
@@ -1201,28 +1451,38 @@ msgstr "Pușcă cu lunetă"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Cineva a pus o capcană în cutie!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Din păcate, acum nu există nici un joc în așteptare de jucători"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Ne pare rău, versiunea ta nu mai este suportată. Versiuni suportate sunt %s. "
+"Poți descărca o versiune actualizată de la http://www.wormux.org/wiki/"
+"download.php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Sunet"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Efecte sonore?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Frecvența sunetului"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Sunete"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Se începe un nou joc"
 
@@ -1242,35 +1502,43 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Seringă"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Discuție pe câmpul de bătălie în rețea"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr "Grafice echipe"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr "Statistici echipe"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Echipe"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Editor de echipe"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportare"
 
 #: src/weapon/cluster_bomb.cpp:146
 msgid "The Cluster Bomb has left the battlefield before it could explode."
-msgstr "Bomba cu schije a parăsit câmpul de luptă înainte de a exploda."
+msgstr "Bomba cu schije a părăsit câmpul de luptă înainte de a exploda."
 
 #: src/weapon/footbomb.cpp:111
 msgid "The Football Bomb has left the battlefield before it could explode."
-msgstr "Bomba-minge a parăsit câmpul de luptă înainte de a exploda."
+msgstr "Bomba-minge a părăsit câmpul de luptă înainte de a exploda."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Antilopa gnu a părăsit câmpul de luptă înainte de a exploda"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Sconcsul a părăsit câmpul de luptă înainte de a exploda"
 
@@ -1282,6 +1550,15 @@ msgstr "Racheta automată a părăsit câmpul de luptă ..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Mingea a părăsit câmpul de luptă înainte de a exploda"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Versiunile de client și de server sunt incompatibile (local=%s, server=%s). "
+"Încercați alt server."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
@@ -1292,7 +1569,7 @@ msgstr ""
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Grenada disco a părăsit ringul de dans înainte de a exploda"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "Jocul s-a întrerupt pentru că v-ați deconectat."
 
@@ -1300,7 +1577,7 @@ msgstr "Jocul s-a întrerupt pentru că v-ați deconectat."
 msgid "The grenade left the battlefield before exploding"
 msgstr "Grenada a părăsit câmpul de luptă înainte de a exploda"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Ceilalți te-așteaptă! Trezește-te :-)"
 
@@ -1317,7 +1594,7 @@ msgstr "Serverul a refuzat conexiunea."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Serverul a refuzat conexiunea: parolă greșită!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
@@ -1325,14 +1602,19 @@ msgstr[0] "Există doar %i echipă."
 msgstr[1] "Există doar %i echipe."
 msgstr[2] "Există doar %i de echipe."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Timp"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
 "Fire : keep space key pressed until the desired strength\n"
 "an ammo per turn"
 msgstr ""
-"Temporizare: rotița mausului sau paginăsus/paginăjos\n"
+"Temporizare: rotița mausului sau pagină-sus/pagină-jos\n"
 "Unghiul : sus/jos\n"
 "Foc : țineți tasta spațiu apăsată până la puterea dorită\n"
 "un proiectil per rundă"
@@ -1344,12 +1626,12 @@ msgid ""
 "Fire : space key\n"
 "an ammo per turn"
 msgstr ""
-"Temporizare: rotița mausului sau paginăsus/paginăjos\n"
+"Temporizare: rotița mausului sau pagină-sus/pagină-jos\n"
 "Unghiul : sus/jos\n"
 "Foc : țineți tasta spațiu\n"
 "un proiectil per rundă"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Unelte"
 
@@ -1357,12 +1639,12 @@ msgstr "Unelte"
 msgid "Unable to contact host."
 msgstr "Nu a fost posibilă contactarea calculatorului."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Nu a fost posibilă deschiderea directorului cu hărți (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Nu a fost posibilă deschiderea directorului personal cu hărți (%s)!"
@@ -1371,20 +1653,28 @@ msgstr "Nu a fost posibilă deschiderea directorului personal cu hărți (%s)!"
 msgid "Unable to use this port!"
 msgstr "Nu a fost posibilă folosirea acestui port!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Comandă necunoscută"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "nelimitat"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Fără nume"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Versiunea"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Verificare versiunii a eșuat pentru că: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
@@ -1392,64 +1682,80 @@ msgstr[0] "Așteaptă! %i jucător nu e gata încă!"
 msgstr[1] "Așteaptă! %i jucători nu sunt gata încă!"
 msgstr[2] "Așteaptă! %i de jucători nu sunt gata încă!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Se așteaptă serverul, tot ce puteți face e să anulați sau să vorbiți!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Armă: Foc / Cutie cu bonus: cade repede"
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Arme"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
-msgstr "Situl web: "
+msgstr "Saitul web: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Ce umilire pentru %s - a fost ucis cu un simplu pistol!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Particulele de vânt?"
 
 #
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Câștigător"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Se lansează Wormux..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Versiunea Wormux "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "Suma de control a hărții e greșită!"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Numele hărții e greșit!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Echipa e greșită!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Nu mai e nimeni în afară de tine :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Nu mai e nimeni altcineva..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Aveți nevoie de cel puțin o hartă validă !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Aveți nevoie de cel puțin două echipe valide !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Nu vei putea să joci dacă nu selectezi o echipă!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Focul dvs. a fost tras în aer!"
 
@@ -1458,7 +1764,7 @@ msgstr "Focul dvs. a fost tras în aer!"
 msgid "aka"
 msgstr "zis"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1468,15 +1774,20 @@ msgstr ""
 "bombardare : clic stânga pe țintă\n"
 "un proiectil per rundă"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "configurația nu a putut fi încărcată"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "jucător personalizat"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "finalizat"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "eroare la analiza fișierului de configurare"
 
@@ -1485,15 +1796,15 @@ msgstr "eroare la analiza fișierului de configurare"
 msgid "from"
 msgstr "de la:"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "nu există nici un fișier de configurare!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Se încarcă muzica"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Se încarcă profilul de sunet: %s"
@@ -1503,73 +1814,118 @@ msgstr "o Se încarcă profilul de sunet: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Se deschide canalul adio la %d Hz %d biți"
 
-#~ msgid "Connect !"
-#~ msgstr "Conectat!"
+#~ msgid "Automatically join a game"
+#~ msgstr "Intrare automată în joc"
 
-#~ msgid "Connect to an internet game"
-#~ msgstr "Conectare la un joc pe internet"
+#~ msgid ""
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
+#~ msgstr ""
+#~ "Nu există servere publice disponibile iar configurația manuală a "
+#~ "conexiunii este incorectă. Încercați conectarea manuală."
 
-#~ msgid "Refresh"
-#~ msgstr "Reîmprospătează"
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Eroare: Serverul nu este accesibil din internet. Verificați configurația "
+#~ "firewall-ului"
 
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Eroare la încărcarea datelor pentru echipa %s:"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opțiune ilegală -- %c\n"
 
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Eroare în timpul încărcării fișierul de configurare: %s"
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: opțiune nevalidă -- %c\n"
 
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Eroare în timpul încărcării fișierul de configurare implicită: %s"
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: opțiunea „%c%s” nu are argument\n"
 
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Eroare în timpul încărcării modului de joc %s (fișierul %s):"
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: opțiunea „%s” e ambiguă\n"
 
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "Eroare XML în timpul încărcării hărții „%s”: "
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: opțiunea „%s” are nevoie de un argument\n"
 
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr ""
-#~ "%s încearcă să se conecteze cu o versiune diferită: client=%s, eu=%s."
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: opțiunea „--%s” nu are argument\n"
 
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: opțiunea „-W %s” nu are argument\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: opțiunea „-W %s” este ambiguă\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: opțiunea are nevoie de un argument -- %c\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: opțiunea „%c%s” nu este recunoscută\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: opțiune nerecunoscută „--%s”\n"
+
+#, fuzzy
 #~ msgid ""
-#~ "The client and server versions are incompatible (local=%s, server=%s). "
-#~ "Please try another server."
-#~ msgstr ""
-#~ "Versiunile de client și de server sunt incompatibile (local=%s, server=%"
-#~ "s). Încercați alt server."
+#~ "\n"
+#~ "Connected\n"
+#~ msgstr "Conectat!"
 
-#~ msgid "And the winner is..."
-#~ msgstr "Iar câștigătorul este..."
+#, fuzzy
+#~ msgid "  Most sold-out  :  "
+#~ msgstr "  Cel mai mare trădător :  %s (%i).\n"
 
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Grăbește-te te miști prea încet!!"
+#, fuzzy
+#~ msgid "  Most useful   :  "
+#~ msgstr "  Cel mai folositor     :  %s (%i).\n"
 
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Chiar doriți să abandonați? (D/N)"
+#, fuzzy
+#~ msgid "  Most useless  :  "
+#~ msgstr "  Cel mai inutil        :  %s (%i).\n"
 
 #, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Deinițializare rețea"
+#~ msgid "  Most violent  :  "
+#~ msgstr "  Cel mai violent       :  %s (%i).\n"
 
-# XXX: I guess this could have been marked with a simple * to avoid confusions
-# I personally know the context, but some might not
-#~ msgid "(current)"
-#~ msgstr "(actual)"
+#, fuzzy
+#~ msgid " : Run game !"
+#~ msgstr "Rulează jocul"
 
-#~ msgid ""
-#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
-#~ "blowtorch, submachine gun) and surely many other things don't work either!"
-#~ msgstr ""
-#~ "Unele arme sunt dezactivate datorită unor probleme cunoscute (ghiara de "
-#~ "agățare, ciocanul pneumatic, lampa de sudură, mitraliera semiautomată) "
-#~ "și, mai mult ca sigur, mai sunt și alte lucruri care nu funcționează!"
+#~ msgid " has joined the party"
+#~ msgstr " a intrat în partidă"
 
-#~ msgid ""
-#~ "WARNING!! Network is still under developement and therefore a little "
-#~ "experimental."
-#~ msgstr ""
-#~ "AVERTISMENT!! Codul pentru rețea este încă în dezvoltare și, de aceea, "
-#~ "puțin experimental."
+#~ msgid " has left the party"
+#~ msgstr " a ieșit din partidă"
+
+#, fuzzy
+#~ msgid " not found"
+#~ msgstr "! Harta %s nu a fost găsită :-("
+
+# URM1-2
+#, fuzzy
+#~ msgid "%i connections up!"
+#~ msgstr "fiecare deconectare!"
+
+#, fuzzy
+#~ msgid "%i players connected"
+#~ msgstr "%i jucător conectat"
+
+#, fuzzy
+#~ msgid "%i players ready"
+#~ msgstr "%i jucător e gata"
+
+#~ msgid "%s has lost %u point of energy."
+#~ msgid_plural "%s has lost %u points of energy."
+#~ msgstr[0] "%s a pierdut %u punct de energie."
+#~ msgstr[1] "%s a pierdut %u puncte de energie."
+#~ msgstr[2] "%s a pierdut %u de puncte de energie."
+
+#, fuzzy
+#~ msgid "%s has won %u points of energy!"
+#~ msgstr "%s a câștigat %u punct de energie!"
+
+#, fuzzy
+#~ msgid "%s is not ready"
+#~ msgstr "%i jucător e gata"
 
 # XXX: the topic of the phrase might change for feminine, neutral or masculine in some languages
 # XXX: example: "cocktail Molotov" "cocktail-uri Molotov" "de cocktail-uri Molotov" for Romanian.
@@ -1631,117 +1987,9 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr[1] "Echipa %s a câștigat %u arme neașteptate!"
 #~ msgstr[2] "Echipa %s a câștigat %u de arme neașteptate!"
 
-#~ msgid ""
-#~ "WARNING! Disconnections are not yet handled. So you have to restart "
-#~ "Wormux after each disconnection!"
-#~ msgstr ""
-#~ "AVERTISMENT! Deconectările nu sunt tratate încă. Va trebui să reporniți "
-#~ "Wormux după fiecare deconectare!"
-
-#~ msgid "Remote"
-#~ msgstr "la distanță"
-
-#~ msgid "Ninjarope"
-#~ msgstr "Funie ninja"
-
-#, fuzzy
-#~ msgid "Error while exporting file %s:"
-#~ msgstr "Eroare în timpul exportării modului de joc %s (fișierul %s):"
-
-#~ msgid "Error while loading game mode %s from memory:"
-#~ msgstr "Eroare în timpul încărcării modului de joc %s din memorie:"
-
-#~ msgid "Unexpected exception caught..."
-#~ msgstr "S-a captat o excepție neaștepată..."
-
-#~ msgid "C++ exception caught:"
-#~ msgstr "O excepție C++ a fost captată:"
-
-#~ msgid "Failed to initialize network library!"
-#~ msgstr "Nu a fost posibilă inițializarea bibliotecii de rețea!"
-
-#~ msgid "Initialisation of TTF library failed: %s"
-#~ msgstr "Inițializarea bibiliotecii TTF a eșuat: %s"
-
-#~ msgid "Unable to initialize SDL library: %s"
-#~ msgstr "Nu a fost posibilă inițializarea bibliotecii SDL: %s"
-
-#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
 #~ msgstr ""
-#~ "Aveți nevoie de cel puțin două echipe ca să jucați: schimbați acest lucru "
-#~ "în meniul 'Opțiuni' !"
-
-#~ msgid "general: "
-#~ msgstr "general: "
-
-#~ msgid " has joined the party"
-#~ msgstr " a intrat în partidă"
-
-#~ msgid " has left the party"
-#~ msgstr " a ieșit din partidă"
-
-#~ msgid "Find a random position for characters"
-#~ msgstr "Se caută o pozitie aleatoare pentru personaje"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Connected\n"
-#~ msgstr "Conectat!"
-
-#, fuzzy
-#~ msgid "  Most sold-out  :  "
-#~ msgstr "  Cel mai mare trădător :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most useful   :  "
-#~ msgstr "  Cel mai folositor     :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most useless  :  "
-#~ msgstr "  Cel mai inutil        :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most violent  :  "
-#~ msgstr "  Cel mai violent       :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid " : Run game !"
-#~ msgstr "Rulează jocul"
-
-#, fuzzy
-#~ msgid " not found"
-#~ msgstr "! Harta %s nu a fost găsită :-("
-
-# URM1-2
-#, fuzzy
-#~ msgid "%i connections up!"
-#~ msgstr "fiecare deconectare!"
-
-#, fuzzy
-#~ msgid "%i players connected"
-#~ msgstr "%i jucător conectat"
-
-#, fuzzy
-#~ msgid "%i players ready"
-#~ msgstr "%i jucător e gata"
-
-#~ msgid "%s has lost %u point of energy."
-#~ msgid_plural "%s has lost %u points of energy."
-#~ msgstr[0] "%s a pierdut %u punct de energie."
-#~ msgstr[1] "%s a pierdut %u puncte de energie."
-#~ msgstr[2] "%s a pierdut %u de puncte de energie."
-
-#, fuzzy
-#~ msgid "%s has won %u points of energy!"
-#~ msgstr "%s a câștigat %u punct de energie!"
-
-#, fuzzy
-#~ msgid "%s is not ready"
-#~ msgstr "%i jucător e gata"
-
-#~ msgid "%s team has won.\n"
-#~ msgstr "Echipa %s a câștigat.\n"
+#~ "%s încearcă să se conecteze cu o versiune diferită: client=%s, eu=%s."
 
 #~ msgid "'%s has won %u Anvil"
 #~ msgid_plural "'%s has won %u Anvil"
@@ -1761,6 +2009,11 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr[1] "'%s a câștigat %u gravitații scăzute"
 #~ msgstr[2] "'%s a câștigat %u de gravitații scăzute"
 
+# XXX: I guess this could have been marked with a simple * to avoid confusions
+# I personally know the context, but some might not
+#~ msgid "(current)"
+#~ msgstr "(actual)"
+
 #, fuzzy
 #~ msgid "* Couldn't initialize SDL: "
 #~ msgstr "Nu a fost posibilă inițializarea bibliotecii SDL: %s"
@@ -1786,6 +2039,9 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "Author"
 #~ msgstr "Autori:"
 
+#~ msgid "C++ exception caught:"
+#~ msgstr "O excepție C++ a fost captată:"
+
 #, fuzzy
 #~ msgid "Client connect to %s:%s"
 #~ msgstr "Nu a fost posibilă conectarea la %s:%s"
@@ -1794,6 +2050,12 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "Client disconnected\n"
 #~ msgstr "%i jucător conectat"
 
+#~ msgid "Connect !"
+#~ msgstr "Conectat!"
+
+#~ msgid "Connect to an internet game"
+#~ msgstr "Conectare la un joc pe internet"
+
 #, fuzzy
 #~ msgid "Connected."
 #~ msgstr "Conectat!"
@@ -1830,6 +2092,9 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "Disconnected."
 #~ msgstr "Conectat!"
 
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Chiar doriți să abandonați? (D/N)"
+
 #, fuzzy
 #~ msgid "Doesn't seem do be a valid server .."
 #~ msgstr "Nu pare a fi un server valid de Wormux..."
@@ -1851,16 +2116,44 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "Error during loading skin %s:"
 #~ msgstr "Eroare în timpul încărcării aspectului %s:"
 
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Eroare la încărcarea datelor pentru echipa %s:"
+
+#, fuzzy
+#~ msgid "Error while exporting file %s:"
+#~ msgstr "Eroare în timpul exportării modului de joc %s (fișierul %s):"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Eroare în timpul încărcării fișierul de configurare: %s"
+
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Eroare în timpul încărcării fișierul de configurare implicită: %s"
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Eroare în timpul încărcării modului de joc %s (fișierul %s):"
+
+#~ msgid "Error while loading game mode %s from memory:"
+#~ msgstr "Eroare în timpul încărcării modului de joc %s din memorie:"
+
 #, fuzzy
 #~ msgid "Error: "
 #~ msgstr ""
 #~ "Eroare:\n"
 #~ "%s"
 
+#~ msgid "Failed to initialize network library!"
+#~ msgstr "Nu a fost posibilă inițializarea bibliotecii de rețea!"
+
+#~ msgid "Find a random position for characters"
+#~ msgstr "Se caută o pozitie aleatoare pentru personaje"
+
 #, fuzzy
 #~ msgid "GameDraw:characters"
 #~ msgstr "Numărul de personaje"
 
+#~ msgid "Initialisation of TTF library failed: %s"
+#~ msgstr "Inițializarea bibiliotecii TTF a eșuat: %s"
+
 #, fuzzy
 #~ msgid "Initialize escape_time : %d"
 #~ msgstr "Inițializare echipe"
@@ -1882,10 +2175,6 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr "Oare e un cadou?"
 
 #, fuzzy
-#~ msgid "Load character %s"
-#~ msgstr "Numărul de personaje"
-
-#, fuzzy
 #~ msgid "Load music sample %s"
 #~ msgstr "Încărcare hărți:"
 
@@ -1897,6 +2186,10 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr "Mină"
 
 #, fuzzy
+#~ msgid "Network deinitialization"
+#~ msgstr "Deinițializare rețea"
+
+#, fuzzy
 #~ msgid "New client connected\n"
 #~ msgstr "%i jucător conectat"
 
@@ -1904,6 +2197,9 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "New index server connected"
 #~ msgstr "%i jucător conectat"
 
+#~ msgid "Ninjarope"
+#~ msgstr "Funie ninja"
+
 #, fuzzy
 #~ msgid "None"
 #~ msgstr "finalizat"
@@ -1931,6 +2227,12 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr ""
 #~ "Vă rugăm să ne spuneți părerea dvs. despre Wormux prin poștă electronică:"
 
+#~ msgid "Refresh"
+#~ msgstr "Reîmprospătează"
+
+#~ msgid "Remote"
+#~ msgstr "la distanță"
+
 #, fuzzy
 #~ msgid "Select %s"
 #~ msgstr "Selectați echipele:"
@@ -1952,6 +2254,14 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "So you have to restart Wormux after each"
 #~ msgstr "Deci va trebui să reporniți Wormux după"
 
+#~ msgid ""
+#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
+#~ "blowtorch, submachine gun) and surely many other things don't work either!"
+#~ msgstr ""
+#~ "Unele arme sunt dezactivate datorită unor probleme cunoscute (ghiara de "
+#~ "agățare, ciocanul pneumatic, lampa de sudură, mitraliera semiautomată) "
+#~ "și, mai mult ca sigur, mai sunt și alte lucruri care nu funcționează!"
+
 #~ msgid "Team %s results:\n"
 #~ msgstr "Rezultatele echipei %s:\n"
 
@@ -1973,6 +2283,9 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "Unable to contact top server!"
 #~ msgstr "Nu a fost posibilă conectarea la server-ul de navigare!"
 
+#~ msgid "Unable to initialize SDL library: %s"
+#~ msgstr "Nu a fost posibilă inițializarea bibliotecii SDL: %s"
+
 #, fuzzy
 #~ msgid "Unable to initialize SDL window."
 #~ msgstr "Nu a fost posibilă inițializarea bibliotecii SDL: %s"
@@ -1989,6 +2302,9 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "Unable to open image file : %s"
 #~ msgstr "Nu a fost posibilă deschiderea directorului cu hărți (%s)!"
 
+#~ msgid "Unexpected exception caught..."
+#~ msgstr "S-a captat o excepție neaștepată..."
+
 #, fuzzy
 #~ msgid "Unknown config option: %s"
 #~ msgstr "Acțiune necunoscută"
@@ -2005,6 +2321,20 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "Version "
 #~ msgstr "versiunea"
 
+#~ msgid ""
+#~ "WARNING! Disconnections are not yet handled. So you have to restart "
+#~ "Wormux after each disconnection!"
+#~ msgstr ""
+#~ "AVERTISMENT! Deconectările nu sunt tratate încă. Va trebui să reporniți "
+#~ "Wormux după fiecare deconectare!"
+
+#~ msgid ""
+#~ "WARNING!! Network is still under developement and therefore a little "
+#~ "experimental."
+#~ msgstr ""
+#~ "AVERTISMENT!! Codul pentru rețea este încă în dezvoltare și, de aceea, "
+#~ "puțin experimental."
+
 #~ msgid "Wait for map"
 #~ msgstr "Se așteaptă harta"
 
@@ -2046,6 +2376,14 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "Wormux index server version %i"
 #~ msgstr "Versiunea Wormux "
 
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "Eroare XML în timpul încărcării hărții „%s”: "
+
+#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgstr ""
+#~ "Aveți nevoie de cel puțin două echipe ca să jucați: schimbați acest lucru "
+#~ "în meniul 'Opțiuni' !"
+
 #, fuzzy
 #~ msgid "[Music] Error : Unable to load music file: %s"
 #~ msgstr "Eroare: Nu a fost posibilă pornirea server-ului"
@@ -2075,10 +2413,6 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr "Jucător"
 
 #, fuzzy
-#~ msgid "action"
-#~ msgstr "Acțiune necunoscută"
-
-#, fuzzy
 #~ msgid "air_attack"
 #~ msgstr "Atac aerian"
 
@@ -2095,10 +2429,6 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr "Ciocan pnumatic"
 
 #, fuzzy
-#~ msgid "always"
-#~ msgstr "Pornește jocul"
-
-#, fuzzy
 #~ msgid "animation"
 #~ msgstr "Inițializare"
 
@@ -2151,14 +2481,6 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr "Minge săltăreață"
 
 #, fuzzy
-#~ msgid "character"
-#~ msgstr "Parașută"
-
-#, fuzzy
-#~ msgid "cluster"
-#~ msgstr "Bombă cu schije"
-
-#, fuzzy
 #~ msgid "cluster_bomb"
 #~ msgstr "Bombă cu schije"
 
@@ -2215,10 +2537,6 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr "Efecte sonore?"
 
 #, fuzzy
-#~ msgid "energy"
-#~ msgstr "Energie:"
-
-#, fuzzy
 #~ msgid "explosion"
 #~ msgstr "versiunea"
 
@@ -2238,6 +2556,9 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgid "full_screen"
 #~ msgstr "Tot ecranul?"
 
+#~ msgid "general: "
+#~ msgstr "general: "
+
 #, fuzzy
 #~ msgid "gnulauncher"
 #~ msgstr "Lansator de antilope gnu"
@@ -2255,10 +2576,6 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr "Pistol"
 
 #, fuzzy
-#~ msgid "ingame"
-#~ msgstr "Rulează jocul"
-
-#, fuzzy
 #~ msgid "jetpack"
 #~ msgstr "Propulsor personal"
 
@@ -2351,10 +2668,6 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr "Parașută"
 
 #, fuzzy
-#~ msgid "pause"
-#~ msgstr "Pauză"
-
-#, fuzzy
 #~ msgid "physic.position"
 #~ msgstr "Opțiuni grafice"
 
@@ -2476,17 +2789,13 @@ msgstr "o Se deschide canalul adio la %d Hz %d biți"
 #~ msgstr "Arme"
 
 #, fuzzy
+#~ msgid "wormux_server.conf"
+#~ msgstr "Versiunea Wormux "
+
+#, fuzzy
 #~ msgid "weapons"
 #~ msgstr "Arme"
 
 #, fuzzy
 #~ msgid "weapons.xml"
 #~ msgstr "Arme"
-
-#, fuzzy
-#~ msgid "wind_particle"
-#~ msgstr "Particulele de vânt?"
-
-#, fuzzy
-#~ msgid "wormux_server.conf"
-#~ msgstr "Versiunea Wormux "
diff --git a/po/ru.po b/po/ru.po
index 2822d5e..19bf1f2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,4 +1,4 @@
-# translation of ru.po to Русский
+# translation of ru.po to Russian
 # translation of ru.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR Wormux Development Team.
@@ -6,14 +6,15 @@
 # Alexandre Prokoudine <alexandre.prokoudine at gmail.com>, 2006.
 # Igor Murzov <igor at gplsoft.org>, 2007, 2008.
 # Dmitry 'RCL' Rekman <rcl at mail.ru>, 2008.
+# Ilya Rusyanov <unachievable at gmail.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-02-17 22:13+0100\n"
-"Last-Translator: Dmitry 'RCL' Rekman <rcl at mail.ru>\n"
-"Language-Team: Русский <en at li.org>\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-09-15 22:12+0100\n"
+"Last-Translator: Vladimir Naumov <rhot at rambler.ru>\n"
+"Language-Team: Russian <ru at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,12 +25,12 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Карта %s не найдена :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
@@ -37,7 +38,7 @@ msgstr[0] "%i игрок присоединился"
 msgstr[1] "%i игрока присоединились"
 msgstr[2] "%i игроков присоединились"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
@@ -45,51 +46,61 @@ msgstr[0] "%i игрок готов"
 msgstr[1] "%i игрока готовы"
 msgstr[2] "%i игроков готовы"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) погиб."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
-msgstr "%s <%s> aka %s из %s"
+msgstr "%s <%s>, также известный как %s из %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> из %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Команда %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Команда %s - Удаленно"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s кончает жизнь самоубийством !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
-msgstr "%s fps"
+msgstr "%s кадров/с"
+
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "Игрок %s из команды %s кончает жизнь самоубийством !"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "Игрок %s из команды %s погиб."
+
+#: src/game/game.cpp:709
+#, c-format
+msgid "%s from %s team has fallen into the water!"
+msgstr "Игрок %s из команды %s упал в воду."
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:703
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s упал в воду."
+msgid "%s from %s team has fallen off the map!"
+msgstr "Игрок %s из команды %s выпал с карты!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:724
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s выпал с карты!"
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "Игрок %s из команды %s очень сильно ударился об землю!"
+
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "Игрок %s из команды %s погиб, потому что он недотёпа!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -99,16 +110,11 @@ msgstr[0] "%s получил %u единицу энергии!"
 msgstr[1] "%s получил %u единицы энергии!"
 msgstr[2] "%s получил %u единиц энергии!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s - псих, он убил члена команды %s!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s погиб, потому что он недотёпа!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -133,7 +139,7 @@ msgstr[0] "Команда %s выиграла %u осколочную базук
 msgstr[1] "Команда %s выиграла %u осколочные базуки!"
 msgstr[2] "Команда %s выиграла %u базук!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
@@ -141,7 +147,7 @@ msgstr[0] "Команда %s выиграла %u Gnu! Взорви их всех
 msgstr[1] "Команда %s выиграла %u Gnu! Взорви их всех, ковбой!"
 msgstr[2] "Команда %s выиграла %u Gnu! Взорви их всех, ковбой!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
@@ -149,7 +155,7 @@ msgstr[0] "Команда %s выиграла %u воздушную атаку!"
 msgstr[1] "Команда %s выиграла %u воздушные атаки!"
 msgstr[2] "Команда %s выиграла %u воздушных атак!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -167,7 +173,7 @@ msgstr[2] ""
 "Команда %s выиграла %u отбойных молотов! Не слишком шумите! Спасибо, ваши "
 "соседи."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -232,7 +238,7 @@ msgstr[0] "Команда %s выиграла %u кассетную бомбу!"
 msgstr[1] "Команда %s выиграла %u кассетные бомбы!"
 msgstr[2] "Команда %s выиграла %u кассетных бомб!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -273,7 +279,7 @@ msgstr[0] "Команда %s выиграла %u футбольную бомбу
 msgstr[1] "Команда %s выиграла %u футбольные бомбы!"
 msgstr[2] "Команда %s выиграла %u пустотных бомб!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -297,7 +303,7 @@ msgstr[0] "Команда %s выиграла %u пистолет!"
 msgstr[1] "Команда %s выиграла %u пистолета!"
 msgstr[2] "Команда %s выиграла %u пистолетов!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
@@ -305,7 +311,7 @@ msgstr[0] "Команда %s выиграла %u реактивный ранец
 msgstr[1] "Команда %s выиграла %u реактивных ранца! Клёво!"
 msgstr[2] "Команда %s выиграла %u реактивных ранцев! Клёво!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -321,7 +327,7 @@ msgstr[0] "Команда %s выиграла %u мину!"
 msgstr[1] "Команда %s выиграла %u мины!"
 msgstr[2] "Команда %s выиграла %u мин!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
@@ -329,7 +335,7 @@ msgstr[0] "Команда %s выиграла %u парашют!"
 msgstr[1] "Команда %s выиграла %u парашюта!"
 msgstr[2] "Команда %s выиграла %u парашютов!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -353,7 +359,15 @@ msgstr[0] "Команда %s выиграла %u дробовик!"
 msgstr[1] "Команда %s выиграла %u дробовика!"
 msgstr[2] "Команда %s выиграла %u дробовиков!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Команда %s выиграла %u удар-шлепок по врагу!"
+msgstr[1] "Команда %s выиграла %u ударов-шлепков по врагу! Попробуй увернись!"
+msgstr[2] "Команда %s выиграла %u захватов!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -382,8 +396,8 @@ msgid "%s team has won %u suicide!"
 msgid_plural "%s team has won %u suicides! Use them all for an extra bonus!"
 msgstr[0] "Команда %s выиграла %u самоубийство!"
 msgstr[1] ""
-"Команда %s выиграла %u самоубийства! Используйте их все для получения экстра "
-"бонуса"
+"Команда %s выиграла %u самоубийства! Используйте их все, чтобы получить "
+"дополнительный бонус!"
 msgstr[2] ""
 "Команда %s выиграла %u суицидов! Используйте их все для получения экстра "
 "бонуса"
@@ -412,46 +426,60 @@ msgstr[0] "Команда %s выиграла %u пропуск хода! Вам
 msgstr[1] "Команда %s выиграла %u пропуска хода! Вам это понравится."
 msgstr[2] "Команда %s выиграла %u пропусков хода! Вам это понравится."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] ""
-"Команда %s выиграла %u tux'омёт! Никогда не видели летающего пингвина?"
+"Команда %s выиграла %u туксомёт! Никогда не видели летающего пингвина?"
 msgstr[1] ""
 "Команда %s выиграла %u tux'омёта! Никогда не видели летающего пингвина?"
 msgstr[2] ""
 "Команда %s выиграла %u tux'ов взрывателей! Никогда не видели летающего "
 "пингвина?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "Команда %s была уничтожена"
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s увёл члена команды %s с собой в могилу!"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(мёртв)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(системный язык)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
-msgstr ""
+msgstr "(неизвестное время)"
 
 #. Display number of ammo
 #: src/interface/interface.cpp:196
 msgid "(unlimited)"
 msgstr "(бесконечно)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
-"Появилась уже версия %s, которая является более новой, чем Ваша версия %s. "
-"Проверьте, нет ли обновления игры для вашей операционной системы! "
+"Уже появилась версия %s, которая является более новой, чем Ваша версия %s. "
+"Проверьте, нет ли обновления игры для вашей операционной системы!"
+
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Добавить свою команду"
 
-#: src/weapon/air_attack.cpp:209
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Воздушная атака"
 
@@ -459,10 +487,18 @@ msgstr "Воздушная атака"
 msgid "Airhammer"
 msgstr "Отбойный молоток"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Все команды"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Всегда"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "И победителем станосится..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -477,7 +513,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Наковальня"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Авторы:"
 
@@ -501,6 +537,14 @@ msgstr "Бейсбольная бита"
 msgid "Bazooka"
 msgstr "Базука"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Телепортация"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Налёт авиации"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Паяльная лампа"
@@ -513,8 +557,9 @@ msgstr "Прыгучий мяч"
 msgid "Bye bye tux..."
 msgstr "Прощай tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Не удаётся найти команду %s!"
@@ -524,24 +569,69 @@ msgstr "Не удаётся найти команду %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Не удаётся открыть личный каталог команд (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Не удаётся открыть каталог команд (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Не удаётся открыть личный каталог команд (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Переместить камеру на активного игрока"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Сменить активного игрока"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Изменить угол прицела"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Сменить вид оружия"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Изменить время запала"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "Игрок"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Выбор игрока"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Проверить по сети, нет ли обновлений?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Выбрать карту случайно"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Классический"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Клик: камера на игроке"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Режим клиента"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Самый неуклюжий"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Кассетная бомба"
@@ -554,7 +644,11 @@ msgstr "Осколочная базука"
 msgid "Commit Suicide"
 msgstr "Самоубийство"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Меню настроек"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Подключиться к игре"
 
@@ -562,11 +656,11 @@ msgstr "Подключиться к игре"
 msgid "Connected !"
 msgstr "Подключен !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Строительство"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Контролируется: "
 
@@ -575,7 +669,7 @@ msgstr "Контролируется: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Не получается скачать новую версию с %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Не могу открыть файл %s"
@@ -584,11 +678,32 @@ msgstr "Не могу открыть файл %s"
 msgid "Credits"
 msgstr "Разработчики"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Урон за ход во время режима смерти"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Удалить "
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Диско-граната"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Показывать это сообщение"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Удерживая колёсико мышки: перевести обзор камеры"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Задержка перед включением режима смерти"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Продолжительность хода"
 
@@ -596,31 +711,52 @@ msgstr "Продолжительность хода"
 msgid "Dynamite"
 msgstr "Динамит"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "КОНЕЦ ИГРЫ"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
-msgstr ""
+msgstr "Громкость эффектов"
+
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Энергия"
+
+#: src/tool/error.cpp:63
+#, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Ошибка в %s:%lu (Wormux %s) : %s"
 
-#: src/tool/error.cpp:82
+#: src/include/action_handler.cpp:210
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Ошибка в %s:%lu"
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr "Ошибка инициализации сети: Клиент %s не согласен с Вами!! - %s"
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Ошибка при загрузке команды :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr ""
 "Ошибка при создании папки \"%s\": не удалось сохранить конфигурационный файл."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "Ошибка при удалении папки \"%s\": не удалось удалить личную команду."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "Ошибка при удалении файла \"%s\": не удалось удалить личную команду."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -630,34 +766,40 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Ошибка: не удалось подключиться к %s: %s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
-msgstr ""
-"Ошибка: Не удалось соединиться с индексным сервером, чтобы создать хостинг "
-"игры."
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
+msgstr "Ошибка: Не удалось соединиться с сервером, чтобы создать игру"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
-"Ошибка: Не удалось соединиться с указанным сервером, чтобы найти интернет "
+"Ошибка: Не удалось соединиться с указанным сервером, чтобы найти Интернет-"
 "игру"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Ошибка: Не получилось запустить сервер"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
+"Ошибка: Ваш сервер недоступен из Интернета. Проверте настройки Вашего "
+"фаервола: порт TCP %s должен принимать соединения извне. Если Вы не "
+"подсоединены к Интернету напрямую, проверте настройки Вашего маршрутизатора: "
+"порт TCP %s дожен быть открыт на Вашем компьютере."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Ошибка: не удаётся найти тему \"%s\" для команды \"%s\"."
@@ -670,35 +812,47 @@ msgstr "Огнемет"
 msgid "Football Bomb"
 msgstr "Футбольная бомба"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Полноэкранный режим/Оконный режим"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "На весь экран?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
-msgstr ""
+msgstr "Игра"
+
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Режим игры"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
-msgstr "Имя игры"
+msgstr "Имя игры:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Антилопа гну"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
-msgstr ""
+msgstr "Графический"
 
 #: src/weapon/grapple.cpp:166
 msgid "Grapple"
 msgstr "\"Кошка\""
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Гравитация"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Граната"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Инициализация местности..."
 
@@ -706,16 +860,16 @@ msgstr "Инициализация местности..."
 msgid "Gun"
 msgstr "Пистолет"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Домашний каталог (переменная окружения $HOME) не найдена!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Удачной игры!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Командующий"
 
@@ -728,7 +882,11 @@ msgstr "Командующий: "
 msgid "Help"
 msgstr "Справка"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Высокий прыжок"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Стать сервером"
 
@@ -770,7 +928,11 @@ msgstr ""
 "Правила использования : щелкните левой кнопкой мыши на цели\n"
 "патрон за ход"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Торопитесь, вы слишком медленные!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -778,7 +940,8 @@ msgstr ""
 "Если вы нашли ошибку или у вас есть какие-то пожелания, пошлите нам email "
 "(на аглийском, пожалуйста):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Начальная энергия"
 
@@ -793,7 +956,7 @@ msgstr ""
 "Стрельба : удерживайте пробел до достижения желаемой силы\n"
 "патрон за ход"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Инициализация"
 
@@ -801,32 +964,44 @@ msgstr "Инициализация"
 msgid "Initialise map"
 msgstr "Инициализация карты"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Инициализация звуков"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Инициализация команд"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
-msgstr "Получи и распишись."
+msgstr "Это подарок!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Реактивный ранец"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
-"Заходите на #wormux на irc.freenode.net чтобы найти противников для игры"
+"Заходите на #wormux на irc.freenode.net чтобы найти противников для игры."
+
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Прыжок"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Обратное сальто"
 
-#: src/menu/options_menu.cpp:125
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Выкидывает участников, обозначеных <nickname>, из игры"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Язык"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Загрузка карт:"
 
@@ -834,7 +1009,7 @@ msgstr "Загрузка карт:"
 msgid "Load teams:"
 msgstr "Загрузка команд:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Локальные команды:"
 
@@ -842,16 +1017,15 @@ msgstr "Локальные команды:"
 msgid "LowGrav"
 msgstr "Антигравитатор"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
-msgstr ""
+msgstr "Соединение вручную"
 
-#: src/menu/game_menu.cpp:84
-#, fuzzy
+#: src/menu/game_menu.cpp:78
 msgid "Map"
-msgstr "Карты"
+msgstr "Карта"
 
 #: src/map/map.cpp:294
 #, c-format
@@ -862,11 +1036,15 @@ msgstr "Карту %s создал: "
 msgid "Maps"
 msgstr "Карты"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Максимальная начальная энергия"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Макс. количество игроков:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Максимальный FPS"
 
@@ -874,40 +1052,43 @@ msgstr "Максимальный FPS"
 msgid "Mine"
 msgstr "Мина"
 
-#: src/menu/options_menu.cpp:133
-#, fuzzy
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
-msgstr "Музыка?"
+msgstr "Разное"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Самый точный"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Самый неуклюжий"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Самый продажный"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Самый полезный"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Самый бесполезный"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Самый жестокий"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Переместить камеру с помощью мыши или клавиатуры"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Курсоры движения"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
-msgstr ""
+msgstr "Громкость музыки"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Музыка?"
 
@@ -915,33 +1096,48 @@ msgstr "Музыка?"
 msgid "Network Game"
 msgstr "Игра по сети"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Инициализация сети"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Никогда"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
-#, fuzzy
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
-msgstr "Игра по сети"
+msgstr "Новая игра по сети"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Предупреждение о появлении нового игрока"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Элемент <%s> не найден в файле с настройками!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Никто!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Количество игроков"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Количество команд:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "На игроке: Сменить игрока"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "На карте: Выбрать цель"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Настройки"
@@ -954,51 +1150,62 @@ msgstr "Меню настроек"
 msgid "Parachute"
 msgstr "Парашют"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Парашют раскрылся автоматически."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
-msgstr ""
+msgstr "Пароль:"
+
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Пауза"
 
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Играть"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Играть несколько раз"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Игрок"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Энергия игрока?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Имя игрока"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Имена игроков?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Скунс"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/menu/network_connection_menu.cpp:155
-#, fuzzy
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
-msgstr "Покинуть битву"
+msgstr "Доступные битвы"
 
 #: src/menu/main_menu.cpp:75
 msgid "Quit"
 msgstr "Выйти"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Выйти из Wormux"
 
@@ -1006,19 +1213,23 @@ msgstr "Выйти из Wormux"
 msgid "Quit battle"
 msgstr "Покинуть битву"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Выйти из игры"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Случайная карта"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Чтение конфига по умолчанию"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Чтение персонального конфига"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Разрешение"
 
@@ -1026,34 +1237,33 @@ msgstr "Разрешение"
 msgid "Riot Bomb"
 msgstr "Пустотная бомба"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Начать игру"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Говорите: "
 
-#: src/menu/options_menu.cpp:84
-#, fuzzy
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
-msgstr "Прокрутка на границе"
+msgstr "Размер прокрутки"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Прокрутка на границе"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Адрес сервера:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Сервер доступен в интернете"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Режим сервера"
 
@@ -1061,10 +1271,34 @@ msgstr "Режим сервера"
 msgid "Shotgun"
 msgstr "Дробовик"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Показать меню оружия"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Показать/спрятать панель"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Показать/спрятать миникарту"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Пропуск хода"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Шлепок"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Ударьте врага так, чтобы тот подпрыгнул."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Меньший угол прицела и шаг хода"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Снайперская винтовка"
@@ -1073,29 +1307,38 @@ msgstr "Снайперская винтовка"
 msgid "Someone put a booby trap into the crate!"
 msgstr "В контейнере была мина-ловушка!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Извините, в данный момент нет игр ожидающих игроков"
 
-#: src/menu/options_menu.cpp:178
-#, fuzzy
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Извините Ваша версия программы больше не поддерживается. Поддерживаемые "
+"версии следующие: %s. Вы можете загрузить свежую версию по адресу http://www."
+"wormux.org/wiki/download.php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Звуки"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Звуковые эффекты?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Частота звука"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Звуки"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Начинаем новую игру"
 
@@ -1109,26 +1352,32 @@ msgstr "Автомат"
 
 #: src/weapon/supertux.cpp:229
 msgid "SuperTux"
-msgstr "SuperTux"
+msgstr "СуперТукс"
 
 #: src/weapon/syringe.cpp:70
 msgid "Syringe"
 msgstr "Шприц"
 
-#: src/menu/results_menu.cpp:389
-#, fuzzy
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Разговор в сетевой игре"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
-msgstr "Команды"
+msgstr "Графики команды"
 
-#: src/menu/results_menu.cpp:378
-#, fuzzy
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
-msgstr "Команды"
+msgstr "Статистика команды"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Команды"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Редактор команд"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Телепортация"
@@ -1141,11 +1390,11 @@ msgstr "Кассетная бомба покинула поле битвы не
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Футбольная бомба покинула поле битвы не успев взорваться."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Гну покинула поле битвы"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Скунс покинул поле битвы до взрыва"
 
@@ -1157,6 +1406,15 @@ msgstr "Автоматическая ракета улетела за преде
 msgid "The ball left the battlefield before exploding"
 msgstr "Мяч улетел за пределы поля битвы"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Версии клиента и сервера не совпадают(ваша=%s, сервера=%s). Пожалуйста, "
+"попробуйте другой сервер."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "Превышено время подключения. Проверьте, что на пути нет фаерволла!"
@@ -1165,15 +1423,15 @@ msgstr "Превышено время подключения. Проверьте
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Диско-граната улетела с поля битвы не успев взорваться"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
-msgstr ""
+msgstr "Игра была прервана, потому что вы были отсоединены."
 
 #: src/weapon/grenade.cpp:58
 msgid "The grenade left the battlefield before exploding"
 msgstr "Граната улетела за пределы поля битвы"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Все ждут тебя! Проснись :-)"
 
@@ -1187,11 +1445,10 @@ msgid "The server rejected the connection."
 msgstr "Сервер отклонил соединение."
 
 #: src/network/net_error_msg.cpp:51
-#, fuzzy
 msgid "The server rejected the connection: wrong password!"
-msgstr "Сервер отклонил соединение."
+msgstr "Сервер отклонил соединение: неверный пароль!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
@@ -1199,7 +1456,12 @@ msgstr[0] "Всего %i команда."
 msgstr[1] "Всего %i команды."
 msgstr[2] "Всего %i команд"
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "Время"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1223,7 +1485,7 @@ msgstr ""
 "Стрельба : пробел\n"
 "патрон за ход"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Инструменты"
 
@@ -1231,12 +1493,12 @@ msgstr "Инструменты"
 msgid "Unable to contact host."
 msgstr "Не удалось связаться c хостом."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Невозможно открыть каталог с картами (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Невозможно открыть личный каталог с картами (%s)!"
@@ -1245,20 +1507,28 @@ msgstr "Невозможно открыть личный каталог с ка
 msgid "Unable to use this port!"
 msgstr "Не получается использовать этот порт!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Неизвестная команда"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "(бесконечно)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Без имени"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Версия"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Проверка версии не удалась из-за: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
@@ -1266,73 +1536,89 @@ msgstr[0] "Подождите! %i-й игрок пока не готов!"
 msgstr[1] "Подождите! %i игрока пока не готовы!"
 msgstr[2] "Подождите! %i игроков пока не готовы!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 "Ожидание действий сервера - всё что вы можете сделать, это отменить свою "
 "готовность или поболтать!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Оружие: Огонь/Подарки: падают быстрее"
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Оружие"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Веб-сайт: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Какой позор для %s - его убили из простого пистолета!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Частицы в воздухе?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Победитель"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Запуск Wormux..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux версии "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "Неверное число CRC карты"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Неверное имя карты!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Неверная команда!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Вы один :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Вы один..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Вам нужна хотя бы одна карта !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Вам нужны хотя бы две команды !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Вы не сможете играть не выбрав команду !"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Вы промазали!"
 
 #: src/menu/credits_menu.cpp:75
 msgid "aka"
-msgstr "aka"
+msgstr "также известный как"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1342,15 +1628,20 @@ msgstr ""
 "Бомбежка : щелкните левой кнопкой мыши на цели\n"
 "Одна бомбардировка за ход"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "не могу загрузить конфиг"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "созданный игрок"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "готово"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "ошибка разбора конфигурационного файла"
 
@@ -1358,15 +1649,15 @@ msgstr "ошибка разбора конфигурационного файл
 msgid "from"
 msgstr "из"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "нет конфигурационного файла!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Загрузка музыки"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Загрузка звукового профиля: %s"
@@ -1376,29 +1667,9 @@ msgstr "o Загрузка звукового профиля: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Открыто аудио в %d Hz %d bit"
 
-#~ msgid "Connect !"
-#~ msgstr "Подключиться !"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Подключиться к игре через интернет"
-
-#~ msgid "Refresh"
-#~ msgstr "Обновить"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Ошибка при загрузке данных команды %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Ошибка при загрузке конфигурационного файла: %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Ошибка при загрузке конфигурационного файла по умолчанию: %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Ошибка при загрузке режима игры %s (файл %s):"
-
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "Ошибка разбора XML при загрузке карты '%s': "
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s пытается подключиться с другой версией : client=%s, me=%s."
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Ошибка: Ваш сервер недоступен из Интернет. Проверьте настройку сетевого "
+#~ "экрана"
diff --git a/po/sk.po b/po/sk.po
index d02ccc5..a5c0cbc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wormux 0.7\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2007-03-07 15:07+0100\n"
 "Last-Translator: Martin Vojčík <stryco at gmail.com>\n"
 "Language-Team: sk <stryco at gmail.com>\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Non-Native-Updates: artefact <artefact at altern.org>\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Mapa %s nebola nájdená :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, fuzzy, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
@@ -32,7 +32,7 @@ msgstr[0] "%i hráč je pripojený"
 msgstr[1] "%i hráči sú pripojení"
 msgstr[2] "%i hráči sú pripojení"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, fuzzy, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
@@ -40,52 +40,62 @@ msgstr[0] "%i hráč je pripravený"
 msgstr[1] "%i hráči sú pripravení"
 msgstr[2] "%i hráči sú pripravení"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s tím)  zomrel."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> aka %s od %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> od %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, fuzzy, c-format
 msgid "%s Team"
 msgstr "Tími"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr ""
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s spáchal samovraždu !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s spáchal samovraždu !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s tím)  zomrel."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s spadol do vody."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s vypadol z mapy!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s je mŕtvy, pretože bol nemotorný!"
+
 #: src/object/medkit.cpp:68
 #, fuzzy, c-format
 msgid "%s has won %u point of energy!"
@@ -94,16 +104,11 @@ msgstr[0] "%s zvíťazil %u bodom energie!"
 msgstr[1] "%s zvíťazil %u bodmi energie! "
 msgstr[2] "%s zvíťazil %u bodmi energie! "
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s je psychopat, zabil člena svojho %s tímu!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s je mŕtvy, pretože bol nemotorný!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -128,21 +133,21 @@ msgstr[0] "%s tím vyhral %u %s!"
 msgstr[1] "%s tími vyhrali %u %s!"
 msgstr[2] "%s tími vyhrali %u %s!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, fuzzy, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "Hráč '%s' zvíťazil %u leteckým útokom!"
 msgstr[1] "Hráč '%s' zvíťazil %u leteckými útokmi!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, fuzzy, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "Hráč '%s' zvíťazil %u leteckým útokom!"
 msgstr[1] "Hráč '%s' zvíťazil %u leteckými útokmi!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -154,7 +159,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, fuzzy, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -209,7 +214,7 @@ msgstr[0] "%s tím vyhral %u %s!"
 msgstr[1] "%s tími vyhrali %u %s!"
 msgstr[2] "%s tími vyhrali %u %s!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, fuzzy, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -248,7 +253,7 @@ msgstr[0] "%s tím vyhral %u %s!"
 msgstr[1] "%s tími vyhrali %u %s!"
 msgstr[2] "%s tími vyhrali %u %s!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, fuzzy, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -272,14 +277,14 @@ msgstr[0] "%s tím vyhral %u %s!"
 msgstr[1] "%s tími vyhrali %u %s!"
 msgstr[2] "%s tími vyhrali %u %s!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "Hráč '%s' zvíťazil %u leteckým útokom!"
 msgstr[1] "Hráč '%s' zvíťazil %u leteckými útokmi!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, fuzzy, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -295,7 +300,7 @@ msgstr[0] "%s tím vyhral %u %s!"
 msgstr[1] "%s tími vyhrali %u %s!"
 msgstr[2] "%s tími vyhrali %u %s!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, fuzzy, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
@@ -303,7 +308,7 @@ msgstr[0] "%s tím vyhral %u %s!"
 msgstr[1] "%s tími vyhrali %u %s!"
 msgstr[2] "%s tími vyhrali %u %s!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, fuzzy, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -327,7 +332,15 @@ msgstr[0] "%s tím vyhral %u %s!"
 msgstr[1] "%s tími vyhrali %u %s!"
 msgstr[2] "%s tími vyhrali %u %s!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "%s tím vyhral %u %s!"
+msgstr[1] "%s tími vyhrali %u %s!"
+msgstr[2] "%s tími vyhrali %u %s!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -375,7 +388,7 @@ msgstr[0] "%s tím vyhral %u %s!"
 msgstr[1] "%s tími vyhrali %u %s!"
 msgstr[2] "%s tími vyhrali %u %s!"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, fuzzy, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -383,16 +396,26 @@ msgstr[0] "%s tím vyhral %u %s!"
 msgstr[1] "%s tími vyhrali %u %s!"
 msgstr[2] "%s tími vyhrali %u %s!"
 
+#: src/game/game_blitz.cpp:70
+#, fuzzy, c-format
+msgid "%s team was fragged down."
+msgstr "%s tím vyhral.\n"
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(mŕtvy)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr ""
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -401,14 +424,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(neobmedzene)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Letecký  útok"
 
@@ -416,10 +443,19 @@ msgstr "Letecký  útok"
 msgid "Airhammer"
 msgstr "Vŕtačka"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Všetky tímy"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Hraj"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr ""
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -431,7 +467,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Kovadlina"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Autory:"
 
@@ -455,6 +491,15 @@ msgstr "Basebalová pálka"
 msgid "Bazooka"
 msgstr "Raketomet"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleport"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Plameňomet"
@@ -467,8 +512,9 @@ msgstr "Odrazená lopta"
 msgid "Bye bye tux..."
 msgstr "Maj sa tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Nemôžem nájsť tím %s!"
@@ -478,24 +524,73 @@ msgstr "Nemôžem nájsť tím %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Nedá sa otvoriť adresár tímov (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Nedá sa otvoriť adresár tímov (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Nedá sa otvoriť adresár tímov (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Počet postáv"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Padák"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Padák"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr ""
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+#, fuzzy
+msgid "Clumsiest"
+msgstr "Najužitočnejší"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Šrapnelová Bomba"
@@ -509,7 +604,12 @@ msgstr "Raketomet"
 msgid "Commit Suicide"
 msgstr "Spáchať samovraždu"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "Chyba počas načítavania konfiguračného súboru: %s"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Pripojenie do hry"
 
@@ -517,11 +617,11 @@ msgstr "Pripojenie do hry"
 msgid "Connected !"
 msgstr "Pripojený !"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Stavať"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr ""
 
@@ -530,7 +630,7 @@ msgstr ""
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, fuzzy, c-format
 msgid "Couldn't open file %s"
 msgstr "Nedá sa inicializovať SDL knižnca: %s"
@@ -539,11 +639,33 @@ msgstr "Nedá sa inicializovať SDL knižnca: %s"
 msgid "Credits"
 msgstr "O programe"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+#, fuzzy
+msgid "Delete custom team"
+msgstr "Vyber tímy:"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Disco Granát"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Trvanie ťahu"
 
@@ -551,32 +673,56 @@ msgstr "Trvanie ťahu"
 msgid "Dynamite"
 msgstr "Dynamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "KONIEC HRY"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+#, fuzzy
+msgid "Energy"
+msgstr "Energia:"
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Chyba v %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 #, fuzzy
 msgid "Error loading team :"
 msgstr "Chyba počas načítavania tímu %s:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr ""
 "Chyba počas vytvárania priečinka  \"%s\": nedá sa uložiť konfiguračný súbor. "
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Chyba počas vytvárania priečinka  \"%s\": nedá sa uložiť konfiguračný súbor. "
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Chyba počas vytvárania priečinka  \"%s\": nedá sa uložiť konfiguračný súbor. "
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -586,31 +732,37 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Chyba: Nedá sa pripojiť na server %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Chyba: Nedá sa kontaktovať indexový server na hosťovanie hry"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Chyba: Nedá sa kontaktovať indexový server na vyhľadanie internetovej hry"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Chyba: Nedá sa spustiť server"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Chyba : nemožem nájsť telo \"%s\" pre tím \"%s\"."
@@ -624,25 +776,35 @@ msgstr ""
 msgid "Football Bomb"
 msgstr "Riot Bomba"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Celá obrazovka?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Celá obrazovka?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 #, fuzzy
 msgid "Game"
 msgstr "Meno:"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "Nastavenie hry"
+
+#: src/menu/network_connection_menu.cpp:187
 #, fuzzy
 msgid "Game name:"
 msgstr "Nastavenie hry"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnu raketomet"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 #, fuzzy
 msgid "Graphic"
 msgstr "Nastavenie grafiky"
@@ -651,11 +813,15 @@ msgstr "Nastavenie grafiky"
 msgid "Grapple"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granát"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inicializuje sa okolie..."
 
@@ -663,16 +829,16 @@ msgstr "Inicializuje sa okolie..."
 msgid "Gun"
 msgstr "Pištoľ"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Domovský priečinok (Prostredie premennej $HOME) sa nenašiel!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Prajem dobrú hru!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Hlavný veliteľ"
 
@@ -686,7 +852,11 @@ msgstr "Hlavný veliteľ"
 msgid "Help"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Hosťuj hru"
 
@@ -717,7 +887,11 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Ponáhľaj sa, si príliš pomalý  !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -725,7 +899,8 @@ msgstr ""
 "Ak nájdeš nejakú chybu aebo máš nejaký nápad ohľadom hry napíš nám email "
 "(anglicky, prosím):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Základná energia"
 
@@ -737,7 +912,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inicializácia"
 
@@ -746,32 +921,44 @@ msgstr "Inicializácia"
 msgid "Initialise map"
 msgstr "Inicializácia dát"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 #, fuzzy
 msgid "Initialise sounds"
 msgstr "Inicializácia tímov"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inicializácia tímov"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "To je dar!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Vznášadlo"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "Pripoj sa na kanál #wormux na irc.freenode.net a nájdi si súperov."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr ""
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Načítavam mapy:"
 
@@ -779,7 +966,7 @@ msgstr "Načítavam mapy:"
 msgid "Load teams:"
 msgstr "Načítavam tímy"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Miestne tímy:"
 
@@ -787,14 +974,14 @@ msgstr "Miestne tímy:"
 msgid "LowGrav"
 msgstr "NízkaGravitácia"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 #, fuzzy
 msgid "Manual connection"
 msgstr "Koniec hry !"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "Mapy"
@@ -808,11 +995,16 @@ msgstr "Mapa %s, je výtvor:"
 msgid "Maps"
 msgstr "Mapy"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Základná energia"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Maximálny počet hráčov:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Maximum FPS"
 
@@ -820,41 +1012,45 @@ msgstr "Maximum FPS"
 msgid "Mine"
 msgstr "Mína "
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "Hudba?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr ""
 
-#: src/menu/results_menu.cpp:366
-#, fuzzy
-msgid "Most clumsy"
-msgstr "Najužitočnejší"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Najvypredávanejší"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Najužitočnejší"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Najneužitočnejší "
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Najnásilnejší "
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Padák"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Hudba?"
 
@@ -862,34 +1058,50 @@ msgstr "Hudba?"
 msgid "Network Game"
 msgstr "Sieťová hra"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 #, fuzzy
 msgid "Network initialization"
 msgstr "Inicializuje sa okolie..."
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
 msgstr "Sieťová hra"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Nenájdený element <%s> v xml konfiguračnom súbore!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Nikto!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Počet postáv"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Počet tímov:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Nastavenie"
@@ -903,42 +1115,55 @@ msgstr "Nastavenie"
 msgid "Parachute"
 msgstr "Padák"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Padák je aktivovaný automaticky"
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pauza"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Hraj"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Hráč"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Zobraziť energiu hráča?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Zobraziť hráčovo meno ?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Zobraziť hráčovo meno ?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Tchor raketomet"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr ""
 
@@ -946,7 +1171,7 @@ msgstr ""
 msgid "Quit"
 msgstr "Koniec"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Ukončiť Wormuxa"
 
@@ -954,21 +1179,26 @@ msgstr "Ukončiť Wormuxa"
 msgid "Quit battle"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Spusti hru"
+
+#: src/menu/map_selection_box.cpp:228
 #, fuzzy
 msgid "Random map"
 msgstr "Načítavam mapu"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 #, fuzzy
 msgid "Reading default config file"
 msgstr "Čítam osobný konfiguračný súbor"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Čítam osobný konfiguračný súbor"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Rozlíšenie"
 
@@ -976,34 +1206,34 @@ msgstr "Rozlíšenie"
 msgid "Riot Bomb"
 msgstr "Riot Bomba"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Spusti hru"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr ""
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "Posúvanie mapou"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Posúvanie mapou"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Adresa servera:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Server dostupný na Internete"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 #, fuzzy
 msgid "Server mode"
 msgstr "Adresa servera:"
@@ -1012,10 +1242,35 @@ msgstr "Adresa servera:"
 msgid "Shotgun"
 msgstr "Brokovnica"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Nastavenie"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Preskoč kolo"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Sniper puška"
@@ -1024,29 +1279,36 @@ msgstr "Sniper puška"
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr ""
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "Zvuky"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Zvukové efekty?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Zvuková frekvencia"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Beh novej hry "
 
@@ -1066,20 +1328,28 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Syringe"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr ""
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "Tími"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "Tími"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Tími"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleport"
@@ -1093,11 +1363,11 @@ msgstr "Šrapnelová bomba opustila bojisko predtým ako mohla vybuchnúť."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Šrapnelová bomba opustila bojisko predtým ako mohla vybuchnúť."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "GNU opustil bojisko pred výbuchom"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Tchor opustil bojisko pred výbuchom"
 
@@ -1109,6 +1379,13 @@ msgstr "Automatická raketa opustila bojisko ..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Lopta opustila bojisko pred výbuchom"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "Pripojenie vypršalo. Skontroluj či nie je povolený firewall!"
@@ -1117,7 +1394,7 @@ msgstr "Pripojenie vypršalo. Skontroluj či nie je povolený firewall!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Disco granát opustil parket pred výbuchom"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1125,7 +1402,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr "Granát opustil bojisko pred výbuchom"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr ""
 
@@ -1144,7 +1421,7 @@ msgstr "Server odmietol pripojenie."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Server odmietol pripojenie."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, fuzzy, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
@@ -1152,7 +1429,12 @@ msgstr[0] "Je tu len %i tím."
 msgstr[1] "Sú tu len %i tímy."
 msgstr[2] "Sú tu len %i tímy."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1168,7 +1450,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr ""
 
@@ -1176,12 +1458,12 @@ msgstr ""
 msgid "Unable to contact host."
 msgstr "Nedá sa kontaktovať hostiteľar."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Nedá sa otvoriť adresár máp (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, fuzzy, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Nedá sa otvoriť adresár máp (%s)!"
@@ -1190,20 +1472,30 @@ msgstr "Nedá sa otvoriť adresár máp (%s)!"
 msgid "Unable to use this port!"
 msgstr "Nedá sa použiť tento port!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+#, fuzzy
+msgid "Unknown command"
+msgstr "Neznáma akcia"
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(neobmedzene)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Verzia"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, fuzzy, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
@@ -1211,65 +1503,81 @@ msgstr[0] "Čakaj! %i hráč nie je ešte pripravený!"
 msgstr[1] "Čakaj! %i hráči nie sú ešte pripravení!"
 msgstr[2] "Čakaj! %i hráči nie sú ešte pripravení!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Zbraňe"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Web stránka: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Hanba ti %s - Zabitý obyčajnou píštoľou!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "ÄŒastice vetra?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 #, fuzzy
 msgid "Winner"
 msgstr "Mína "
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux sa spúšťa..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux verzia"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 #, fuzzy
 msgid "You are alone :-/"
 msgstr "Si sáám..."
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Si sáám..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Potrebuješ najmenej jednu platnú mapu !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Potrebuješ najmenej dva platné tímy !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr ""
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Tvoja strela minula!"
 
@@ -1278,22 +1586,27 @@ msgstr "Tvoja strela minula!"
 msgid "aka"
 msgstr "Raketomet"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
 "a bombing per turn"
 msgstr ""
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr ""
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "koniec"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 #, fuzzy
 msgid "error parsing the config file"
 msgstr "Čítam osobný konfiguračný súbor"
@@ -1302,17 +1615,17 @@ msgstr "Čítam osobný konfiguračný súbor"
 msgid "from"
 msgstr ""
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 #, fuzzy
 msgid "no configuration file!"
 msgstr "Chyba počas načítavania konfiguračného súboru: %s"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 #, fuzzy
 msgid "o Loading music"
 msgstr "=== Načítavam ==="
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, fuzzy, c-format
 msgid "o Loading sound profile: %s"
 msgstr "Chyba počas načítavania konfiguračného súboru: %s"
@@ -1322,61 +1635,36 @@ msgstr "Chyba počas načítavania konfiguračného súboru: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr ""
 
-#~ msgid "Connect !"
-#~ msgstr "Pripájam !"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Pripojenie k internetovej hre"
-
-#~ msgid "Refresh"
-#~ msgstr "Obnovovanie"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Chyba počas načítavania dát tímu %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Chyba počas načítavania konfiguračného súboru: %s"
-
 #, fuzzy
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Chyba počas načítavania konfiguračného súboru: %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Chyba počas načítavania herného módu %s (súbor %s):"
+#~ msgid "  Most sold-out  :  "
+#~ msgstr " Najvypredávanejší :  %s (%i).\n"
 
 #, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "XML chyba počas načítavania mapy '%s' :"
+#~ msgid "  Most useful   :  "
+#~ msgstr "  Najužitočnejší  :  %s (%i).\n"
 
 #, fuzzy
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "Wormux verzie sú rozdielne: klient=%s, server=%s."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Ponáhľaj sa, si príliš pomalý  !!"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Skutočne chceš skončiť(A/N) ?"
+#~ msgid "  Most useless  :  "
+#~ msgstr "  Najneužitočnejší :  %s (%i).\n"
 
 #, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Inicializuje sa okolie..."
+#~ msgid "  Most violent  :  "
+#~ msgstr "  Najnásilnejší  :  %s (%i).\n"
 
-#~ msgid "(current)"
-#~ msgstr "(súčasný)"
+#~ msgid " has joined the party"
+#~ msgstr " sa pridal k spoločnosti"
+
+#~ msgid " has left the party"
+#~ msgstr "opustil spoločnosť"
 
 #, fuzzy
-#~ msgid ""
-#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
-#~ "blowtorch, submachine gun) and surely many other things don't work either!"
-#~ msgstr ""
-#~ "Niektoré zbrane sú zablokované, kvôli známim chybám (nindžalano, vŕtačka, "
-#~ "plameňomet, SMG zbraň) a bezpochyby mnoho ďalších vecí tiež!"
+#~ msgid "%s has lost %u point of energy."
+#~ msgid_plural "%s has lost %u points of energy."
+#~ msgstr[0] "%s stratil %u bod energie."
+#~ msgstr[1] "%s stratil %u bodov energie."
 
-#~ msgid ""
-#~ "WARNING!! Network is still under developement and therefore a little "
-#~ "experimental."
-#~ msgstr "POZOR!! Sieť je stále vyvíjaná a teda trochu experimentálna."
+#~ msgid "%s is stupidly dead because he gone out of the map ..."
+#~ msgstr "%s je hlúpo mŕtvy, lebo sa dostal mimo mapy ..."
 
 #, fuzzy
 #~ msgid "%s team has won %u Gnu!"
@@ -1413,84 +1701,9 @@ msgstr ""
 #~ msgstr[1] "%s tími vyhrali %u %s!"
 #~ msgstr[2] "%s tími vyhrali %u %s!"
 
-#~ msgid ""
-#~ "WARNING! Disconnections are not yet handled. So you have to restart "
-#~ "Wormux after each disconnection!"
-#~ msgstr ""
-#~ "POZOR!! Odpojenia nie su ovládané. Takže musíš reštartovať Wormux po "
-#~ "každom odpojení!"
-
-#~ msgid "Remote"
-#~ msgstr "Vzdialený"
-
-#~ msgid "Ninjarope"
-#~ msgstr "Nindžalano"
-
-#, fuzzy
-#~ msgid "Error while exporting file %s:"
-#~ msgstr "Chyba počas exportovania herného módu %s (súbor %s):"
-
-#~ msgid "Error while loading game mode %s from memory:"
-#~ msgstr "Chyba počas načítavania herného módu %s z pamäte:"
-
-#~ msgid "Unexpected exception caught..."
-#~ msgstr "Zachytená neočakávaná výnimka..."
-
-#~ msgid "C++ exception caught:"
-#~ msgstr "Zachytená výnimka C++ :"
-
-#~ msgid "Failed to initialize network library!"
-#~ msgstr "Nedá sa inicializovať sieťová knižnica!"
-
-#~ msgid "Initialisation of TTF library failed: %s"
-#~ msgstr "Inicializácia TTF knižnice zlyhala: %s"
-
-#~ msgid "Unable to initialize SDL library: %s"
-#~ msgstr "Nedá sa inicializovať SDL knižnca: %s"
-
-#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
-#~ msgstr ""
-#~ "Potrebuješ najmenej dva tímy na hru: zmeň si to v menu 'Nastavenie' !"
-
-#~ msgid "general: "
-#~ msgstr "hlavné:"
-
-#~ msgid " has joined the party"
-#~ msgstr " sa pridal k spoločnosti"
-
-#~ msgid " has left the party"
-#~ msgstr "opustil spoločnosť"
-
-#~ msgid "Find a random position for characters"
-#~ msgstr "Náhodná poloha pre postavu"
-
-#, fuzzy
-#~ msgid "  Most sold-out  :  "
-#~ msgstr " Najvypredávanejší :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most useful   :  "
-#~ msgstr "  Najužitočnejší  :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "  Most useless  :  "
-#~ msgstr "  Najneužitočnejší :  %s (%i).\n"
-
 #, fuzzy
-#~ msgid "  Most violent  :  "
-#~ msgstr "  Najnásilnejší  :  %s (%i).\n"
-
-#, fuzzy
-#~ msgid "%s has lost %u point of energy."
-#~ msgid_plural "%s has lost %u points of energy."
-#~ msgstr[0] "%s stratil %u bod energie."
-#~ msgstr[1] "%s stratil %u bodov energie."
-
-#~ msgid "%s is stupidly dead because he gone out of the map ..."
-#~ msgstr "%s je hlúpo mŕtvy, lebo sa dostal mimo mapy ..."
-
-#~ msgid "%s team has won.\n"
-#~ msgstr "%s tím vyhral.\n"
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "Wormux verzie sú rozdielne: klient=%s, server=%s."
 
 #, fuzzy
 #~ msgid "'%s has won %u Anvil"
@@ -1510,6 +1723,9 @@ msgstr ""
 #~ msgstr[0] "Hráč '%s' zvíťazil %u leteckým útokom!"
 #~ msgstr[1] "Hráč '%s' zvíťazil %u leteckými útokmi!"
 
+#~ msgid "(current)"
+#~ msgstr "(súčasný)"
+
 #~ msgid "<infinite_background> needs <is_open> to be set to work correctly!!"
 #~ msgstr ""
 #~ "<infinite_background> potrebuje <is_open> byť nastavené aby pracovalo "
@@ -1531,6 +1747,9 @@ msgstr ""
 #~ msgid "Baseball"
 #~ msgstr "Basebal"
 
+#~ msgid "C++ exception caught:"
+#~ msgstr "Zachytená výnimka C++ :"
+
 #~ msgid "ClanLib error :"
 #~ msgstr "Chyba ClanLib :"
 
@@ -1538,6 +1757,12 @@ msgstr ""
 #~ msgid "ClanLib error during loading map '%s' :"
 #~ msgstr "Chyba počas načítavania mapy  '%s' :"
 
+#~ msgid "Connect !"
+#~ msgstr "Pripájam !"
+
+#~ msgid "Connect to an internet game"
+#~ msgstr "Pripojenie k internetovej hre"
+
 #, fuzzy
 #~ msgid "Connected to "
 #~ msgstr "Koniec hry !"
@@ -1545,6 +1770,9 @@ msgstr ""
 #~ msgid "Dead of %s (%s)."
 #~ msgstr "Zabitý %s (%s)."
 
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Skutočne chceš skončiť(A/N) ?"
+
 #~ msgid "Drawn game :-("
 #~ msgstr "Vyrovnaná hra :-("
 
@@ -1555,18 +1783,44 @@ msgstr ""
 #~ msgid "End of the game!\n"
 #~ msgstr "Koniec hry!\n"
 
-#~ msgid "Energy:"
-#~ msgstr "Energia:"
-
 #~ msgid "Error during loading skin %s:"
 #~ msgstr "Chyba počas načítavania skinu %s:"
 
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Chyba počas načítavania dát tímu %s:"
+
+#, fuzzy
+#~ msgid "Error while exporting file %s:"
+#~ msgstr "Chyba počas exportovania herného módu %s (súbor %s):"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Chyba počas načítavania konfiguračného súboru: %s"
+
+#, fuzzy
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Chyba počas načítavania konfiguračného súboru: %s"
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Chyba počas načítavania herného módu %s (súbor %s):"
+
+#~ msgid "Error while loading game mode %s from memory:"
+#~ msgstr "Chyba počas načítavania herného módu %s z pamäte:"
+
+#~ msgid "Failed to initialize network library!"
+#~ msgstr "Nedá sa inicializovať sieťová knižnica!"
+
+#~ msgid "Find a random position for characters"
+#~ msgstr "Náhodná poloha pre postavu"
+
 #~ msgid "Info"
 #~ msgstr "Info"
 
 #~ msgid "Init data"
 #~ msgstr "za"
 
+#~ msgid "Initialisation of TTF library failed: %s"
+#~ msgstr "Inicializácia TTF knižnice zlyhala: %s"
+
 #, fuzzy
 #~ msgid "Is it a gift?"
 #~ msgstr "Je to dar ?"
@@ -1578,6 +1832,13 @@ msgstr ""
 #~ msgid "Load skins:"
 #~ msgstr "Načítavam skiny:"
 
+#, fuzzy
+#~ msgid "Network deinitialization"
+#~ msgstr "Inicializuje sa okolie..."
+
+#~ msgid "Ninjarope"
+#~ msgstr "Nindžalano"
+
 #~ msgid "Number of players per team:"
 #~ msgstr "Počet hráčov v tíme:"
 
@@ -1587,18 +1848,26 @@ msgstr ""
 #~ msgid "PAUSE"
 #~ msgstr "PAUZA"
 
-#~ msgid "Pause"
-#~ msgstr "Pauza"
-
 #~ msgid "Please tell us your opinion of Wormux via email:"
 #~ msgstr "Prosím vyjadri nám svoj názor na Wormux cez email:"
 
-#~ msgid "Select the teams:"
-#~ msgstr "Vyber tímy:"
+#~ msgid "Refresh"
+#~ msgstr "Obnovovanie"
+
+#~ msgid "Remote"
+#~ msgstr "Vzdialený"
 
 #~ msgid "Select the world:"
 #~ msgstr "Vyber svet:"
 
+#, fuzzy
+#~ msgid ""
+#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
+#~ "blowtorch, submachine gun) and surely many other things don't work either!"
+#~ msgstr ""
+#~ "Niektoré zbrane sú zablokované, kvôli známim chybám (nindžalano, vŕtačka, "
+#~ "plameňomet, SMG zbraň) a bezpochyby mnoho ďalších vecí tiež!"
+
 #~ msgid "Sound error :"
 #~ msgstr "Chyba zvuku :"
 
@@ -1623,17 +1892,32 @@ msgstr ""
 #~ msgid "Unable to contact top server!"
 #~ msgstr "Nedá sa otvoriť adresár máp (%s)!"
 
+#~ msgid "Unable to initialize SDL library: %s"
+#~ msgstr "Nedá sa inicializovať SDL knižnca: %s"
+
 #, fuzzy
 #~ msgid "Unable to join the game..."
 #~ msgstr "Vcucnutie do vákua ..."
 
-#~ msgid "Unknow action"
-#~ msgstr "Neznáma akcia"
+#~ msgid "Unexpected exception caught..."
+#~ msgstr "Zachytená neočakávaná výnimka..."
 
 #, fuzzy
 #~ msgid "Use sound?"
 #~ msgstr "Použi zvuk"
 
+#~ msgid ""
+#~ "WARNING! Disconnections are not yet handled. So you have to restart "
+#~ "Wormux after each disconnection!"
+#~ msgstr ""
+#~ "POZOR!! Odpojenia nie su ovládané. Takže musíš reštartovať Wormux po "
+#~ "každom odpojení!"
+
+#~ msgid ""
+#~ "WARNING!! Network is still under developement and therefore a little "
+#~ "experimental."
+#~ msgstr "POZOR!! Sieť je stále vyvíjaná a teda trochu experimentálna."
+
 #~ msgid "Wait for map"
 #~ msgstr "Čakám na mapu"
 
@@ -1664,9 +1948,20 @@ msgstr ""
 #~ msgstr "Víťaz : tím %s"
 
 #, fuzzy
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "XML chyba počas načítavania mapy '%s' :"
+
+#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgstr ""
+#~ "Potrebuješ najmenej dva tímy na hru: zmeň si to v menu 'Nastavenie' !"
+
+#, fuzzy
 #~ msgid "[Music] Error : file %s does not exist"
 #~ msgstr "Súbor \"%s\" neexistuje !"
 
 #, fuzzy
 #~ msgid "[Sound] Error: File %s does not exist"
 #~ msgstr "Súbor \"%s\" neexistuje !"
+
+#~ msgid "general: "
+#~ msgstr "hlavné:"
diff --git a/po/sl.po b/po/sl.po
index fe67856..0e73c9f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
-"PO-Revision-Date: 2008-04-25 18:30+0100\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
+"PO-Revision-Date: 2008-07-07 18:30+0100\n"
 "Last-Translator: Jaka Kranjc <mokovec at gmail.com>\n"
 "Language-Team:  <sl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,12 @@ msgstr ""
 "n%100==4 ? 2 : 3);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Karta %s ni bila najdena :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
@@ -35,7 +35,7 @@ msgstr[1] "povezana %i igralca"
 msgstr[2] "povezani %i igralci"
 msgstr[3] "povezanih %i igralcev"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
@@ -44,51 +44,61 @@ msgstr[1] "%i igralca pripravljena"
 msgstr[2] "%i igralci pripravljeni"
 msgstr[3] "%i igralcev pripravljenih"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) je umrl/a."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> znan kot %s iz %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> iz <%s>"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Ekipa %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "Ekipa %s - Oddaljena"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s je naredil/a samomor!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:718
+#, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s iz ekipe %s je naredil/a samomor!"
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
+msgstr "%s iz ekipe %s je umrl/a."
+
+#: src/game/game.cpp:709
+#, c-format
+msgid "%s from %s team has fallen into the water!"
+msgstr "%s iz ekipe %s je padel/a v vodo."
+
+#: src/game/game.cpp:703
+#, c-format
+msgid "%s from %s team has fallen off the map!"
+msgstr "%s iz ekipe %s je padel/a s karte!"
+
+#: src/game/game.cpp:724
 #, c-format
-msgid "%s has fallen in water."
-msgstr "%s je padel/a v vodo."
+msgid "%s from %s team has hit the ground too hard!"
+msgstr "%s iz ekipe %s je premočno zadel tla!"
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:731
 #, c-format
-msgid "%s has fallen off the map!"
-msgstr "%s je padel/a s karte!"
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s iz ekipe %s je mrtev, ker je bil neroden!"
 
 #: src/object/medkit.cpp:68
 #, c-format
@@ -99,16 +109,11 @@ msgstr[1] "%s je dobil %u točki energije!"
 msgstr[2] "%s je dobil %u točke energije!"
 msgstr[3] "%s je dobil %u točk energije!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s je psihopat, saj je ubil člana ekipe %s!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s je mrtev, ker je bil neroden!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -134,7 +139,7 @@ msgstr[1] "Ekipa %s je osvojila %u kasetni bazuki!"
 msgstr[2] "Ekipa %s je osvojila %u kasetne bazuke!"
 msgstr[3] "Ekipa %s je osvojila %u kasetnih bazuk!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
@@ -143,7 +148,7 @@ msgstr[1] "Ekipa %s je osvojila %u gnuja! Razstreli jih, kavboj!"
 msgstr[2] "Ekipa %s je osvojila %u gnuje! Razstreli jih, kavboj!"
 msgstr[3] "Ekipa %s je osvojila %u gnujev! Razstreli jih, kavboj!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
@@ -152,7 +157,7 @@ msgstr[1] "Ekipa %s je osvojila %u zračna napada!"
 msgstr[2] "Ekipa %s je osvojila %u zračne napade!"
 msgstr[3] "Ekipa %s je osvojila %u zračnih napadov!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -165,7 +170,7 @@ msgstr[1] "Ekipa %s je osvojila %u pnevmatično kladivi!"
 msgstr[2] "Ekipa %s je osvojila %u pnevmatično kladiva!"
 msgstr[3] "Ekipa %s je osvojila %u pnevmatično kladiv!"
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -231,7 +236,7 @@ msgstr[1] "Ekipa %s je osvojila %u kasetni bombi!"
 msgstr[2] "Ekipa %s je osvojila %u kasetne bombe!"
 msgstr[3] "Ekipa %s je osvojila %u kasetnih bomb!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -277,7 +282,7 @@ msgstr[1] "Ekipa %s je osvojila %u nogometni bombi!"
 msgstr[2] "Ekipa %s je osvojila %u nogometne bombe!"
 msgstr[3] "Ekipa %s je osvojila %u nogometnih bomb!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -304,7 +309,7 @@ msgstr[1] "Ekipa %s je osvojila %u pištoli!"
 msgstr[2] "Ekipa %s je osvojila %u pištole!"
 msgstr[3] "Ekipa %s je osvojila %u pištol!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
@@ -313,7 +318,7 @@ msgstr[1] "Ekipa %s je osvojila %u raketna nahrbtnika! Juuuhu!"
 msgstr[2] "Ekipa %s je osvojila %u raketne nahrbtnike! Juuuhu!"
 msgstr[3] "Ekipa %s je osvojila %u raketnih nahrbtnikov! Juuuhu!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -331,7 +336,7 @@ msgstr[1] "Ekipa %s je osvojila %u mini!"
 msgstr[2] "Ekipa %s je osvojila %u mine!"
 msgstr[3] "Ekipa %s je osvojila %u min!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
@@ -340,7 +345,7 @@ msgstr[1] "Ekipa %s je osvojila %u padali!"
 msgstr[2] "Ekipa %s je osvojila %u padala!"
 msgstr[3] "Ekipa %s je osvojila %u padal!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -371,7 +376,16 @@ msgstr[1] "Ekipa %s je osvojila %u Å¡ibrovki!"
 msgstr[2] "Ekipa %s je osvojila %u Å¡ibrovke!"
 msgstr[3] "Ekipa %s je osvojila %u Å¡ibrovk!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "Ekipa %s je osvojila %u klofut!"
+msgstr[1] "Ekipa %s je osvojila %u klofuto!"
+msgstr[2] "Ekipa %s je osvojila %u klofuti!"
+msgstr[3] "Ekipa %s je osvojila %u klofute!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -426,7 +440,7 @@ msgstr[1] "Ekipa %s je osvojila %u Preskoči potezo! Izjemno uporabno!"
 msgstr[2] "Ekipa %s je osvojila %u Preskoči potezo! Izjemno uporabno!"
 msgstr[3] "Ekipa %s je osvojila %u Preskoči potezo! Izjemno uporabno!"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
@@ -439,16 +453,26 @@ msgstr[2] ""
 msgstr[3] ""
 "Ekipa %s je osvojila %u SuperTux-ov! Še niste videli letečega pingvina?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr "Ekipa %s je bila uničena."
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr "%s je s sabo v grob vzel še člana skupine %s!"
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(mrtev)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(sistemski jezik)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(čas ni znan)"
 
@@ -457,7 +481,7 @@ msgstr "(čas ni znan)"
 msgid "(unlimited)"
 msgstr "(neomejeno)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -466,7 +490,11 @@ msgstr ""
 "Na voljo je nova različica %s, vaša je pa %s. Preverite, če je za vaš "
 "operacijski sistem že na voljo posodobitev!"
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr "Dodaj ekipo"
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Zračni napad"
 
@@ -474,10 +502,18 @@ msgstr "Zračni napad"
 msgid "Airhammer"
 msgstr "Pnevmatsko kladivo"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Vse ekipe"
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr "Vedno"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "In zmagali so ..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -492,7 +528,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Nakovalo"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Avtorji:"
 
@@ -516,6 +552,14 @@ msgstr "Kij"
 msgid "Bazooka"
 msgstr "Bazuka"
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr "Pred premikom"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr "Blitz"
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Varilnik"
@@ -528,8 +572,9 @@ msgstr "Skokica"
 msgid "Bye bye tux..."
 msgstr "Adijo tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Ni mogoče najti ekipe %s!"
@@ -539,24 +584,69 @@ msgstr "Ni mogoče najti ekipe %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Ni mogoče odpreti osebno-ekipnega imenika (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Ni mogoče odpreti ekipnega imenika (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Ni mogoče odpreti osebnega ekipnega imenika (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr "Osredotoči kamero na člana"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr "Zamenjaj aktivnega člana"
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr "Spremeni kot merjenja"
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr "Spremeni skupino orožja"
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr "Spremeni čas orožja"
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr "ÄŒlan"
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr "Menjava članov"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "Preveri možno posodobitev?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "Izberi naključno karto"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr "Klasični"
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr "Klik: osredotoči kamero na člana"
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Odjemalski način"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Najbolj neroden"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Kasetna granata"
@@ -569,7 +659,11 @@ msgstr "Kasetna bazuka"
 msgid "Commit Suicide"
 msgstr "Samomor"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr "Nastavitveni meni!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Povezava do igre"
 
@@ -577,11 +671,11 @@ msgstr "Povezava do igre"
 msgid "Connected !"
 msgstr "Povezan!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Tram"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Vodja: "
 
@@ -590,7 +684,7 @@ msgstr "Vodja: "
 msgid "Couldn't fetch last version from %s"
 msgstr "Ni bilo mogoče pridobiti zadnje različice iz %s"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "Ni bilo mogoče odpreti datoteke %s"
@@ -599,11 +693,32 @@ msgstr "Ni bilo mogoče odpreti datoteke %s"
 msgid "Credits"
 msgstr "Zasluge"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr "Škoda na potezo v fatalnem načinu"
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr "Izbriši ekipo"
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Disko Granata"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr "Prikaže to sporočilo"
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr "Povleci&spusti: premakne kamero"
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr "Čas do fatalnega načina"
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Trajanje poteze"
 
@@ -611,24 +726,35 @@ msgstr "Trajanje poteze"
 msgid "Dynamite"
 msgstr "Dinamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "KONEC IGRE"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "Glasnost učinkov"
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr "Energija"
+
+#: src/tool/error.cpp:63
+#, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr "Napaka v %s:%lu (Wormux %s) : %s"
+
+#: src/include/action_handler.cpp:210
 #, c-format
-msgid "Error in %s:%lu"
-msgstr "Napaka v %s:%lu"
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+"Napaka pri inicializaciji omrežja: odjemalec %s se ne strinja z vami!! - %s"
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Napaka pri nalaganju ekipe:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
@@ -636,7 +762,18 @@ msgstr ""
 "Napaka pri ustvarjanju imenika \"%s\": ni bilo mogoče shraniti datoteke z "
 "nastavitvami."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "Napaka pri brisanju imenika \"%s\". Ni bilo mogoče izbrisati ekipe."
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "Napaka pri brisanju datoteke \"%s\". Ni bilo mogoče izbrisati ekipe."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -646,35 +783,42 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Napaka: Ni se bilo mogoče povezati na %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
 msgstr ""
 "Napaka: Ni bilo mogoče kontaktirati strežnika s kazalom, da bi lahko gostili "
 "igro"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Napaka: Ni bilo mogoče kontaktirati strežnika s kazalom, da bi lahko iskali "
-"internetno igro"
+"internetne igre"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Napaka: Ni bilo mogoče zagnati strežnika"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
-"Napaka: Vaš strežnik ni dosegljiv preko Interneta. Preverite vaš požarni zid"
+"Napaka: vaš strežnik ni dosegljiv preko interneta. Preverite nastavitve "
+"vašega požarnega zidu: vrata TCP %s morajo biti odprta za zunanje povezave. "
+"ÄŒe na internet niste povezani neposredno, preverite nastavitve "
+"usmerjevalnika:  vrata TCP %s morajo biti posredovana."
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Napaka: ni bilo mogoče najti telesa \"%s\" za ekipo \"%s\"."
@@ -687,23 +831,31 @@ msgstr "Metalec plamenov"
 msgid "Football Bomb"
 msgstr "Nogometna bomba"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr "Cel zaslon / okno"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Celozaslonski način?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr "Igra"
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr "Vrsta igre"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "Ime igre:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Metalec gnuja"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr "Grafika"
 
@@ -711,11 +863,15 @@ msgstr "Grafika"
 msgid "Grapple"
 msgstr "Kavelj"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr "Gravitacija"
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granata"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Inicializacija tal..."
 
@@ -723,16 +879,16 @@ msgstr "Inicializacija tal..."
 msgid "Gun"
 msgstr "Pištola"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Imenik HOME (okoljska spremenljivka $HOME) ni bila najden!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Uživajte v igri!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Poveljnik"
 
@@ -745,7 +901,11 @@ msgstr "Poveljnik: "
 msgid "Help"
 msgstr "Pomoč"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr "Visoki skok"
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Gostite igro"
 
@@ -787,7 +947,11 @@ msgstr ""
 "Uporaba: kliknite na tarčo\n"
 "ena uporaba na potezo"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Pohitite, prepočasni ste!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -795,7 +959,8 @@ msgstr ""
 "Če ste našli hrošča ali imate željo po novi funkciji, nam pošljite\n"
 "elektronsko sporočilo (v angleščini) na:"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Začetna energija"
 
@@ -810,7 +975,7 @@ msgstr ""
 "Strel: držite preslednico dokler raketa ne doseže željene moči\n"
 "ena uporaba na potezo"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Inicializacija"
 
@@ -818,33 +983,45 @@ msgstr "Inicializacija"
 msgid "Initialise map"
 msgstr "Inicializacija karte"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Inicializacija zvokov"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Inicializacija ekip"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "To je darilo!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Raketni nahrbtnik"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 "Pridružite se kanalu #wormux na irc.freenode.net in si poiščite nekaj "
 "nasprotnikov."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr "Skok"
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr "Skok nazaj"
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr "Brcne igralca z imenom <nickname> iz igre"
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Jezik"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Nalaganje kart:"
 
@@ -852,7 +1029,7 @@ msgstr "Nalaganje kart:"
 msgid "Load teams:"
 msgstr "Nalaganje ekip:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Krajevne ekipe:"
 
@@ -860,13 +1037,13 @@ msgstr "Krajevne ekipe:"
 msgid "LowGrav"
 msgstr "Zmanjševalnik gravitacije"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr "Ročna povezava"
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr "Karta"
 
@@ -879,11 +1056,15 @@ msgstr "Karta %s je stvaritev: "
 msgid "Maps"
 msgstr "Karte"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr "Max energije"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Največje število igralcev:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Največji FPS"
 
@@ -891,39 +1072,43 @@ msgstr "Največji FPS"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr "Razno"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Najbolj natančen"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Najbolj neroden"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Najbolj izdan"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Najbolj uporaben"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Najbolj neuporaben"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Najbolj nasilen"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr "Premakni kamero z miško ali puščicami"
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr "Premakni člana"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "Glasnost glasbe"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Glasba?"
 
@@ -931,32 +1116,48 @@ msgstr "Glasba?"
 msgid "Network Game"
 msgstr "Omrežna igra"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Inicializacija omrežja"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr "Nikoli"
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
-msgstr "Nova omrežna igra ob"
+msgstr "Nova omrežna igra ob "
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr "Opozori na nove igralce?"
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "V xml nastavitveni datoteki ni bil najden noben element <%s>!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Nihče!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Število članov"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Å tevilo ekip:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr "Na člana: spremeni aktivnega"
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr "Na karto: izbere tarčo"
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Nastavitve"
@@ -969,42 +1170,54 @@ msgstr "Nastavitve"
 msgid "Parachute"
 msgstr "Padalo"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Padalo se samodejno odpre."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr "Geslo:"
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr "Pavza"
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Igra"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr "Več iger zapored"
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Igralec"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Energija igralca?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr "Ime igralca"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Ime igralca?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Dihurjemet"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Vrata:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr "Javne bitke"
 
@@ -1012,7 +1225,7 @@ msgstr "Javne bitke"
 msgid "Quit"
 msgstr "Končaj"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Končaj Wormux"
 
@@ -1020,19 +1233,23 @@ msgstr "Končaj Wormux"
 msgid "Quit battle"
 msgstr "Končaj bitko"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr "Končaj igro"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "Naključna karta"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Branje privzete nastavitvene datoteke"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Branje osebne nastavitvene datoteke"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Ločljivost"
 
@@ -1040,33 +1257,33 @@ msgstr "Ločljivost"
 msgid "Riot Bomb"
 msgstr "Kopaška granata"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Poženi igro"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Reci: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr "Meja drsenja na robu"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Drsenje na robu"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Naslov strežnika:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Strežnik naj bo viden na Internetu"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Način strežnika"
 
@@ -1074,10 +1291,34 @@ msgstr "Način strežnika"
 msgid "Shotgun"
 msgstr "Å ibrovka"
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr "Pokaži orožni meni"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr "Pokaži/skrij vmesnik"
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr "Pokaži/skrij minikarto"
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Preskoči potezo"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr "Klofuta"
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr "Klofni sovražnika, da bo kar poskočil."
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr "Natančnejši merilni kot in stopinja"
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Ostrostrelska puška"
@@ -1086,28 +1327,38 @@ msgstr "Ostrostrelska puška"
 msgid "Someone put a booby trap into the crate!"
 msgstr "Nekdo je v zaboj podtaknil bombo!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Oprostite, nobena igra trenutno ne čaka na igralce"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+"Oprostite, vaša različica ni več podprta. Podprte različice so %s. "
+"Posodobljeno različico lahko dobite na http://www.wormux.org/wiki/download."
+"php"
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr "Zvok"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Zvočni učinki?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Frekvenca zvoka"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Zagon nove igre"
 
@@ -1127,18 +1378,26 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Injekcija"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr "Klepet v večigralski igri"
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr "Ekipni grafi"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr "Ekipna statistika"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Ekipe"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr "Urejevalnik ekip"
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleprenos"
@@ -1151,11 +1410,11 @@ msgstr "Kasetna granata je zapustila bojišče še preden jo je razneslo."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Nogometna bomba je zapustila bojišče še preden jo je razneslo."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnu je zapustil bojišče preden ga je razneslo"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Dihur je zapustil bojišče preden ga je razneslo"
 
@@ -1167,6 +1426,15 @@ msgstr "Avtomatska raketa je zapustila bojišče..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Žoga je zapustila bojišče preden je eksplodirala"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+"Različice odjemalca in strežnika niso združljive (odjemalec=%s, strežnik=%"
+"s)! Prosimo poskusite z drugim strežnikom."
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "Povezava se je iztekla. Preverite da ni kriv požarni zid!"
@@ -1175,7 +1443,7 @@ msgstr "Povezava se je iztekla. Preverite da ni kriv požarni zid!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Disko granata je zapustila plesišče preden je eksplodirala"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "Igra je bila prekinjena zaradi prekinitve povezave."
 
@@ -1183,7 +1451,7 @@ msgstr "Igra je bila prekinjena zaradi prekinitve povezave."
 msgid "The grenade left the battlefield before exploding"
 msgstr "Granata je zapustila bojišče preden je eksplodirala"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "Ostali te čakajo! Zbudi se! :-)"
 
@@ -1200,7 +1468,7 @@ msgstr "Strežnik je zavrnil povezavo."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Strežnik je zavrnil povezavo: napačno geslo!"
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
@@ -1209,7 +1477,12 @@ msgstr[1] "Tukaj sta samo %i ekipi."
 msgstr[2] "Tukaj so samo %i ekipe."
 msgstr[3] "Tukaj je samo %i ekip."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr "ÄŒas"
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1233,7 +1506,7 @@ msgstr ""
 "Strel: pritisnite preslednico\n"
 "ena uporaba na potezo"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Orodja"
 
@@ -1241,12 +1514,12 @@ msgstr "Orodja"
 msgid "Unable to contact host."
 msgstr "Ni bilo mogoče kontaktirati gostitelja."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Ni bilo mogoče odpreti imenika s kartami (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Ni bilo mogoče odpreti zasebnega imenika s kartami (%s)!"
@@ -1255,20 +1528,28 @@ msgstr "Ni bilo mogoče odpreti zasebnega imenika s kartami (%s)!"
 msgid "Unable to use this port!"
 msgstr "Ni bilo mogoče uporabiti teh vrat!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr "Neznan ukaz"
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr "Neomejen"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "Brezimjek"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Različica"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "Preverjanje različice je spodletelo zaradi: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
@@ -1277,63 +1558,79 @@ msgstr[1] "Počakajte! %i igralca še nista pripravljena!"
 msgstr[2] "Počakajte! %i igralci še niso pripravljeni!"
 msgstr[3] "Počakajte! %i igralcev še ni pripravljenih!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Čakanje na strežnik, lahko se samo pogovarjate!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr "Orožje: streljaj / Paket: hiter padec"
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Orožja"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Spletna stran: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Kakšna sramota za %s - ubit je bil s preprosto pištolo!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Vetrni delci?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Zmagovalec"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux se zaganja..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux različica "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr "Napačna kartna vsota CRC"
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr "Napačno ime karte!"
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr "Napačna ekipa!"
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Sami ste :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Sami ste..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Potrebujete vsaj eno veljavno karto!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Potrebujete vsaj dve veljavni ekipi !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Dokler ne izberete ekipe ne boste mogli igrati!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Zgrešili ste!"
 
@@ -1341,7 +1638,7 @@ msgstr "Zgrešili ste!"
 msgid "aka"
 msgstr "kot"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1351,15 +1648,20 @@ msgstr ""
 "Bombardiranje: levi klik na tarčo\n"
 "eno bombardiranje na potezo"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "nalaganje nastavitev ni bilo mogoče"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr "igralec po meri"
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "opravljeno"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "napaka pri razčlenjevanju nastavitvene datoteke"
 
@@ -1367,15 +1669,15 @@ msgstr "napaka pri razčlenjevanju nastavitvene datoteke"
 msgid "from"
 msgstr "iz"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "ni nastavitvene datoteke!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Nalaganje glasbe"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Nalaganje zvočnega profila: %s"
@@ -1385,14 +1687,51 @@ msgstr "o Nalaganje zvočnega profila: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Odprt avdio na %d Hz %d bit"
 
+#~ msgid "Automatically join a game"
+#~ msgstr "Samodejna priključitev k igri"
+
+#~ msgid ""
+#~ "No public servers available and incorrect manual connection settings. Try "
+#~ "connecting manually."
+#~ msgstr ""
+#~ "Na voljo ni nobenih javnih strežnikov, ročne nastavitve pa so napačne. "
+#~ "Poskusite se povezati ročno."
+
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr ""
+#~ "Napaka: Vaš strežnik ni dosegljiv preko Interneta. Preverite vaš požarni "
+#~ "zid"
+
+#~ msgid "%s team has won %u Gnu!"
+#~ msgid_plural "%s team has won %u Gnus!"
+#~ msgstr[0] "Ekipa %s je osvojila %u gnuja!"
+#~ msgstr[1] "Ekipa %s je osvojila %u gnuja!"
+#~ msgstr[2] "Ekipa %s je osvojila %u gnuje!"
+#~ msgstr[3] "Ekipa %s je osvojila %u gnujev!"
+
+#~ msgid "%s team has won %u unexpected weapon!"
+#~ msgid_plural "%s team has won %u unexpected weapons!"
+#~ msgstr[0] "Ekipa %s je osvojila %u nepričakovano orožje!"
+#~ msgstr[1] "Ekipa %s je osvojila %u nepričakovani orožji!"
+#~ msgstr[2] "Ekipa %s je osvojila %u nepričakovana orožja!"
+#~ msgstr[3] "Ekipa %s je osvojila %u nepričakovanih orožij!"
+
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "%s se poskuša povezati z drugačno različico : odjemalec=%s, vi=%s."
+
+#~ msgid "(current)"
+#~ msgstr "(trenutna)"
+
 #~ msgid "Connect !"
 #~ msgstr "Poveži !"
 
 #~ msgid "Connect to an internet game"
 #~ msgstr "Povezava na igro preko interneta"
 
-#~ msgid "Refresh"
-#~ msgstr "Osveži"
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Ali resnično želite končati? (Y/N)"
 
 #~ msgid "Error loading team's data %s:"
 #~ msgstr "Napaka pri nalaganju podatkov ekipe %s:"
@@ -1406,34 +1745,12 @@ msgstr "o Odprt avdio na %d Hz %d bit"
 #~ msgid "Error while loading game mode %s (file %s):"
 #~ msgstr "Napaka pri nalaganju igralskega načina %s (datoteka %s):"
 
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "Napaka v XML med nalaganjem karte '%s': "
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s se poskuša povezati z drugačno različico : odjemalec=%s, vi=%s."
-
-#~ msgid ""
-#~ "The client and server versions are incompatible (local=%s, server=%s). "
-#~ "Please try another server."
-#~ msgstr ""
-#~ "Različice odjemalca in strežnika niso združljive (odjemalec=%s, strežnik=%"
-#~ "s)! Prosimo poskusite z drugim strežnikom."
-
-#~ msgid "And the winner is..."
-#~ msgstr "In zmagali so ..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Pohitite, prepočasni ste!!"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Ali resnično želite končati? (Y/N)"
-
 #, fuzzy
 #~ msgid "Network deinitialization"
 #~ msgstr "Inicializacija omrežja"
 
-#~ msgid "(current)"
-#~ msgstr "(trenutna)"
+#~ msgid "Refresh"
+#~ msgstr "Osveži"
 
 #~ msgid ""
 #~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
@@ -1444,28 +1761,17 @@ msgstr "o Odprt avdio na %d Hz %d bit"
 #~ "deluje!"
 
 #~ msgid ""
-#~ "WARNING!! Network is still under developement and therefore a little "
-#~ "experimental."
-#~ msgstr ""
-#~ "OPOZORILO!! Omrežna igra je še vedno v delu in je zato malo poskusna."
-
-#~ msgid "%s team has won %u Gnu!"
-#~ msgid_plural "%s team has won %u Gnus!"
-#~ msgstr[0] "Ekipa %s je osvojila %u gnuja!"
-#~ msgstr[1] "Ekipa %s je osvojila %u gnuja!"
-#~ msgstr[2] "Ekipa %s je osvojila %u gnuje!"
-#~ msgstr[3] "Ekipa %s je osvojila %u gnujev!"
-
-#~ msgid "%s team has won %u unexpected weapon!"
-#~ msgid_plural "%s team has won %u unexpected weapons!"
-#~ msgstr[0] "Ekipa %s je osvojila %u nepričakovano orožje!"
-#~ msgstr[1] "Ekipa %s je osvojila %u nepričakovani orožji!"
-#~ msgstr[2] "Ekipa %s je osvojila %u nepričakovana orožja!"
-#~ msgstr[3] "Ekipa %s je osvojila %u nepričakovanih orožij!"
-
-#~ msgid ""
 #~ "WARNING! Disconnections are not yet handled. So you have to restart "
 #~ "Wormux after each disconnection!"
 #~ msgstr ""
 #~ "OPOZORILO! Z odklopi se Å¡e ne ravna. Tako da morate ponovno zagnati "
 #~ "Wormux po vsakem odklopu!"
+
+#~ msgid ""
+#~ "WARNING!! Network is still under developement and therefore a little "
+#~ "experimental."
+#~ msgstr ""
+#~ "OPOZORILO!! Omrežna igra je še vedno v delu in je zato malo poskusna."
+
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "Napaka v XML med nalaganjem karte '%s': "
diff --git a/po/sv.po b/po/sv.po
index 6d2437a..f563d5f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wormux\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2007-08-24 08:31+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -17,71 +17,82 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! Kartan %s hittades inte :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i spelare ansluten"
 msgstr[1] "%i spelare anslutna"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i spelare redo"
 msgstr[1] "%i spelare redo"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) har dött."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> även känd som %s från %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> från %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr "Lag %s"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr "%s-laget - Fjärr"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s begår självmord!"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s bilder/s"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s begår självmord!"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s) har dött."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s ramlade i vattnet."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s ramlade ut från kartan!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+# what about female names?
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s dog för att han var klumpig!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -89,17 +100,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s har vunnit %u energipoäng!"
 msgstr[1] "%s har vunnit %u energipoäng!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s är en psykopat, han har dödat en medlem av %s!"
 
-# what about female names?
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s dog för att han var klumpig!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -123,21 +128,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "%s-laget har vunnit %u raketgevär!"
 msgstr[1] "%s-laget har vunnit %u raketgevär!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "%s-laget har vunnit %u gnu! Spräng alla, cowboy!"
 msgstr[1] "%s-laget har vunnit %u gnuer! Spräng alla, cowboy!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "%s-laget har vunnit %u luftattack!"
 msgstr[1] "%s-laget har vunnit %u luftattacker!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -152,7 +157,7 @@ msgstr[1] ""
 "%s-laget har vunnit %u tryckluftsborr. För inte för mycket oväsen med dem! "
 "Tack, kära granne."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -208,7 +213,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "%s-laget har vunnit %u splitterbomb!"
 msgstr[1] "%s-laget har vunnit %u splitterbomber!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -244,7 +249,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "%s-laget har vunnit %u massbomb!"
 msgstr[1] "%s-laget har vunnit %u massbomber!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -265,14 +270,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "%s-laget har vunnit %u pistol!"
 msgstr[1] "%s-laget har vunnit %u pistoler!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "%s-laget har vunnit %u jetpack! Coolt!"
 msgstr[1] "%s-laget har vunnit %u jetpack! Coolt!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -286,14 +291,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "%s-laget har vunnit %u mina!"
 msgstr[1] "%s-laget har vunnit %u minor!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "%s-laget har vunnit %u fallskärm!"
 msgstr[1] "%s-laget har vunnit %u fallskärmar!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -314,7 +319,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "%s-laget har vunnit %u hagelbössa!"
 msgstr[1] "%s-laget har vunnit %u hagelbössor!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "%s-laget har vunnit %u ninjarep!"
+msgstr[1] "%s-laget har vunnit %u ninjarep!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -359,23 +371,33 @@ msgstr[0] ""
 msgstr[1] ""
 "%s-laget har vunnit %u hoppa över omgångar! Jag vet att du älskar dem."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "%s-laget har vunnit %u tuxkastare! Aldrig sett en flygande pingvin?"
 msgstr[1] "%s-laget har vunnit %u tuxkastare! Aldrig sett en flygande pingvin?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(död)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(systemets språk)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -384,14 +406,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(obegränsat)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Luftattack"
 
@@ -399,10 +425,19 @@ msgstr "Luftattack"
 msgid "Airhammer"
 msgstr "Lufthammare"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "Alla lag"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Spela"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "Och vinnaren är..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -417,7 +452,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Städ"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Upphovsmän:"
 
@@ -441,6 +476,15 @@ msgstr "Slagträ"
 msgid "Bazooka"
 msgstr "Raketgevär"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Teleportering"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Blåslampa"
@@ -453,8 +497,9 @@ msgstr "Studsboll"
 msgid "Bye bye tux..."
 msgstr "Hej då Tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "Kan inte hitta laget %s!"
@@ -464,24 +509,72 @@ msgstr "Kan inte hitta laget %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Kan inte öppna personliga lagkatalogen (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Kan inte öppna lagkatalogen (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Kan inte öppna personliga lagkatalogen (%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "Antal karaktärer"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Fallskärm"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Fallskärm"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "Klientläge"
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "Klumpigast"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Splitterbomb"
@@ -495,7 +588,12 @@ msgstr "Raketgevär"
 msgid "Commit Suicide"
 msgstr "Begå självmord"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "Fel vid inläsning av konfigurationsfil: %s"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "Anslut till spel"
 
@@ -503,11 +601,11 @@ msgstr "Anslut till spel"
 msgid "Connected !"
 msgstr "Ansluten!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Konstruera"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "Kontrolleras av: "
 
@@ -516,7 +614,7 @@ msgstr "Kontrolleras av: "
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, fuzzy, c-format
 msgid "Couldn't open file %s"
 msgstr "* Kunde inte öppna ljud: "
@@ -525,11 +623,32 @@ msgstr "* Kunde inte öppna ljud: "
 msgid "Credits"
 msgstr "Tack till"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Discogranat"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Längd per omgång"
 
@@ -537,31 +656,54 @@ msgstr "Längd per omgång"
 msgid "Dynamite"
 msgstr "Dynamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "SPELET ÄR ÖVER"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "Fel i %s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "Fel vid inläsning av lag :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr ""
 "Fel vid skapandet av katalogen \"%s\": kunde inte lagra konfigurationsfilen."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+"Fel vid skapandet av katalogen \"%s\": kunde inte lagra konfigurationsfilen."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+"Fel vid skapandet av katalogen \"%s\": kunde inte lagra konfigurationsfilen."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -571,31 +713,37 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "Fel: Kunde inte ansluta till %s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "Fel: Kunde inte kontakta indexservern för att vara värd för ett spel"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 "Fel: Kunde inte kontakta indexservern för att söka efter ett internetspel"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "Fel: Kunde inte starta servern"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Fel: kan inte hitta kroppen \"%s\" för laget \"%s\"."
@@ -609,24 +757,34 @@ msgstr ""
 msgid "Football Bomb"
 msgstr "Massbomb"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Helskärm?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Helskärm?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "Spelalternativ:"
+
+#: src/menu/network_connection_menu.cpp:187
 #, fuzzy
 msgid "Game name:"
 msgstr "Spelalternativ:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Släpp loss gnun"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -634,11 +792,15 @@ msgstr ""
 msgid "Grapple"
 msgstr "Ninjarep"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "Granat"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Initiering av spelplan..."
 
@@ -646,16 +808,16 @@ msgstr "Initiering av spelplan..."
 msgid "Gun"
 msgstr "Pistol"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Hemkatalog (miljövariabeln $HOME) kunde inte hittas!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "Lycka till i spelet!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "Ledare"
 
@@ -668,7 +830,11 @@ msgstr "Befälhavare: "
 msgid "Help"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "Stå värd för spel"
 
@@ -710,7 +876,11 @@ msgstr ""
 "Hur man använder den : vänsterklicka på målet\n"
 "ett skott per omgång"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Skynda dig, du är för långsam!!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -718,7 +888,8 @@ msgstr ""
 "Om du har hittat ett fel eller har en önskar nya funktioner, skicka e-post "
 "till oss (på engelska, tack):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Initial energi"
 
@@ -733,7 +904,7 @@ msgstr ""
 "Eld : håll ner mellanslag tills önskad kraft uppnås\n"
 "ett skott per omgång"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Initiering"
 
@@ -741,33 +912,45 @@ msgstr "Initiering"
 msgid "Initialise map"
 msgstr "Initiera karta"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "Initiera ljud"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Initera lag"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "En present!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jetpack"
 
 # URM0-1: search URM0-2 for next line
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 "Gå in i kanalen #wormux på irc.freenode.net för att hitta några motståndare."
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "Språk"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Läs in kartor:"
 
@@ -775,7 +958,7 @@ msgstr "Läs in kartor:"
 msgid "Load teams:"
 msgstr "Läs in lag:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "Lokala lag:"
 
@@ -783,13 +966,13 @@ msgstr "Lokala lag:"
 msgid "LowGrav"
 msgstr "LÃ¥g gravitet"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "Kartor"
@@ -803,11 +986,16 @@ msgstr "Kartan %s, skapad av: "
 msgid "Maps"
 msgstr "Kartor"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Initial energi"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "Max antal spelare:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "Max bilder/s"
 
@@ -815,40 +1003,45 @@ msgstr "Max bilder/s"
 msgid "Mine"
 msgstr "Mina"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "Musik?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "Mest träffsäker"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "Klumpigast"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "Mest utsålda"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "Mest användbar"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "Mest oanvändbar"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "Mest våldsam"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Fallskärm"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Musik?"
 
@@ -856,33 +1049,49 @@ msgstr "Musik?"
 msgid "Network Game"
 msgstr "Nätverksspel"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "Nätverkinitiering"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
 msgstr "Nätverksspel"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "Inget <%s>-element hittades i xml-konfigurationsfilen!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "Ingen!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "Antal karaktärer"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "Antal lag:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Alternativ"
@@ -896,42 +1105,55 @@ msgstr "Alternativ"
 msgid "Parachute"
 msgstr "Fallskärm"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Fallskärmen aktiveras automatiskt."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Spela"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "Spelare"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Spelarens energi?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Spelarens namn?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Spelarens namn?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Släpp loss illern"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "Port:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr ""
 
@@ -939,7 +1161,7 @@ msgstr ""
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Avsluta Wormux"
 
@@ -947,20 +1169,25 @@ msgstr "Avsluta Wormux"
 msgid "Quit battle"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Kör spel"
+
+#: src/menu/map_selection_box.cpp:228
 #, fuzzy
 msgid "Random map"
 msgstr "Läs in kartor:"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "Läser in standardkonfigurationsfil"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Läser in personlig konfigurationsfil"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Upplösning"
 
@@ -968,34 +1195,34 @@ msgstr "Upplösning"
 msgid "Riot Bomb"
 msgstr "Massbomb"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Kör spel"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "Säg: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "Rulla vid kant"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Rulla vid kant"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "Serveradress:"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Server tillgänglig på Internet"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "Serverläge"
 
@@ -1003,10 +1230,35 @@ msgstr "Serverläge"
 msgid "Shotgun"
 msgstr "Hagelbössa"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Alternativ"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Hoppa över omgång"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Prickskyttegevär"
@@ -1015,29 +1267,36 @@ msgstr "Prickskyttegevär"
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "Tyvärr, inget spel väntar just nu på spelare"
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Ljudeffekter?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Ljudfrekvens"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Ljud"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Startar ett nytt spel"
 
@@ -1057,20 +1316,28 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Spruta"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr ""
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "Lag"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "Lag"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Lag"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Teleportering"
@@ -1084,11 +1351,11 @@ msgstr "Splitterbomben har lämnat slagfältet innan den kunde explodera."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Splitterbomben har lämnat slagfältet innan den kunde explodera."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnun har lämnat slagfältet innan den exploderade"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Illern lämnade slagfältet innan den exploderade"
 
@@ -1100,6 +1367,13 @@ msgstr "Den automatiska raketen har lämnat slagfältet..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Bollen har lämnat slagfältet innan den exploderade"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
@@ -1110,7 +1384,7 @@ msgstr ""
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Discogranaten lämnade dansgolvet innan den exploderade"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1118,7 +1392,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr "Granaten lämnade slagfältet innan den exploderade"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "De andra väntar på dig! Vakna :-)"
 
@@ -1136,14 +1410,19 @@ msgstr "Servern nekade anslutningen."
 msgid "The server rejected the connection: wrong password!"
 msgstr "Servern nekade anslutningen."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "Det finns endast %i lag."
 msgstr[1] "Det finns endast %i lag."
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1167,7 +1446,7 @@ msgstr ""
 "Eld : mellanslag\n"
 "ett skott per omgång"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "Verktyg"
 
@@ -1175,12 +1454,12 @@ msgstr "Verktyg"
 msgid "Unable to contact host."
 msgstr "Kunde inte kontakta värden."
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "Kunde inte öppna kartkatalogen (%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, fuzzy, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "Kunde inte öppna kartkatalogen (%s)!"
@@ -1189,83 +1468,108 @@ msgstr "Kunde inte öppna kartkatalogen (%s)!"
 msgid "Unable to use this port!"
 msgstr "Kan inte använda den här porten!"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(obegränsat)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Version"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "Vänta! %i spelare är inte klara än!"
 msgstr[1] "Vänta! %i spelare är inte klara än!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "Väntar på servern, allt du kan göra är att avbryta eller chatta!"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Vapen"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Webbplats: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "Vad sorgligt för %s - han dödades av en enda pistol!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Vindpartiklar?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "Vinnare"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux startar..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux version "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "Du är ensam :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "Du är ensam..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "Du behöver åtminstone en giltig karta!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "Du behöver åtminstone två giltiga lag!"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "Du kommer inte att kunna spela innan du har valt ett lag!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Ditt skott missade!"
 
@@ -1273,7 +1577,7 @@ msgstr "Ditt skott missade!"
 msgid "aka"
 msgstr "även känd som"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1283,15 +1587,20 @@ msgstr ""
 "Bombning : vänsterklicka på målet\n"
 "en bombning per omgång"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr ""
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "klar"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 #, fuzzy
 msgid "error parsing the config file"
 msgstr "Läser in standardkonfigurationsfil"
@@ -1300,16 +1609,16 @@ msgstr "Läser in standardkonfigurationsfil"
 msgid "from"
 msgstr "från"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 #, fuzzy
 msgid "no configuration file!"
 msgstr "Fel vid inläsning av konfigurationsfil: %s"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o Läser in musik"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o Läser in ljudprofil: %s"
@@ -1319,63 +1628,16 @@ msgstr "o Läser in ljudprofil: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o Öppnade ljud med %d Hz, %d bitar"
 
-#~ msgid "Connect !"
-#~ msgstr "Anslut!"
-
-#~ msgid "Connect to an internet game"
-#~ msgstr "Anslut till ett Internetspel"
-
-#~ msgid "Refresh"
-#~ msgstr "Uppdatera"
-
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "Fel vid inläsning av lagets data %s:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Fel vid inläsning av konfigurationsfil: %s"
-
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Fel vid inläsning av standardkonfigurationsfil: %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "Fel vid inläsning av spelläget %s (filen %s):"
-
-#, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "XML-fel vid inläsning av kartan \"%s\" :"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s försöker ansluta med en annan version : klient=%s, jag=%s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "Och vinnaren är..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Skynda dig, du är för långsam!!"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Vill du verkligen avsluta spelet? (J/N)"
-
-#, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Nätverkinitiering"
-
-#~ msgid "(current)"
-#~ msgstr "(aktuellt)"
+#~ msgid " has joined the party"
+#~ msgstr " har gått med i spelet"
 
-#~ msgid ""
-#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
-#~ "blowtorch, submachine gun) and surely many other things don't work either!"
-#~ msgstr ""
-#~ "Vissa vapen är inaktiverade på grund av kända fel (ninjarep, lufthammare, "
-#~ "blåslampa, k-pist) och säkert flera andra saker som inte heller fungerar!"
+#~ msgid " has left the party"
+#~ msgstr " har lämnat spelet"
 
-#~ msgid ""
-#~ "WARNING!! Network is still under developement and therefore a little "
-#~ "experimental."
-#~ msgstr ""
-#~ "VARNING!! Nätverksdelen är fortfarande under utveckling och kan därför "
-#~ "vara halvstabil."
+#~ msgid "%s has lost %u point of energy."
+#~ msgid_plural "%s has lost %u points of energy."
+#~ msgstr[0] "%s har förlorat %u energipoäng!"
+#~ msgstr[1] "%s har förlorat %u energipoäng!"
 
 #~ msgid "%s team has won %u Gnu!"
 #~ msgid_plural "%s team has won %u Gnus!"
@@ -1402,62 +1664,8 @@ msgstr "o Öppnade ljud med %d Hz, %d bitar"
 #~ msgstr[0] "%s-laget har vunnit %u oväntat vapen!"
 #~ msgstr[1] "%s-laget har vunnit %u oväntade vapen!"
 
-#~ msgid ""
-#~ "WARNING! Disconnections are not yet handled. So you have to restart "
-#~ "Wormux after each disconnection!"
-#~ msgstr ""
-#~ "VARNING! Frånkopplingar kan inte hanteras än så du måste starta om Wormux "
-#~ "efter varje frånkoppling!"
-
-#~ msgid "Remote"
-#~ msgstr "Fjärr"
-
-#~ msgid "Ninjarope"
-#~ msgstr "Ninjarep"
-
-#, fuzzy
-#~ msgid "Error while exporting file %s:"
-#~ msgstr "Fel vid export av spelläget %s (filen %s):"
-
-#~ msgid "Error while loading game mode %s from memory:"
-#~ msgstr "Fel vid inläsning av spelläget %s från minnet:"
-
-#~ msgid "Unexpected exception caught..."
-#~ msgstr "Oväntat undantag fångades..."
-
-#~ msgid "C++ exception caught:"
-#~ msgstr "C++-undantag fångades:"
-
-#~ msgid "Failed to initialize network library!"
-#~ msgstr "Misslyckades med att initiera nätverksbiblioteket!"
-
-#~ msgid "Initialisation of TTF library failed: %s"
-#~ msgstr "Initiering av TTF-biblioteket misslyckades: %s"
-
-#~ msgid "Unable to initialize SDL library: %s"
-#~ msgstr "Kunde inte initiera SDL-bibliotek: %s"
-
-#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
-#~ msgstr ""
-#~ "Du behöver åtminstone två lag för att spela: ändra det här i \"Alternativ"
-#~ "\"-menyn!"
-
-#~ msgid "general: "
-#~ msgstr "general: "
-
-#~ msgid " has joined the party"
-#~ msgstr " har gått med i spelet"
-
-#~ msgid " has left the party"
-#~ msgstr " har lämnat spelet"
-
-#~ msgid "Find a random position for characters"
-#~ msgstr "Hitta en slumpad position för karaktärer"
-
-#~ msgid "%s has lost %u point of energy."
-#~ msgid_plural "%s has lost %u points of energy."
-#~ msgstr[0] "%s har förlorat %u energipoäng!"
-#~ msgstr[1] "%s har förlorat %u energipoäng!"
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "%s försöker ansluta med en annan version : klient=%s, jag=%s."
 
 #~ msgid "'%s has won %u Anvil"
 #~ msgid_plural "'%s has won %u Anvil"
@@ -1474,15 +1682,58 @@ msgstr "o Öppnade ljud med %d Hz, %d bitar"
 #~ msgstr[0] "'%s har vunnit %u låg gravitet"
 #~ msgstr[1] "'%s har vunnit %u låg gravitet"
 
+#~ msgid "(current)"
+#~ msgstr "(aktuellt)"
+
 #~ msgid "* Couldn't initialize SDL: "
 #~ msgstr "* Kunde inte initiera SDL: "
 
+#~ msgid "C++ exception caught:"
+#~ msgstr "C++-undantag fångades:"
+
+#~ msgid "Connect !"
+#~ msgstr "Anslut!"
+
+#~ msgid "Connect to an internet game"
+#~ msgstr "Anslut till ett Internetspel"
+
 #~ msgid "Connected to "
 #~ msgstr "Ansluten till "
 
 #~ msgid "Contacting main server..."
 #~ msgstr "Kontaktar huvudserver..."
 
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Vill du verkligen avsluta spelet? (J/N)"
+
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "Fel vid inläsning av lagets data %s:"
+
+#, fuzzy
+#~ msgid "Error while exporting file %s:"
+#~ msgstr "Fel vid export av spelläget %s (filen %s):"
+
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Fel vid inläsning av konfigurationsfil: %s"
+
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Fel vid inläsning av standardkonfigurationsfil: %s"
+
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "Fel vid inläsning av spelläget %s (filen %s):"
+
+#~ msgid "Error while loading game mode %s from memory:"
+#~ msgstr "Fel vid inläsning av spelläget %s från minnet:"
+
+#~ msgid "Failed to initialize network library!"
+#~ msgstr "Misslyckades med att initiera nätverksbiblioteket!"
+
+#~ msgid "Find a random position for characters"
+#~ msgstr "Hitta en slumpad position för karaktärer"
+
+#~ msgid "Initialisation of TTF library failed: %s"
+#~ msgstr "Initiering av TTF-biblioteket misslyckades: %s"
+
 #, fuzzy
 #~ msgid "Invalid index server adress!"
 #~ msgstr "Ogiltig serveradress!"
@@ -1502,22 +1753,71 @@ msgstr "o Öppnade ljud med %d Hz, %d bitar"
 #~ msgid "It doesn't seem to be a valid Wormux server..."
 #~ msgstr "Det verkar inte vara en giltig Wormux-server..."
 
+#, fuzzy
+#~ msgid "Network deinitialization"
+#~ msgstr "Nätverkinitiering"
+
+#~ msgid "Ninjarope"
+#~ msgstr "Ninjarep"
+
 #~ msgid "Only the server can set the map!"
 #~ msgstr "Endast servern kan ställa in kartan!"
 
+#~ msgid "Refresh"
+#~ msgstr "Uppdatera"
+
+#~ msgid "Remote"
+#~ msgstr "Fjärr"
+
 #~ msgid "Server started"
 #~ msgstr "Server startad"
 
+#~ msgid ""
+#~ "Some weapons are disabled, because of known bugs (grapple, airhammer, "
+#~ "blowtorch, submachine gun) and surely many other things don't work either!"
+#~ msgstr ""
+#~ "Vissa vapen är inaktiverade på grund av kända fel (ninjarep, lufthammare, "
+#~ "blåslampa, k-pist) och säkert flera andra saker som inte heller fungerar!"
+
 #, fuzzy
 #~ msgid "Unable to contact an index server!"
 #~ msgstr "Kunde inte kontakta servern!"
 
+#~ msgid "Unable to initialize SDL library: %s"
+#~ msgstr "Kunde inte initiera SDL-bibliotek: %s"
+
 #~ msgid "Unable to join the game..."
 #~ msgstr "Kunde inte gå med i spelet..."
 
+#~ msgid "Unexpected exception caught..."
+#~ msgstr "Oväntat undantag fångades..."
+
 #~ msgid "View stat"
 #~ msgstr "Visa stat"
 
+#~ msgid ""
+#~ "WARNING! Disconnections are not yet handled. So you have to restart "
+#~ "Wormux after each disconnection!"
+#~ msgstr ""
+#~ "VARNING! Frånkopplingar kan inte hanteras än så du måste starta om Wormux "
+#~ "efter varje frånkoppling!"
+
+#~ msgid ""
+#~ "WARNING!! Network is still under developement and therefore a little "
+#~ "experimental."
+#~ msgstr ""
+#~ "VARNING!! Nätverksdelen är fortfarande under utveckling och kan därför "
+#~ "vara halvstabil."
+
+#, fuzzy
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "XML-fel vid inläsning av kartan \"%s\" :"
+
+#~ msgid "You need at least two teams to play: change this in 'Options menu' !"
+#~ msgstr ""
+#~ "Du behöver åtminstone två lag för att spela: ändra det här i \"Alternativ"
+#~ "\"-menyn!"
+
 #~ msgid "[Music] Error : Unable to load music file: %s"
 #~ msgstr "[Musik] Fel : Kunde inte läsa in musikfil: %s"
 
@@ -1538,3 +1838,6 @@ msgstr "o Öppnade ljud med %d Hz, %d bitar"
 
 #~ msgid "[Sound] Error: File %s does not exist"
 #~ msgstr "[Ljud] Fel: Filen %s finns inte"
+
+#~ msgid "general: "
+#~ msgstr "general: "
diff --git a/po/tr.po b/po/tr.po
index 0878ce7..0a9a72d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wormux-tr\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2007-01-20 00:10+0200\n"
 "Last-Translator: Furkan Duman <coderlord at gmail.com>\n"
 "Language-Team: Turkish <yerellestirme at kde.org.tr>\n"
@@ -20,85 +20,90 @@ msgstr ""
 "X-Poedit-Country: TURKEY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! %s haritası bulunamadı :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] ""
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] ""
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s) öldü."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s'den %s <%s> aka %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s'den %s <%s>"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, fuzzy, c-format
 msgid "%s Team"
 msgstr "Takımlar"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr ""
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s intihar etti !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s intihar etti !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s) öldü."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s suya daldı."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s harita dışına çıktı!"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s öldü, çünkü bir beceriksiz!"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
 msgid_plural "%s has won %u points of energy!"
 msgstr[0] ""
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s bir psikopat, %s takımından bir üyeyi öldürdü!"
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s öldü, çünkü bir beceriksiz!"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -121,19 +126,19 @@ msgid "%s team has won %u Cluster bazookas!"
 msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, fuzzy, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, fuzzy, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -143,7 +148,7 @@ msgid_plural ""
 "your neighbours."
 msgstr[0] ""
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, fuzzy, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -188,7 +193,7 @@ msgid "%s team has won %u cluster bomb!"
 msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, fuzzy, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -219,7 +224,7 @@ msgid "%s team has won %u football bomb!"
 msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, fuzzy, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -237,13 +242,13 @@ msgid "%s team has won %u gun!"
 msgid_plural "%s team has won %u guns!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, fuzzy, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -255,13 +260,13 @@ msgid "%s team has won %u mine!"
 msgid_plural "%s team has won %u mines!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, fuzzy, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, fuzzy, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -279,7 +284,13 @@ msgid "%s team has won %u shotgun!"
 msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "%s takımı %u %s kazandı!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, fuzzy, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -316,22 +327,32 @@ msgid "%s team has won %u turn skip! I know you'll love it."
 msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "%s takımı %u %s kazandı!"
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, fuzzy, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "%s takımı %u %s kazandı!"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(ölü)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr ""
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -340,14 +361,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr "(sınırsız)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "Hava Saldırısı"
 
@@ -355,11 +380,20 @@ msgstr "Hava Saldırısı"
 msgid "Airhammer"
 msgstr "Hava çekici"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 #, fuzzy
 msgid "All teams"
 msgstr "Takımları yükle:"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "Oyna"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr ""
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -371,7 +405,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "Örs"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "Yazarlar:"
 
@@ -395,6 +429,15 @@ msgstr "Beyzbol Sopası"
 msgid "Bazooka"
 msgstr "Bazuka"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "Işınlanma"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "Pürmüs"
@@ -407,8 +450,9 @@ msgstr "Zıplayan Top"
 msgid "Bye bye tux..."
 msgstr "Bay bay tux..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "%s takımı bulunamadı!"
@@ -418,24 +462,71 @@ msgstr "%s takımı bulunamadı!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "Takım dizini açılamadı (%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "Takım dizini açılamadı (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "Takım dizini açılamadı (%s)!"
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "Paraşüt"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "Paraşüt"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr ""
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr ""
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "Åžarapnelli Bomba"
@@ -449,7 +540,12 @@ msgstr "Bazuka"
 msgid "Commit Suicide"
 msgstr "Ä°ntihar"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "Ayar dosyası yüklenirken hata: %s"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr ""
 
@@ -457,11 +553,11 @@ msgstr ""
 msgid "Connected !"
 msgstr ""
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "Ä°nÅŸa Et"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr ""
 
@@ -470,7 +566,7 @@ msgstr ""
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, fuzzy, c-format
 msgid "Couldn't open file %s"
 msgstr "SDL kütüphanesi başlatılamadı: %s"
@@ -479,11 +575,32 @@ msgstr "SDL kütüphanesi başlatılamadı: %s"
 msgid "Credits"
 msgstr "Hazırlayanlar"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "Disko El Bombası"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "Tur zamanı"
 
@@ -491,31 +608,52 @@ msgstr "Tur zamanı"
 msgid "Dynamite"
 msgstr "Dinamit"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr ""
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "%s:%lu'da hata"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 #, fuzzy
 msgid "Error loading team :"
 msgstr "%s takımı yüklenirken hata:"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr "\"%s\" dizini oluşturulurken hata: ayar dosyası saklanamadı."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "\"%s\" dizini oluşturulurken hata: ayar dosyası saklanamadı."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "\"%s\" dizini oluşturulurken hata: ayar dosyası saklanamadı."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -525,33 +663,37 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, fuzzy, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "(%s) harita dizini açılamadı!"
 
-#: src/menu/network_connection_menu.cpp:317
+#: src/menu/network_connection_menu.cpp:340
 #, fuzzy
-msgid "Error: Unable to contact index server to host a game"
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "(%s) harita dizini açılamadı!"
 
-#: src/menu/network_connection_menu.cpp:273
+#: src/menu/network_connection_menu.cpp:281
 #, fuzzy
-msgid "Error: Unable to contact index server to search an internet game"
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "(%s) harita dizini açılamadı!"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 #, fuzzy
 msgid "Error: Unable to start server"
 msgstr "(%s) harita dizini açılamadı!"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "Hata: \"%s\" takımı için, \"%s\" teması bulunamadı."
@@ -565,23 +707,32 @@ msgstr ""
 msgid "Football Bomb"
 msgstr "Ses Bombası"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "Tam ekran?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "Tam ekran?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr ""
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnu Mancınığı"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -589,11 +740,15 @@ msgstr ""
 msgid "Grapple"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "El bombası"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "Alan oluÅŸturuluyor..."
 
@@ -601,16 +756,16 @@ msgstr "Alan oluÅŸturuluyor..."
 msgid "Gun"
 msgstr "Tabanca"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr "Ev dizini ($HOME çevre değeri) bulunamadı!"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr ""
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr ""
 
@@ -623,7 +778,11 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr ""
 
@@ -654,7 +813,11 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "Çabuk ol, çok yavaşsın !!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
@@ -662,7 +825,8 @@ msgstr ""
 "Bir hata bulursanız veya bir istekte bulunacaksanız bir e-posta gönderin "
 "(İngilizce olsun lütfen):"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "Başlangıç enerjisi"
 
@@ -674,7 +838,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "Ayarlama"
 
@@ -683,32 +847,44 @@ msgstr "Ayarlama"
 msgid "Initialise map"
 msgstr "Veriler yükleniyor"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 #, fuzzy
 msgid "Initialise sounds"
 msgstr "Nesneler yükleniyor"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "Takımlar yükleniyor"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr ""
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "Jet çantası"
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr ""
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "Haritaları yükle:"
 
@@ -716,7 +892,7 @@ msgstr "Haritaları yükle:"
 msgid "Load teams:"
 msgstr "Takımları yükle:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 #, fuzzy
 msgid "Local teams:"
 msgstr "Takımları yükle:"
@@ -725,13 +901,13 @@ msgstr "Takımları yükle:"
 msgid "LowGrav"
 msgstr "Düşük yer çekimi"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "Haritalar"
@@ -745,11 +921,16 @@ msgstr "%s haritasını tasarlayan:"
 msgid "Maps"
 msgstr "Haritalar"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "Başlangıç enerjisi"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr ""
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "En fazla FPS"
 
@@ -757,40 +938,45 @@ msgstr "En fazla FPS"
 msgid "Mine"
 msgstr "Mayın"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "Müzik?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr ""
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr ""
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr ""
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr ""
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr ""
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr ""
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "Paraşüt"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "Müzik?"
 
@@ -798,34 +984,50 @@ msgstr "Müzik?"
 msgid "Network Game"
 msgstr "AÄŸ Oyunu"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 #, fuzzy
 msgid "Network initialization"
 msgstr "Alan oluÅŸturuluyor..."
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 #, fuzzy
 msgid "New network game at "
 msgstr "AÄŸ Oyunu"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "XML ayar dosyasında <%s> elementi bulunamadı!"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr ""
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr ""
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "Seçenekler"
@@ -839,43 +1041,56 @@ msgstr "Seçenekler"
 msgid "Parachute"
 msgstr "Paraşüt"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "Paraşüt otomatik olarak etkinleştirildi."
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "Oyna"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 #, fuzzy
 msgid "Player"
 msgstr "Oyna"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "Oyuncu enerjisi?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "Oyuncu isimleri?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "Oyuncu isimleri?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "Kokarca Mancınığı"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr ""
 
@@ -883,7 +1098,7 @@ msgstr ""
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "Wormux'dan çıkılıyor"
 
@@ -891,21 +1106,26 @@ msgstr "Wormux'dan çıkılıyor"
 msgid "Quit battle"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "Oyunu çalıştır"
+
+#: src/menu/map_selection_box.cpp:228
 #, fuzzy
 msgid "Random map"
 msgstr "Haritaları yükle:"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 #, fuzzy
 msgid "Reading default config file"
 msgstr "Kişisel ayar dosyası okunuyor"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "Kişisel ayar dosyası okunuyor"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "Çözünürlük"
 
@@ -913,34 +1133,34 @@ msgstr "Çözünürlük"
 msgid "Riot Bomb"
 msgstr "Ses Bombası"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "Oyunu çalıştır"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr ""
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "Sınırlarda kaydır"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "Sınırlarda kaydır"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr ""
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr ""
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr ""
 
@@ -948,10 +1168,35 @@ msgstr ""
 msgid "Shotgun"
 msgstr "Pompalı tüfek"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "Seçenekler"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "Sırayı atla"
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "Suikast Tüfeği"
@@ -960,29 +1205,36 @@ msgstr "Suikast Tüfeği"
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr ""
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "Sesler"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "Ses efektleri?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "Ses frekansı"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "Sesler"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "Yeni oyun başlatılıyor"
 
@@ -1002,20 +1254,28 @@ msgstr "SuperTux"
 msgid "Syringe"
 msgstr "Şırınga"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr ""
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "Takımlar"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "Takımlar"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "Takımlar"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "Işınlanma"
@@ -1029,11 +1289,11 @@ msgstr "Şarapnel Bombası patlamadan, savaş alanını terketti."
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "Şarapnel Bombası patlamadan, savaş alanını terketti."
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnu, patlamadan savaş alanını terketti"
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "Kokarca, patlamadan savaş alanını terketti"
 
@@ -1045,6 +1305,13 @@ msgstr "Otomatik roket savaş alanını terketti..."
 msgid "The ball left the battlefield before exploding"
 msgstr "Top, patlamadan savaş alanını terketti"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
@@ -1053,7 +1320,7 @@ msgstr ""
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "Disko el bombası, patlamadan dans pistini terketti"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1061,7 +1328,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr "El bombası, patlamadan savaş alanını terketti"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr ""
 
@@ -1078,13 +1345,18 @@ msgstr ""
 msgid "The server rejected the connection: wrong password!"
 msgstr ""
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] ""
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1100,7 +1372,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr ""
 
@@ -1109,12 +1381,12 @@ msgstr ""
 msgid "Unable to contact host."
 msgstr "(%s) harita dizini açılamadı!"
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "(%s) harita dizini açılamadı!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, fuzzy, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "(%s) harita dizini açılamadı!"
@@ -1123,83 +1395,108 @@ msgstr "(%s) harita dizini açılamadı!"
 msgid "Unable to use this port!"
 msgstr ""
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(sınırsız)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "Sürüm"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] ""
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "Silahlar"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "Web sitesi: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr "%s ne ayıp - basit bir silah tarafından öldürüldü!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "Rüzgar parçacıkları?"
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 #, fuzzy
 msgid "Winner"
 msgstr "Mayın"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "Wormux çalıştırılıyor..."
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr "Wormux sürüm "
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr ""
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr ""
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "En az bir geçerli haritaya ihtiyacınız var !"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "En az iki geçerli takıma ihtiyacınız var !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr ""
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "Iskaladın!"
 
@@ -1208,22 +1505,27 @@ msgstr "Iskaladın!"
 msgid "aka"
 msgstr "Bazuka"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
 "a bombing per turn"
 msgstr ""
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr ""
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "tamam"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 #, fuzzy
 msgid "error parsing the config file"
 msgstr "Kişisel ayar dosyası okunuyor"
@@ -1232,16 +1534,16 @@ msgstr "Kişisel ayar dosyası okunuyor"
 msgid "from"
 msgstr ""
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 #, fuzzy
 msgid "no configuration file!"
 msgstr "Ayar dosyası yüklenirken hata: %s"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr ""
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, fuzzy, c-format
 msgid "o Loading sound profile: %s"
 msgstr "Ayar dosyası yüklenirken hata: %s"
@@ -1251,35 +1553,13 @@ msgstr "Ayar dosyası yüklenirken hata: %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr ""
 
-#~ msgid "Error loading team's data %s:"
-#~ msgstr "%s takımının verileri yüklenirken hata:"
-
-#~ msgid "Error while loading configuration file: %s"
-#~ msgstr "Ayar dosyası yüklenirken hata: %s"
-
-#, fuzzy
-#~ msgid "Error while loading default configuration file: %s"
-#~ msgstr "Ayar dosyası yüklenirken hata: %s"
-
-#~ msgid "Error while loading game mode %s (file %s):"
-#~ msgstr "%s oyun modu yüklenirken hata (dosya %s):"
-
 #, fuzzy
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "'%s' haritası yüklenirken XML hatası :"
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "Çabuk ol, çok yavaşsın !!"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "Gerçekten çıkmak istiyor musunuz? (Y/N)"
+#~ msgid " has joined the party"
+#~ msgstr "%s harita dışına çıktı!"
 
 #, fuzzy
-#~ msgid "Network deinitialization"
-#~ msgstr "Alan oluÅŸturuluyor..."
-
-#~ msgid "(current)"
-#~ msgstr "(ÅŸimdiki)"
+#~ msgid " has left the party"
+#~ msgstr "%s harita dışına çıktı!"
 
 #, fuzzy
 #~ msgid "%s team has won %u Gnu!"
@@ -1306,33 +1586,66 @@ msgstr ""
 #~ msgid_plural "%s team has won %u unexpected weapons!"
 #~ msgstr[0] "%s takımı %u %s kazandı!"
 
-#~ msgid "Ninjarope"
-#~ msgstr "Ninja ipi"
+#~ msgid "(current)"
+#~ msgstr "(ÅŸimdiki)"
+
+#~ msgid "C++ exception caught:"
+#~ msgstr "C++ istisnası oluştu:"
+
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "Gerçekten çıkmak istiyor musunuz? (Y/N)"
+
+#~ msgid "Error loading team's data %s:"
+#~ msgstr "%s takımının verileri yüklenirken hata:"
 
 #, fuzzy
 #~ msgid "Error while exporting file %s:"
 #~ msgstr "%s oyun modu yüklenirken hata (dosya %s):"
 
+#~ msgid "Error while loading configuration file: %s"
+#~ msgstr "Ayar dosyası yüklenirken hata: %s"
+
 #, fuzzy
-#~ msgid "Error while loading game mode %s from memory:"
-#~ msgstr "%s oyun modu yüklenirken hata (dosya %s):"
+#~ msgid "Error while loading default configuration file: %s"
+#~ msgstr "Ayar dosyası yüklenirken hata: %s"
 
-#~ msgid "Unexpected exception caught..."
-#~ msgstr "Beklenmeyen istisna oluÅŸtu..."
+#~ msgid "Error while loading game mode %s (file %s):"
+#~ msgstr "%s oyun modu yüklenirken hata (dosya %s):"
 
-#~ msgid "C++ exception caught:"
-#~ msgstr "C++ istisnası oluştu:"
+#, fuzzy
+#~ msgid "Error while loading game mode %s from memory:"
+#~ msgstr "%s oyun modu yüklenirken hata (dosya %s):"
 
 #, fuzzy
 #~ msgid "Failed to initialize network library!"
 #~ msgstr "SDL kütüphanesi başlatılamadı: %s"
 
+#~ msgid "Find a random position for characters"
+#~ msgstr "Karakterler için rastgele yer bul"
+
 #~ msgid "Initialisation of TTF library failed: %s"
 #~ msgstr "TTF kütüphanesi başlatılmasında hata: %s"
 
+#~ msgid "Is it a gift?"
+#~ msgstr "Bu bir hediye mi?"
+
+#, fuzzy
+#~ msgid "Network deinitialization"
+#~ msgstr "Alan oluÅŸturuluyor..."
+
+#~ msgid "Ninjarope"
+#~ msgstr "Ninja ipi"
+
 #~ msgid "Unable to initialize SDL library: %s"
 #~ msgstr "SDL kütüphanesi başlatılamadı: %s"
 
+#~ msgid "Unexpected exception caught..."
+#~ msgstr "Beklenmeyen istisna oluÅŸtu..."
+
+#, fuzzy
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "'%s' haritası yüklenirken XML hatası :"
+
 #~ msgid "You need at least two teams to play: change this in 'Options menu' !"
 #~ msgstr ""
 #~ "Oynamak için en az iki takıma ihtiyacınız var: bunu 'Seçenekler "
@@ -1340,17 +1653,3 @@ msgstr ""
 
 #~ msgid "general: "
 #~ msgstr "genel: "
-
-#, fuzzy
-#~ msgid " has joined the party"
-#~ msgstr "%s harita dışına çıktı!"
-
-#, fuzzy
-#~ msgid " has left the party"
-#~ msgstr "%s harita dışına çıktı!"
-
-#~ msgid "Find a random position for characters"
-#~ msgstr "Karakterler için rastgele yer bul"
-
-#~ msgid "Is it a gift?"
-#~ msgstr "Bu bir hediye mi?"
diff --git a/po/wormux.pot b/po/wormux.pot
index 0fa6144..577b2bb 100644
--- a/po/wormux.pot
+++ b/po/wormux.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,69 +17,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr ""
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr ""
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr ""
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr ""
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr ""
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr ""
 
-#: src/game/game.cpp:660
+#: src/graphic/fps.cpp:102
 #, c-format
-msgid "%s commits suicide !"
+msgid "%s fps"
 msgstr ""
 
-#: src/graphic/fps.cpp:102
+#: src/game/game.cpp:718
 #, c-format
-msgid "%s fps"
+msgid "%s from %s team commited suicide!"
+msgstr ""
+
+#: src/game/game.cpp:751
+#, c-format
+msgid "%s from %s team has died."
 msgstr ""
 
-#: src/game/game.cpp:653
+#: src/game/game.cpp:709
 #, c-format
-msgid "%s has fallen in water."
+msgid "%s from %s team has fallen into the water!"
 msgstr ""
 
-#: src/game/game.cpp:664
+#: src/game/game.cpp:703
 #, c-format
-msgid "%s has fallen off the map!"
+msgid "%s from %s team has fallen off the map!"
+msgstr ""
+
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+#: src/game/game.cpp:731
+#, c-format
+msgid "%s from %s team is dead because he is clumsy!"
 msgstr ""
 
 #: src/object/medkit.cpp:68
@@ -89,16 +99,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr ""
 
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr ""
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -122,21 +127,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -147,7 +152,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -199,7 +204,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -235,7 +240,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -256,14 +261,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -277,14 +282,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -305,7 +310,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -348,23 +360,33 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr ""
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr ""
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr ""
 
@@ -373,14 +395,18 @@ msgstr ""
 msgid "(unlimited)"
 msgstr ""
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
 "check whether an update is available for your OS!"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr ""
 
@@ -388,10 +414,18 @@ msgstr ""
 msgid "Airhammer"
 msgstr ""
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:58
+msgid "Always"
+msgstr ""
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr ""
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -403,7 +437,7 @@ msgstr ""
 msgid "Anvil"
 msgstr ""
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr ""
 
@@ -427,6 +461,14 @@ msgstr ""
 msgid "Bazooka"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:59
+msgid "Before action"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr ""
@@ -439,8 +481,9 @@ msgstr ""
 msgid "Bye bye tux..."
 msgstr ""
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr ""
@@ -450,24 +493,69 @@ msgstr ""
 msgid "Cannot open personal teams directory (%s)!"
 msgstr ""
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr ""
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr ""
+
+#: src/menu/help_menu.cpp:92
+msgid "Center camera to character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+msgid "Character"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:62
+msgid "Character switching"
+msgstr ""
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr ""
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr ""
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr ""
@@ -480,7 +568,11 @@ msgstr ""
 msgid "Commit Suicide"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+msgid "Configuration menu"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr ""
 
@@ -488,11 +580,11 @@ msgstr ""
 msgid "Connected !"
 msgstr ""
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr ""
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr ""
 
@@ -501,7 +593,7 @@ msgstr ""
 msgid "Couldn't fetch last version from %s"
 msgstr ""
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr ""
@@ -510,11 +602,32 @@ msgstr ""
 msgid "Credits"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr ""
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr ""
 
@@ -522,30 +635,51 @@ msgstr ""
 msgid "Dynamite"
 msgstr ""
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr ""
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr ""
 
-#: src/tool/error.cpp:82
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
+msgstr ""
+
+#: src/include/action_handler.cpp:210
 #, c-format
-msgid "Error in %s:%lu"
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
 msgstr ""
 
-#: src/team/teams_list.cpp:124
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr ""
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr ""
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr ""
+
+#: src/team/custom_team.cpp:95
+#, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr ""
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -553,30 +687,34 @@ msgid ""
 msgstr ""
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+msgid "Error: Unable to contact the index server to host a game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
 msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr ""
@@ -589,23 +727,31 @@ msgstr ""
 msgid "Football Bomb"
 msgstr ""
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+msgid "Fullscreen / window"
+msgstr ""
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr ""
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+msgid "Game mode"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr ""
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr ""
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -613,11 +759,15 @@ msgstr ""
 msgid "Grapple"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr ""
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr ""
 
@@ -625,16 +775,16 @@ msgstr ""
 msgid "Gun"
 msgstr ""
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr ""
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr ""
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr ""
 
@@ -647,7 +797,11 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr ""
 
@@ -678,13 +832,18 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr ""
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
 msgstr ""
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr ""
 
@@ -696,7 +855,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr ""
 
@@ -704,31 +863,43 @@ msgstr ""
 msgid "Initialise map"
 msgstr ""
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr ""
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr ""
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr ""
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr ""
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr ""
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr ""
 
@@ -736,7 +907,7 @@ msgstr ""
 msgid "Load teams:"
 msgstr ""
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr ""
 
@@ -744,13 +915,13 @@ msgstr ""
 msgid "LowGrav"
 msgstr ""
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 msgid "Map"
 msgstr ""
 
@@ -763,11 +934,15 @@ msgstr ""
 msgid "Maps"
 msgstr ""
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+msgid "Max energy"
+msgstr ""
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr ""
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr ""
 
@@ -775,39 +950,43 @@ msgstr ""
 msgid "Mine"
 msgstr ""
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 msgid "Misc"
 msgstr ""
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr ""
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr ""
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr ""
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr ""
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr ""
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr ""
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+msgid "Move character"
+msgstr ""
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr ""
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr ""
 
@@ -815,32 +994,48 @@ msgstr ""
 msgid "Network Game"
 msgstr ""
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr ""
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr ""
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr ""
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr ""
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr ""
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr ""
@@ -853,42 +1048,54 @@ msgstr ""
 msgid "Parachute"
 msgstr ""
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr ""
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr ""
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr ""
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+msgid "Player name"
+msgstr ""
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr ""
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 msgid "Public battles"
 msgstr ""
 
@@ -896,7 +1103,7 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr ""
 
@@ -904,19 +1111,23 @@ msgstr ""
 msgid "Quit battle"
 msgstr ""
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+msgid "Quit game"
+msgstr ""
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr ""
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr ""
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr ""
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr ""
 
@@ -924,33 +1135,33 @@ msgstr ""
 msgid "Riot Bomb"
 msgstr ""
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr ""
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr ""
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 msgid "Scroll border size"
 msgstr ""
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr ""
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr ""
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr ""
 
@@ -958,10 +1169,34 @@ msgstr ""
 msgid "Shotgun"
 msgstr ""
 
+#: src/menu/help_menu.cpp:84
+msgid "Show weapons menu"
+msgstr ""
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr ""
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr ""
@@ -970,28 +1205,35 @@ msgstr ""
 msgid "Someone put a booby trap into the crate!"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr ""
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 msgid "Sound"
 msgstr ""
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr ""
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr ""
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr ""
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr ""
 
@@ -1011,18 +1253,26 @@ msgstr ""
 msgid "Syringe"
 msgstr ""
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+msgid "Talk in network battle"
+msgstr ""
+
+#: src/menu/results_menu.cpp:427
 msgid "Team graphs"
 msgstr ""
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 msgid "Team stats"
 msgstr ""
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr ""
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr ""
@@ -1035,11 +1285,11 @@ msgstr ""
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr ""
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr ""
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr ""
 
@@ -1051,6 +1301,13 @@ msgstr ""
 msgid "The ball left the battlefield before exploding"
 msgstr ""
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr ""
@@ -1059,7 +1316,7 @@ msgstr ""
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr ""
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr ""
 
@@ -1067,7 +1324,7 @@ msgstr ""
 msgid "The grenade left the battlefield before exploding"
 msgstr ""
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr ""
 
@@ -1084,14 +1341,19 @@ msgstr ""
 msgid "The server rejected the connection: wrong password!"
 msgstr ""
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1107,7 +1369,7 @@ msgid ""
 "an ammo per turn"
 msgstr ""
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr ""
 
@@ -1115,12 +1377,12 @@ msgstr ""
 msgid "Unable to contact host."
 msgstr ""
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr ""
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr ""
@@ -1129,83 +1391,107 @@ msgstr ""
 msgid "Unable to use this port!"
 msgstr ""
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+msgid "Unlimited"
+msgstr ""
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr ""
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr ""
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr ""
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr ""
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr ""
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr ""
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr ""
 
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr ""
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr ""
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr ""
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr ""
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr ""
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr ""
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr ""
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr ""
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr ""
 
@@ -1213,22 +1499,27 @@ msgstr ""
 msgid "aka"
 msgstr ""
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
 "a bombing per turn"
 msgstr ""
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr ""
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr ""
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr ""
 
@@ -1236,15 +1527,15 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr ""
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr ""
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 39f2f09..05d3206 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh-CN\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2008-04-25 13:48+1000\n"
 "Last-Translator: luojie-dune <luojie-dune at operamail.com>\n"
 "Language-Team: Chinese (China) <luojie-dune at operamail.com>\n"
@@ -17,71 +17,82 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! 地图 %s未找到 :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i 玩家已连接"
 msgstr[1] "%i 玩家均已连接"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i 玩家准备好了"
 msgstr[1] "%i 玩家都准备好了"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s)死掉了  ."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> aka %s 从 %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> 从 %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr " %s 队伍"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr " %s 队伍- 遥控"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s 自杀啦 !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s 帧fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s 自杀啦 !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s)死掉了  ."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s 入水---深呼吸."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s 飞出地图边缘---"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+# what about female names?
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s 的死因是: 太笨 !"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -89,17 +100,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s 赢得 %u 点耐久!"
 msgstr[1] "%s 赢得 %u 点耐久!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s 是个疯子, 他干掉了 %s 的一个!"
 
-# what about female names?
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s 的死因是: 太笨 !"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -123,21 +128,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "%s 队得到 %u 火箭炮!"
 msgstr[1] "%s 队得到 %u 火箭炮!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "%s 队得到 %u Gnu-北美野牛! 吹起来, 牛仔!"
 msgstr[1] "%s 队得到 %u Gnu-北美野牛! 吹起来, 牛仔!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "%s 队得到 %u 空袭!"
 msgstr[1] "%s 队得到 %u 空袭!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -148,7 +153,7 @@ msgid_plural ""
 msgstr[0] "%s 队得到 %u 气锤! (邻居们:不要太响了,谢谢。)."
 msgstr[1] "%s 队得到 %u 气锤! (邻居们:不要太响了,谢谢。)."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -200,7 +205,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "%s 队得到 %u 集束炸弹!"
 msgstr[1] "%s 队得到 %u 集束炸弹!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -236,7 +241,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "%s 队得到 %u 足球炸弹!"
 msgstr[1] "%s 队得到 %u 足球炸弹!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -257,14 +262,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "%s 队得到 %u 枪了!"
 msgstr[1] "%s 队得到 %u 枪了!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "%s 队得到 %u 喷射包了! 帅啊!"
 msgstr[1] "%s 队得到 %u 喷射包了! 帅啊!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -278,14 +283,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "%s 队得到 %u 地雷!"
 msgstr[1] "%s 队得到 %u 地雷!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "%s 队得到 %u 降落伞!"
 msgstr[1] "%s 队得到 %u 降落伞!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -306,7 +311,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "%s 队得到 %u 猎枪!"
 msgstr[1] "%s 队得到 %u 猎枪!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "%s队得到 %u 飞索了!"
+msgstr[1] "%s队得到 %u 飞索了!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -349,23 +361,33 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "%s 队得到 %u 暂停! 我知道你喜欢."
 msgstr[1] "%s 队得到 %u 暂停! 我知道你喜欢."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "%s 队得到 %u 企鹅发射器! 没见过满天飞的企鹅吗?"
 msgstr[1] "%s 队得到 %u 企鹅发射器! 没见过满天飞的企鹅吗?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(死掉的)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(系统语言)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(未知时间)"
 
@@ -374,7 +396,7 @@ msgstr "(未知时间)"
 msgid "(unlimited)"
 msgstr "(无限的)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -382,7 +404,11 @@ msgid ""
 msgstr ""
 "新版本 %s 可用,您的版本是 %s。也许您想查下,是否有针对您的操作系统的升级。"
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "空袭"
 
@@ -390,10 +416,19 @@ msgstr "空袭"
 msgid "Airhammer"
 msgstr "飞锤"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "全部的队伍"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "要玩了哦"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "生者是..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -408,7 +443,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "铁砧"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "作者:"
 
@@ -432,6 +467,15 @@ msgstr "棒球欧"
 msgid "Bazooka"
 msgstr "火箭炮"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "传送"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "吹管"
@@ -444,8 +488,9 @@ msgstr "弹力球"
 msgid "Bye bye tux..."
 msgstr "Bye bye 企鹅..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "没找到队伍 %s!"
@@ -455,24 +500,72 @@ msgstr "没找到队伍 %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "打不开个人团队目录(%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "打不开团队目录 (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "打不开个人团队目录(%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "角色数目"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "降落伞"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "降落伞"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "网上检查升级?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "在地图中随机选择"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "客户端模式 "
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "最笨手笨脚的"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "集束炸弹"
@@ -485,7 +578,12 @@ msgstr "开花弹"
 msgid "Commit Suicide"
 msgstr "自杀"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "没有配置文件!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "连上游戏"
 
@@ -493,11 +591,11 @@ msgstr "连上游戏"
 msgid "Connected !"
 msgstr "已连接!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "建筑工具"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "控制者: "
 
@@ -506,7 +604,7 @@ msgstr "控制者: "
 msgid "Couldn't fetch last version from %s"
 msgstr "不能从 %s获取最新版本"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "无法打开文件%s"
@@ -515,11 +613,32 @@ msgstr "无法打开文件%s"
 msgid "Credits"
 msgstr "鸣谢"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "跃动手雷"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "回合时间长度"
 
@@ -527,30 +646,51 @@ msgstr "回合时间长度"
 msgid "Dynamite"
 msgstr "炸药"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "游戏结束"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "音效大小"
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "错误出现%s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "读取队伍出错 :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr "建立目录失败 \"%s\": 不能储存设置文件."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "建立目录失败 \"%s\": 不能储存设置文件."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "建立目录失败 \"%s\": 不能储存设置文件."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -560,30 +700,36 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "错误: 连不到%s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "错误: 无法联系索引服务器建立游戏"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "错误: 无法联系索引服务器寻找游戏"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "错误: 无法开始服务器"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
-msgstr "错误: 无法从互联网上获取服务器.请检查防火墙."
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
+msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "错误: 找不到 body\"%s\" 队伍 \"%s\"."
@@ -596,23 +742,33 @@ msgstr "喷火器"
 msgid "Football Bomb"
 msgstr "足球炸弹"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "全屏?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "全屏?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "游戏名:"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "游戏名:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnu-北美野牛发射器"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -620,11 +776,15 @@ msgstr ""
 msgid "Grapple"
 msgstr "飞索"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "手雷"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "地面构建中..."
 
@@ -632,16 +792,16 @@ msgstr "地面构建中..."
 msgid "Gun"
 msgstr "枪"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr " 找不到家目录 (environment variable $HOME) !"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "来吧!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "指挥官"
 
@@ -655,7 +815,11 @@ msgstr "指挥官: "
 msgid "Help"
 msgstr "帮助"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "建立游戏"
 
@@ -697,13 +861,18 @@ msgstr ""
 "如何使用: 鼠标左键点击目标\n"
 "每回合一个弹夹"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "快点,伙计你也太慢了!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
 msgstr "假如你发现Bug或想要什么游戏特性, 请发英文邮件给我们"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "初始耐久"
 
@@ -718,7 +887,7 @@ msgstr ""
 "开火: 按住空格键积攒到需要的力量\n"
 "每回合一个弹夹"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "初始化"
 
@@ -726,32 +895,44 @@ msgstr "初始化"
 msgid "Initialise map"
 msgstr "地图初始化"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "声音初始化"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "队伍初始化"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "就是现在!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "喷射包"
 
 # URM0-1: search URM0-2 for next line
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "加入#wormux IRC irc.freenode.net 找对手"
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "语言"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "读取地图:"
 
@@ -759,7 +940,7 @@ msgstr "读取地图:"
 msgid "Load teams:"
 msgstr "读取队伍:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "本地队伍:"
 
@@ -767,13 +948,13 @@ msgstr "本地队伍:"
 msgid "LowGrav"
 msgstr "漫步-低重力"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "地图"
@@ -787,11 +968,16 @@ msgstr "地图 %s, 灵感 : "
 msgid "Maps"
 msgstr "地图"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "初始耐久"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "玩家满员:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "最大 FPS"
 
@@ -799,40 +985,45 @@ msgstr "最大 FPS"
 msgid "Mine"
 msgstr "地雷"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "音乐?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "最准"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "最笨手笨脚的"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "最卖力的"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "最有价值的"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "最失败的"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "最暴力的"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "降落伞"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "音乐音量:"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "音乐?"
 
@@ -840,32 +1031,48 @@ msgstr "音乐?"
 msgid "Network Game"
 msgstr "网络游戏"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "网络初始化"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "网上游戏"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "没找到 <%s>重点 xml配置文件 !"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "空房间!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "角色数目"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "队伍数量:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "选项 "
@@ -878,42 +1085,55 @@ msgstr "选项菜单"
 msgid "Parachute"
 msgstr "降落伞"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "自动使用"
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "要玩了哦"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "玩家"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "耐久度?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "请问尊姓大名?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "请问尊姓大名?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "臭鼬发射器"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "端口:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 #, fuzzy
 msgid "Public battles"
 msgstr "推出战斗"
@@ -922,7 +1142,7 @@ msgstr "推出战斗"
 msgid "Quit"
 msgstr "退出"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "退出"
 
@@ -930,19 +1150,24 @@ msgstr "退出"
 msgid "Quit battle"
 msgstr "推出战斗"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "运行游戏"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "随机读取地图"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "正读取默认设置文件"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "正读取个人设置文件"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "分辨率"
 
@@ -950,34 +1175,34 @@ msgstr "分辨率"
 msgid "Riot Bomb"
 msgstr "爆炸弹"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "运行游戏"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "说: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "滚动边界"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "滚动边界"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "服务器地址"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Internet可用服务器"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "服务器设置"
 
@@ -985,10 +1210,35 @@ msgstr "服务器设置"
 msgid "Shotgun"
 msgstr "猎枪"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "选项菜单"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "这次我不动."
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "狙击步枪"
@@ -997,29 +1247,36 @@ msgstr "狙击步枪"
 msgid "Someone put a booby trap into the crate!"
 msgstr "有人在箱子里布置了炸弹作礼物!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "抱歉噢. 没人等你."
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "声音"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "音效?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "声频"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "声音"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "重新来游戏"
 
@@ -1039,20 +1296,29 @@ msgstr "SuperTux-超级企鹅"
 msgid "Syringe"
 msgstr "注射器"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+#, fuzzy
+msgid "Talk in network battle"
+msgstr "返回战斗"
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "队伍"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "队伍"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "队伍"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "传送"
@@ -1065,11 +1331,11 @@ msgstr "集束炸弹离开战场---"
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "集束炸弹离开战场---"
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnu-野牛离开战场..."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "臭鼬离开了战场..."
 
@@ -1081,6 +1347,13 @@ msgstr "制导火箭离开战场..."
 msgid "The ball left the battlefield before exploding"
 msgstr "球膨胀前离开战场"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "连接超时. 请检查防火墙!"
@@ -1089,7 +1362,7 @@ msgstr "连接超时. 请检查防火墙!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "disco榴弹离开舞池前发生爆炸"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "您断线了."
 
@@ -1097,7 +1370,7 @@ msgstr "您断线了."
 msgid "The grenade left the battlefield before exploding"
 msgstr "手榴弹离开战场前发生爆炸"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "别人在等你! 快醒吧:-)"
 
@@ -1114,14 +1387,19 @@ msgstr "服务器拒绝"
 msgid "The server rejected the connection: wrong password!"
 msgstr "服务器拒绝: 密码错了."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "只有%i队"
 msgstr[1] "只有%i队"
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1145,7 +1423,7 @@ msgstr ""
 "开火: 空格键\n"
 "每回合一个弹夹"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "工具"
 
@@ -1153,12 +1431,12 @@ msgstr "工具"
 msgid "Unable to contact host."
 msgstr "连不上主机"
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "打不开地图目录(%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "无法打开个人地图目录 (%s)!"
@@ -1167,84 +1445,109 @@ msgstr "无法打开个人地图目录 (%s)!"
 msgid "Unable to use this port!"
 msgstr "端口不可用"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(无限的)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "未命名"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "版本"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "版本改变失败原因: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "请等待! %i没准备好!"
 msgstr[1] "请等待! %i没准备好!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "等着接受服务吧, 现在先聊天 !"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "武器"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "网站Website: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr " %s 惨死在小枪之下...不能瞑目!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "风来了?"
 
 #
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "胜者"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "准备中, Wormux!!!"
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr " Wormux 版本"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "你是孤单的 :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "你是孤单的..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "你需要可用的地图!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "至少有2组才能开始 !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "没有队伍,就不会有战斗!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "你打偏了!"
 
@@ -1253,7 +1556,7 @@ msgstr "你打偏了!"
 msgid "aka"
 msgstr "aka"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1263,15 +1566,20 @@ msgstr ""
 "爆炸 : 左键点击目标\n"
 "每回合一次"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "无法读取设置"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "成"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "粘贴配置文件出错"
 
@@ -1280,15 +1588,15 @@ msgstr "粘贴配置文件出错"
 msgid "from"
 msgstr "从"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "没有配置文件!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o 读取音乐"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o读取音乐文件 : %s"
@@ -1298,14 +1606,22 @@ msgstr "o读取音乐文件 : %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o音乐 %d Hz %d bit"
 
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr "错误: 无法从互联网上获取服务器.请检查防火墙."
+
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "%s 试着连接一个不同版本 : client=%s, me=%s."
+
 #~ msgid "Connect !"
 #~ msgstr "连接!"
 
 #~ msgid "Connect to an internet game"
 #~ msgstr "连上网去玩"
 
-#~ msgid "Refresh"
-#~ msgstr "刷新"
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "您真的想退出吗? (\"Y\"是 或 \"N\"不)"
 
 #~ msgid "Error loading team's data %s:"
 #~ msgstr "读取队伍数据 %s 时出错 :"
@@ -1319,20 +1635,11 @@ msgstr "o音乐 %d Hz %d bit"
 #~ msgid "Error while loading game mode %s (file %s):"
 #~ msgstr "读取游戏模式时出错%s (file %s):"
 
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "读取地图 '%s' 时出现XML错误"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s 试着连接一个不同版本 : client=%s, me=%s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "生者是..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "快点,伙计你也太慢了!"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "您真的想退出吗? (\"Y\"是 或 \"N\"不)"
-
 #~ msgid "Host a game (Windows clients only)"
 #~ msgstr "建立主机(仅windows客户端)"
+
+#~ msgid "Refresh"
+#~ msgstr "刷新"
+
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "读取地图 '%s' 时出现XML错误"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3946de1..cf25888 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh-CN\n"
 "Report-Msgid-Bugs-To: wormux-dev at gna.org\n"
-"POT-Creation-Date: 2008-05-16 01:01+0200\n"
+"POT-Creation-Date: 2008-09-16 13:53+0200\n"
 "PO-Revision-Date: 2008-04-25 13:48+1000\n"
 "Last-Translator: luojie-dune <luojie-dune at operamail.com>\n"
 "Language-Team: Chinese (China) <luojie-dune at operamail.com>\n"
@@ -17,71 +17,82 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/map/maps_list.cpp:320
+#: src/map/maps_list.cpp:326
 #, c-format
 msgid "! Map %s not found :-("
 msgstr "! 地圖 %s未找到 :-("
 
-#: src/menu/network_menu.cpp:121 src/menu/network_menu.cpp:308
+#: src/menu/network_menu.cpp:123 src/menu/network_menu.cpp:313
 #, c-format
 msgid "%i player connected"
 msgid_plural "%i players connected"
 msgstr[0] "%i 玩家已連線"
 msgstr[1] "%i 玩家均已連線"
 
-#: src/menu/network_menu.cpp:125 src/menu/network_menu.cpp:316
+#: src/menu/network_menu.cpp:127 src/menu/network_menu.cpp:321
 #, c-format
 msgid "%i player ready"
 msgid_plural "%i players ready"
 msgstr[0] "%i 玩家准備好了"
 msgstr[1] "%i 玩家都准備好了"
 
-#: src/game/game.cpp:681
-#, c-format
-msgid "%s (%s) has died."
-msgstr "%s (%s)死掉了  ."
-
-#: src/map/maps_list.cpp:108
+#: src/map/maps_list.cpp:117
 #, c-format
 msgid "%s <%s> aka %s from %s"
 msgstr "%s <%s> aka %s 從 %s"
 
-#: src/map/maps_list.cpp:115
+#: src/map/maps_list.cpp:124
 #, c-format
 msgid "%s <%s> from %s"
 msgstr "%s <%s> 從 %s"
 
-#: src/menu/team_box.cpp:79
+#: src/menu/team_box.cpp:217
 #, c-format
 msgid "%s Team"
 msgstr " %s 隊伍"
 
 #. translators: this is the team listing and will expand in a context like "OOo team - Remote"
-#: src/menu/team_box.cpp:77
+#: src/menu/team_box.cpp:214
 #, c-format
 msgid "%s Team - Remote"
 msgstr " %s 隊伍- 遙控"
 
-#: src/game/game.cpp:660
-#, c-format
-msgid "%s commits suicide !"
-msgstr "%s 自殺啦 !"
-
 #: src/graphic/fps.cpp:102
 #, c-format
 msgid "%s fps"
 msgstr "%s å¹€fps"
 
-#: src/game/game.cpp:653
-#, c-format
-msgid "%s has fallen in water."
+#: src/game/game.cpp:718
+#, fuzzy, c-format
+msgid "%s from %s team commited suicide!"
+msgstr "%s 自殺啦 !"
+
+#: src/game/game.cpp:751
+#, fuzzy, c-format
+msgid "%s from %s team has died."
+msgstr "%s (%s)死掉了  ."
+
+#: src/game/game.cpp:709
+#, fuzzy, c-format
+msgid "%s from %s team has fallen into the water!"
 msgstr "%s 入水---深呼吸."
 
-#: src/game/game.cpp:664
-#, c-format
-msgid "%s has fallen off the map!"
+#: src/game/game.cpp:703
+#, fuzzy, c-format
+msgid "%s from %s team has fallen off the map!"
 msgstr "%s 飛出地圖邊緣---"
 
+#: src/game/game.cpp:724
+#, c-format
+msgid "%s from %s team has hit the ground too hard!"
+msgstr ""
+
+# what about female names?
+#: src/game/game.cpp:731
+#, fuzzy, c-format
+msgid "%s from %s team is dead because he is clumsy!"
+msgstr "%s 的死因是: 太笨 !"
+
 #: src/object/medkit.cpp:68
 #, c-format
 msgid "%s has won %u point of energy!"
@@ -89,17 +100,11 @@ msgid_plural "%s has won %u points of energy!"
 msgstr[0] "%s 贏得 %u 點耐久!"
 msgstr[1] "%s 贏得 %u 點耐久!"
 
-#: src/game/game.cpp:675
+#: src/game/game.cpp:743
 #, c-format
 msgid "%s is a psychopath, he has killed a member of the %s team!"
 msgstr "%s 是個瘋子, 他幹掉了 %s 的一個!"
 
-# what about female names?
-#: src/game/game.cpp:670
-#, c-format
-msgid "%s is dead because he is clumsy!"
-msgstr "%s 的死因是: 太笨 !"
-
 #: src/weapon/mine.cpp:121
 #, c-format
 msgid "%s is next to a mine!"
@@ -123,21 +128,21 @@ msgid_plural "%s team has won %u Cluster bazookas!"
 msgstr[0] "%s 隊得到 %u 火箭炮!"
 msgstr[1] "%s 隊得到 %u 火箭炮!"
 
-#: src/weapon/gnu.cpp:174
+#: src/weapon/gnu.cpp:175
 #, c-format
 msgid "%s team has won %u Gnu! Blow them all, cowboy!"
 msgid_plural "%s team has won %u Gnus! Blow them all, cowboy!"
 msgstr[0] "%s 隊得到 %u Gnu-北美野牛! 吹起來, 牛仔!"
 msgstr[1] "%s 隊得到 %u Gnu-北美野牛! 吹起來, 牛仔!"
 
-#: src/weapon/air_attack.cpp:260
+#: src/weapon/air_attack.cpp:272
 #, c-format
 msgid "%s team has won %u air attack!"
 msgid_plural "%s team has won %u air attacks!"
 msgstr[0] "%s 隊得到 %u 空襲!"
 msgstr[1] "%s 隊得到 %u 空襲!"
 
-#: src/weapon/airhammer.cpp:174
+#: src/weapon/airhammer.cpp:172
 #, c-format
 msgid ""
 "%s team has won %u airhammer! Don't make too much noise with it! Thanks, "
@@ -148,7 +153,7 @@ msgid_plural ""
 msgstr[0] "%s 隊得到 %u 氣錘! (鄰居們:不要太響了,謝謝。)."
 msgstr[1] "%s 隊得到 %u 氣錘! (鄰居們:不要太響了,謝謝。)."
 
-#: src/weapon/anvil.cpp:188
+#: src/weapon/anvil.cpp:189
 #, c-format
 msgid "%s team has won %u anvil! Splat them all!"
 msgid_plural "%s team has won %u anvils! Splat them all!"
@@ -200,7 +205,7 @@ msgid_plural "%s team has won %u cluster bombs!"
 msgstr[0] "%s 隊得到 %u 集束炸彈!"
 msgstr[1] "%s 隊得到 %u 集束炸彈!"
 
-#: src/weapon/construct.cpp:81
+#: src/weapon/construct.cpp:82
 #, c-format
 msgid "%s team has won %u construct weapon! Don't forget your helmet."
 msgid_plural "%s team has won %u construct weapons! Don't forget your helmet."
@@ -236,7 +241,7 @@ msgid_plural "%s team has won %u football bombs!"
 msgstr[0] "%s 隊得到 %u 足球炸彈!"
 msgstr[1] "%s 隊得到 %u 足球炸彈!"
 
-#: src/weapon/grapple.cpp:783
+#: src/weapon/grapple.cpp:809
 #, c-format
 msgid "%s team has won %u grapple!"
 msgid_plural "%s team has won %u grapples!"
@@ -257,14 +262,14 @@ msgid_plural "%s team has won %u guns!"
 msgstr[0] "%s 隊得到 %u 槍了!"
 msgstr[1] "%s 隊得到 %u 槍了!"
 
-#: src/weapon/jetpack.cpp:239
+#: src/weapon/jetpack.cpp:247
 #, c-format
 msgid "%s team has won %u jetpack! Groovy!"
 msgid_plural "%s team has won %u jetpacks! Groovy!"
 msgstr[0] "%s 隊得到 %u 噴射包了! 帥啊!"
 msgstr[1] "%s 隊得到 %u 噴射包了! 帥啊!"
 
-#: src/weapon/lowgrav.cpp:78
+#: src/weapon/lowgrav.cpp:79
 #, c-format
 msgid "%s team has won %u lowgrav! I'm Neil Armstrong!"
 msgid_plural "%s team has won %u lowgravs! I'm Neil Armstrong!"
@@ -278,14 +283,14 @@ msgid_plural "%s team has won %u mines!"
 msgstr[0] "%s 隊得到 %u 地雷!"
 msgstr[1] "%s 隊得到 %u 地雷!"
 
-#: src/weapon/parachute.cpp:165
+#: src/weapon/parachute.cpp:166
 #, c-format
 msgid "%s team has won %u parachute!"
 msgid_plural "%s team has won %u parachutes!"
 msgstr[0] "%s 隊得到 %u 降落傘!"
 msgstr[1] "%s 隊得到 %u 降落傘!"
 
-#: src/weapon/polecat.cpp:179
+#: src/weapon/polecat.cpp:181
 #, c-format
 msgid "%s team has won %u polecat! You have you're gas mask, right ?"
 msgid_plural "%s team has won %u polecats! You have you're gas mask, right ?"
@@ -306,7 +311,14 @@ msgid_plural "%s team has won %u shotguns!"
 msgstr[0] "%s 隊得到 %u 獵槍!"
 msgstr[1] "%s 隊得到 %u 獵槍!"
 
-#: src/weapon/snipe_rifle.cpp:246
+#: src/weapon/slap.cpp:85
+#, fuzzy, c-format
+msgid "%s team has won %u slap!"
+msgid_plural "%s team has won %u slaps! Dodge this!"
+msgstr[0] "%s隊得到 %u 飛索了!"
+msgstr[1] "%s隊得到 %u 飛索了!"
+
+#: src/weapon/snipe_rifle.cpp:247
 #, c-format
 msgid "%s team has won %u sniper rifle! Aim and shoot between the eyes!"
 msgid_plural ""
@@ -349,23 +361,33 @@ msgid_plural "%s team has won %u turn skips! I know you'll love them."
 msgstr[0] "%s 隊得到 %u 暫停! 我知道你喜歡."
 msgstr[1] "%s 隊得到 %u 暫停! 我知道你喜歡."
 
-#: src/weapon/supertux.cpp:313
+#: src/weapon/supertux.cpp:316
 #, c-format
 msgid "%s team has won %u tux launcher! Never seen a flying penguin?"
 msgid_plural "%s team has won %u tux launchers! Never seen a flying penguin?"
 msgstr[0] "%s 隊得到 %u 企鵝發射器! 沒見過滿天飛的企鵝嗎?"
 msgstr[1] "%s 隊得到 %u 企鵝發射器! 沒見過滿天飛的企鵝嗎?"
 
+#: src/game/game_blitz.cpp:70
+#, c-format
+msgid "%s team was fragged down."
+msgstr ""
+
+#: src/game/game.cpp:739
+#, c-format
+msgid "%s took a member of the %s team to the grave with him!"
+msgstr ""
+
 #: src/interface/interface.cpp:165
 msgid "(dead)"
 msgstr "(死掉的)"
 
 #. Setting language selection
-#: src/menu/options_menu.cpp:192
+#: src/menu/options_menu.cpp:262
 msgid "(system language)"
 msgstr "(系統語言)"
 
-#: src/network/chatlogger.cpp:37 src/network/chatlogger.cpp:85
+#: src/network/chatlogger.cpp:31 src/network/chatlogger.cpp:78
 msgid "(unknown time)"
 msgstr "(未知時間)"
 
@@ -374,7 +396,7 @@ msgstr "(未知時間)"
 msgid "(unlimited)"
 msgstr "(無限的)"
 
-#: src/menu/options_menu.cpp:336
+#: src/menu/options_menu.cpp:435
 #, c-format
 msgid ""
 "A new version %s is available, while your version is %s.You may want to "
@@ -382,7 +404,11 @@ msgid ""
 msgstr ""
 "新版本 %s 可用,您的版本是 %s。也許您想查下,是否有針對您的作業系統的升級。"
 
-#: src/weapon/air_attack.cpp:209
+#: src/menu/options_menu.cpp:141
+msgid "Add custom team"
+msgstr ""
+
+#: src/weapon/air_attack.cpp:219
 msgid "Air Attack"
 msgstr "空襲"
 
@@ -390,10 +416,19 @@ msgstr "空襲"
 msgid "Airhammer"
 msgstr "飛錘"
 
-#: src/menu/results_menu.cpp:465
+#: src/menu/results_menu.cpp:422
 msgid "All teams"
 msgstr "全部的隊伍"
 
+#: src/menu/game_mode_editor.cpp:58
+#, fuzzy
+msgid "Always"
+msgstr "要玩了哦"
+
+#: src/game/game_blitz.cpp:50 src/game/game_classic.cpp:56
+msgid "And the winner is..."
+msgstr "生者是..."
+
 #: src/weapon/baseball.cpp:58
 msgid ""
 "Angle : Up/Down\n"
@@ -408,7 +443,7 @@ msgstr ""
 msgid "Anvil"
 msgstr "鐵砧"
 
-#: src/main.cpp:251
+#: src/main.cpp:286
 msgid "Authors:"
 msgstr "作者:"
 
@@ -432,6 +467,15 @@ msgstr "棒球歐"
 msgid "Bazooka"
 msgstr "火箭炮"
 
+#: src/menu/game_mode_editor.cpp:59
+#, fuzzy
+msgid "Before action"
+msgstr "傳輸"
+
+#: src/menu/game_mode_editor.cpp:45
+msgid "Blitz"
+msgstr ""
+
 #: src/weapon/blowtorch.cpp:62
 msgid "Blowtorch"
 msgstr "吹管"
@@ -444,8 +488,9 @@ msgstr "彈力球"
 msgid "Bye bye tux..."
 msgstr "Bye bye 企鵝..."
 
-#: src/team/teams_list.cpp:475 src/team/teams_list.cpp:497
-#: src/team/teams_list.cpp:544
+#: src/menu/network_teams_selection_box.cpp:235 src/team/teams_list.cpp:496
+#: src/team/teams_list.cpp:527 src/team/teams_list.cpp:536
+#: src/team/teams_list.cpp:542 src/team/teams_list.cpp:604
 #, c-format
 msgid "Can't find team %s!"
 msgstr "沒找到隊伍 %s!"
@@ -455,24 +500,72 @@ msgstr "沒找到隊伍 %s!"
 msgid "Cannot open personal teams directory (%s)!"
 msgstr "打不開個人團隊目錄(%s)!"
 
-#: src/team/teams_list.cpp:148
+#: src/menu/skin_menu.cpp:77 src/team/teams_list.cpp:148
 #, c-format
 msgid "Cannot open teams directory (%s)!"
 msgstr "打不開團隊目錄 (%s)!"
 
-#: src/menu/options_menu.cpp:129
+#: src/team/custom_teams_list.cpp:93
+#, fuzzy, c-format
+msgid "Cannot open the custom teams directory (%s)!"
+msgstr "打不開個人團隊目錄(%s)!"
+
+#: src/menu/help_menu.cpp:92
+#, fuzzy
+msgid "Center camera to character"
+msgstr "角色數目"
+
+#: src/menu/help_menu.cpp:91
+msgid "Change active character"
+msgstr ""
+
+#: src/menu/help_menu.cpp:80
+msgid "Change aim angle"
+msgstr ""
+
+#: src/menu/help_menu.cpp:74
+msgid "Change weapon category"
+msgstr ""
+
+#: src/menu/help_menu.cpp:79
+msgid "Change weapon countdown"
+msgstr ""
+
+#: src/menu/options_menu.cpp:166
+#, fuzzy
+msgid "Character"
+msgstr "降落傘"
+
+#: src/menu/game_mode_editor.cpp:62
+#, fuzzy
+msgid "Character switching"
+msgstr "降落傘"
+
+#: src/menu/options_menu.cpp:193
 msgid "Check updates online?"
 msgstr "網上檢查升級?"
 
-#: src/menu/map_selection_box.cpp:234
+#: src/menu/map_selection_box.cpp:229
 msgid "Choose randomly between the different maps"
 msgstr "在地圖中隨機選取"
 
+#: src/menu/game_mode_editor.cpp:43
+msgid "Classic"
+msgstr ""
+
+#: src/menu/help_menu.cpp:78
+msgid "Click: Center camera on character"
+msgstr ""
+
 #. Client Mode
-#: src/menu/network_menu.cpp:103
+#: src/menu/network_menu.cpp:105
 msgid "Client mode"
 msgstr "用戶端型態 "
 
+#: src/menu/results_menu.cpp:169 src/menu/results_menu.cpp:171
+msgid "Clumsiest"
+msgstr "最笨手笨腳的"
+
 #: src/weapon/cluster_bomb.cpp:188
 msgid "Cluster Bomb"
 msgstr "集束炸彈"
@@ -485,7 +578,12 @@ msgstr "開花彈"
 msgid "Commit Suicide"
 msgstr "自殺"
 
-#: src/menu/network_connection_menu.cpp:207
+#: src/menu/help_menu.cpp:75
+#, fuzzy
+msgid "Configuration menu"
+msgstr "沒有配置檔案!"
+
+#: src/menu/network_connection_menu.cpp:164
 msgid "Connect to game"
 msgstr "連上游戲"
 
@@ -493,11 +591,11 @@ msgstr "連上游戲"
 msgid "Connected !"
 msgstr "已連線!"
 
-#: src/weapon/construct.cpp:59 src/weapon/construct.cpp:67
+#: src/weapon/construct.cpp:60 src/weapon/construct.cpp:68
 msgid "Construct"
 msgstr "建筑工具"
 
-#: src/menu/results_menu.cpp:313
+#: src/menu/results_menu.cpp:387
 msgid "Controlled by: "
 msgstr "控制者: "
 
@@ -506,7 +604,7 @@ msgstr "控制者: "
 msgid "Couldn't fetch last version from %s"
 msgstr "無法從 %s抓取最新版本"
 
-#: src/network/chatlogger.cpp:65 src/network/download.cpp:90
+#: src/network/chatlogger.cpp:57 src/network/download.cpp:90
 #, c-format
 msgid "Couldn't open file %s"
 msgstr "無法開啟檔案%s"
@@ -515,11 +613,32 @@ msgstr "無法開啟檔案%s"
 msgid "Credits"
 msgstr "鳴謝"
 
+#: src/menu/game_mode_editor.cpp:88
+msgid "Damage per turn during death mode"
+msgstr ""
+
+#: src/menu/options_menu.cpp:144
+msgid "Delete custom team"
+msgstr ""
+
 #: src/weapon/disco_grenade.cpp:157
 msgid "Disco Grenade"
 msgstr "躍動手雷"
 
-#: src/menu/game_menu.cpp:93
+#: src/network/admin_commands.cpp:31
+msgid "Displays this message"
+msgstr ""
+
+#: src/menu/help_menu.cpp:77
+msgid "Drag&drop: Move camera"
+msgstr ""
+
+#. some death mode options
+#: src/menu/game_mode_editor.cpp:82
+msgid "Duration before death mode"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:51
 msgid "Duration of a turn"
 msgstr "回合時間長度"
 
@@ -527,30 +646,51 @@ msgstr "回合時間長度"
 msgid "Dynamite"
 msgstr "炸藥"
 
-#: src/game/game.cpp:228
+#: src/game/game.cpp:270
 msgid "END OF GAME"
 msgstr "游戲結束"
 
-#: src/menu/options_menu.cpp:153
+#: src/menu/options_menu.cpp:217
 msgid "Effects volume"
 msgstr "音效大小"
 
-#: src/tool/error.cpp:82
-#, c-format
-msgid "Error in %s:%lu"
+#: src/menu/results_menu.cpp:324
+msgid "Energy"
+msgstr ""
+
+#: src/tool/error.cpp:63
+#, fuzzy, c-format
+msgid "Error in %s:%lu (Wormux %s) : %s"
 msgstr "錯誤出現%s:%lu"
 
-#: src/team/teams_list.cpp:124
+#: src/include/action_handler.cpp:210
+#, c-format
+msgid "Error initializing network: Client %s does not agree with you!! - %s"
+msgstr ""
+
+#: src/team/custom_teams_list.cpp:120 src/team/teams_list.cpp:124
 msgid "Error loading team :"
 msgstr "讀取隊伍出錯 :"
 
-#: src/game/config.cpp:476
+#: src/game/config.cpp:511 src/team/custom_team.cpp:165
+#: src/team/custom_team.cpp:175 src/team/custom_team.cpp:187
 #, c-format
 msgid ""
 "Error while creating directory \"%s\": unable to store configuration file."
 msgstr "建立目錄失敗 \"%s\": 無法儲存設定檔案."
 
-#: src/game/game.cpp:128
+#: src/team/custom_team.cpp:104
+#, fuzzy, c-format
+msgid ""
+"Error while deleting the directory \"%s\". Unable to delete the custom team."
+msgstr "建立目錄失敗 \"%s\": 無法儲存設定檔案."
+
+#: src/team/custom_team.cpp:95
+#, fuzzy, c-format
+msgid "Error while deleting the file \"%s\". Unable to delete the custom team."
+msgstr "建立目錄失敗 \"%s\": 無法儲存設定檔案."
+
+#: src/game/game.cpp:143
 #, c-format
 msgid ""
 "Error:\n"
@@ -560,30 +700,36 @@ msgstr ""
 "%s"
 
 #. translators: %s:%s will expand to something like "example.org:9999"
-#: src/menu/network_connection_menu.cpp:357
+#: src/menu/network_connection_menu.cpp:379
 #, c-format
 msgid "Error: Unable to connect to %s:%s"
 msgstr "錯誤: 連不到%s:%s"
 
-#: src/menu/network_connection_menu.cpp:317
-msgid "Error: Unable to contact index server to host a game"
+#: src/menu/network_connection_menu.cpp:340
+#, fuzzy
+msgid "Error: Unable to contact the index server to host a game"
 msgstr "錯誤: 無法聯繫索引伺服器建立游戲"
 
-#: src/menu/network_connection_menu.cpp:273
-msgid "Error: Unable to contact index server to search an internet game"
+#: src/menu/network_connection_menu.cpp:281
+#, fuzzy
+msgid ""
+"Error: Unable to contact the index server to search for an internet game"
 msgstr "錯誤: 無法聯繫索引伺服器搜尋游戲"
 
-#: src/menu/network_connection_menu.cpp:337
+#: src/menu/network_connection_menu.cpp:359
 msgid "Error: Unable to start server"
 msgstr "錯誤: 無法開始伺服器"
 
-#: src/menu/network_connection_menu.cpp:331
+#: src/menu/network_connection_menu.cpp:353
+#, c-format
 msgid ""
 "Error: Your server is not reachable from the internet. Check your firewall "
-"configuration"
-msgstr "錯誤: 無法從互聯網上抓取伺服器.請檢查防火牆."
+"configuration: TCP Port %s must accept connection from the outside. If you "
+"are not directly connected to the internet, check your router configuration: "
+"TCP Port %s must be forwarded on your computer."
+msgstr ""
 
-#: src/team/team.cpp:116
+#: src/team/team.cpp:118
 #, c-format
 msgid "Error: can't find the body \"%s\" for the team \"%s\"."
 msgstr "錯誤: 找不到 body\"%s\" 隊伍 \"%s\"."
@@ -596,23 +742,33 @@ msgstr "噴火器"
 msgid "Football Bomb"
 msgstr "足球炸彈"
 
-#: src/menu/options_menu.cpp:89
+#: src/menu/help_menu.cpp:71
+#, fuzzy
+msgid "Fullscreen / window"
+msgstr "全屏?"
+
+#: src/menu/options_menu.cpp:96
 msgid "Fullscreen?"
 msgstr "全屏?"
 
-#: src/menu/game_menu.cpp:104
+#: src/menu/game_menu.cpp:86
 msgid "Game"
 msgstr ""
 
-#: src/menu/network_connection_menu.cpp:119
+#: src/menu/game_mode_editor.cpp:47
+#, fuzzy
+msgid "Game mode"
+msgstr "游戲名:"
+
+#: src/menu/network_connection_menu.cpp:187
 msgid "Game name:"
 msgstr "游戲名:"
 
-#: src/weapon/gnu.cpp:160
+#: src/weapon/gnu.cpp:161
 msgid "Gnu Launcher"
 msgstr "Gnu-北美野牛發射器"
 
-#: src/menu/options_menu.cpp:118
+#: src/menu/options_menu.cpp:126
 msgid "Graphic"
 msgstr ""
 
@@ -620,11 +776,15 @@ msgstr ""
 msgid "Grapple"
 msgstr "飛索"
 
+#: src/menu/game_mode_editor.cpp:94
+msgid "Gravity"
+msgstr ""
+
 #: src/weapon/grenade.cpp:76
 msgid "Grenade"
 msgstr "手雷"
 
-#: src/map/ground.cpp:43
+#: src/map/ground.cpp:44
 msgid "Ground initialization..."
 msgstr "地面搆建中..."
 
@@ -632,16 +792,16 @@ msgstr "地面搆建中..."
 msgid "Gun"
 msgstr "槍"
 
-#: src/tool/file_tools.cpp:125
+#: src/tool/file_tools.cpp:185
 msgid "HOME directory (environment variable $HOME) could not be found!"
 msgstr " 找不到家目錄 (environment variable $HOME) !"
 
 #. Skip a line
-#: src/menu/network_connection_menu.cpp:231
+#: src/menu/network_connection_menu.cpp:237
 msgid "Have a good game!"
 msgstr "來吧!"
 
-#: src/menu/team_box.cpp:54
+#: src/menu/team_box.cpp:68 src/menu/team_box.cpp:75
 msgid "Head commander"
 msgstr "指揮官"
 
@@ -655,7 +815,11 @@ msgstr "指揮官: "
 msgid "Help"
 msgstr "輔助說明"
 
-#: src/menu/network_connection_menu.cpp:142
+#: src/menu/help_menu.cpp:72
+msgid "High jump"
+msgstr ""
+
+#: src/menu/network_connection_menu.cpp:211
 msgid "Host a game"
 msgstr "建立游戲"
 
@@ -697,13 +861,18 @@ msgstr ""
 "如何使用: 滑鼠左鍵點擊目標\n"
 "每回合一個彈夾"
 
-#: src/main.cpp:243
+#: src/game/game_classic.cpp:227
+msgid "Hurry up, you are too slow !!"
+msgstr "快點,伙計你也太慢了!"
+
+#: src/main.cpp:278
 msgid ""
 "If you found a bug or have a feature request send us a email (in english, "
 "please):"
 msgstr "假如你發現Bug或想要什么游戲特徴, 請發英文郵件給我們"
 
-#: src/menu/game_menu.cpp:99
+#. Characters energy
+#: src/menu/game_mode_editor.cpp:67
 msgid "Initial energy"
 msgstr "初始耐久"
 
@@ -718,7 +887,7 @@ msgstr ""
 "開火: 按住白字元鍵積攢到需要的力量\n"
 "每回合一個彈夾"
 
-#: src/game/game_init.cpp:155
+#: src/game/game_init.cpp:153
 msgid "Initialisation"
 msgstr "起始化"
 
@@ -726,32 +895,44 @@ msgstr "起始化"
 msgid "Initialise map"
 msgstr "地圖起始化"
 
-#: src/game/game_init.cpp:142
+#: src/game/game_init.cpp:140
 msgid "Initialise sounds"
 msgstr "音響起始化"
 
-#: src/game/game_init.cpp:118
+#: src/game/game_init.cpp:116
 msgid "Initialise teams"
 msgstr "隊伍起始化"
 
-#: src/game/game.cpp:541
+#: src/game/game.cpp:587
 msgid "It's a present!"
 msgstr "就是現在!"
 
-#: src/weapon/jetpack.cpp:59
+#: src/weapon/jetpack.cpp:60
 msgid "Jetpack"
 msgstr "噴射包"
 
 # URM0-1: search URM0-2 for next line
-#: src/menu/network_connection_menu.cpp:229 src/menu/network_menu.cpp:142
+#: src/menu/network_connection_menu.cpp:235 src/menu/network_menu.cpp:144
 msgid "Join #wormux on irc.freenode.net to find some opponents."
 msgstr "加入#wormux IRC irc.freenode.net 找對手"
 
-#: src/menu/options_menu.cpp:125
+#: src/menu/help_menu.cpp:76
+msgid "Jump"
+msgstr ""
+
+#: src/menu/help_menu.cpp:86
+msgid "Jump backwards"
+msgstr ""
+
+#: src/network/admin_commands.cpp:33
+msgid "Kicks the players designated by <nickname> out of the game"
+msgstr ""
+
+#: src/menu/options_menu.cpp:133
 msgid "Language"
 msgstr "語言"
 
-#: src/map/maps_list.cpp:222
+#: src/map/maps_list.cpp:228
 msgid "Load maps:"
 msgstr "讀取地圖:"
 
@@ -759,7 +940,7 @@ msgstr "讀取地圖:"
 msgid "Load teams:"
 msgstr "讀取隊伍:"
 
-#: src/menu/teams_selection_box.cpp:42
+#: src/menu/teams_selection_box.cpp:44
 msgid "Local teams:"
 msgstr "區域隊伍:"
 
@@ -767,13 +948,13 @@ msgstr "區域隊伍:"
 msgid "LowGrav"
 msgstr "漫步-低重力"
 
-#. #####################################
+#. #############################
 #. Manual connection
-#: src/menu/network_connection_menu.cpp:173
+#: src/menu/network_connection_menu.cpp:129
 msgid "Manual connection"
 msgstr ""
 
-#: src/menu/game_menu.cpp:84
+#: src/menu/game_menu.cpp:78
 #, fuzzy
 msgid "Map"
 msgstr "地圖"
@@ -787,11 +968,16 @@ msgstr "地圖 %s, 靈感 : "
 msgid "Maps"
 msgstr "地圖"
 
-#: src/menu/network_menu.cpp:115
+#: src/menu/game_mode_editor.cpp:73
+#, fuzzy
+msgid "Max energy"
+msgstr "初始耐久"
+
+#: src/menu/network_menu.cpp:117
 msgid "Max number of players:"
 msgstr "玩家滿員:"
 
-#: src/menu/options_menu.cpp:92
+#: src/menu/options_menu.cpp:100
 msgid "Maximum FPS"
 msgstr "最大 FPS"
 
@@ -799,40 +985,45 @@ msgstr "最大 FPS"
 msgid "Mine"
 msgstr "地雷"
 
-#: src/menu/options_menu.cpp:133
+#: src/menu/options_menu.cpp:197
 #, fuzzy
 msgid "Misc"
 msgstr "音樂?"
 
-#: src/menu/results_menu.cpp:370
+#: src/menu/results_menu.cpp:177 src/menu/results_menu.cpp:179
 msgid "Most accurate"
 msgstr "最准"
 
-#: src/menu/results_menu.cpp:366
-msgid "Most clumsy"
-msgstr "最笨手笨腳的"
-
-#: src/menu/results_menu.cpp:362
+#: src/menu/results_menu.cpp:161 src/menu/results_menu.cpp:163
 msgid "Most sold-out"
 msgstr "最賣力的"
 
-#: src/menu/results_menu.cpp:354
+#: src/menu/results_menu.cpp:145 src/menu/results_menu.cpp:147
 msgid "Most useful"
 msgstr "最有價值的"
 
-#: src/menu/results_menu.cpp:358
+#: src/menu/results_menu.cpp:153 src/menu/results_menu.cpp:155
 msgid "Most useless"
 msgstr "最失敗的"
 
-#: src/menu/results_menu.cpp:350
+#: src/menu/results_menu.cpp:137 src/menu/results_menu.cpp:139
 msgid "Most violent"
 msgstr "最暴力的"
 
-#: src/menu/options_menu.cpp:143
+#: src/menu/help_menu.cpp:88
+msgid "Move camera with mouse or arrows"
+msgstr ""
+
+#: src/menu/help_menu.cpp:81
+#, fuzzy
+msgid "Move character"
+msgstr "降落傘"
+
+#: src/menu/options_menu.cpp:207
 msgid "Music volume"
 msgstr "音樂音量:"
 
-#: src/menu/options_menu.cpp:139
+#: src/menu/options_menu.cpp:203
 msgid "Music?"
 msgstr "音樂?"
 
@@ -840,32 +1031,48 @@ msgstr "音樂?"
 msgid "Network Game"
 msgstr "網路游戲"
 
-#: src/network/network.cpp:261
+#: src/network/network.cpp:298
 msgid "Network initialization"
 msgstr "網路起始化"
 
+#: src/menu/game_mode_editor.cpp:60
+msgid "Never"
+msgstr ""
+
 #. TRANSLATORS: after this string there will be a time stamp or the string '(unknown time)'
-#: src/network/chatlogger.cpp:57
+#: src/network/chatlogger.cpp:51
 msgid "New network game at "
 msgstr "網上游戲"
 
-#: src/weapon/weapon.cpp:657
+#: src/menu/options_menu.cpp:242
+msgid "New player warning?"
+msgstr ""
+
+#: src/weapon/weapon.cpp:658
 #, c-format
 msgid "No element <%s> found in the xml config file!"
 msgstr "沒找到 <%s>重點 xml配置檔案 !"
 
-#: src/menu/results_menu.cpp:129
+#: src/menu/results_menu.cpp:74
 msgid "Nobody!"
 msgstr "空房間!"
 
-#: src/menu/team_box.cpp:60
+#: src/menu/team_box.cpp:87
 msgid "Number of characters"
 msgstr "角色數目"
 
-#: src/menu/teams_selection_box.cpp:48
+#: src/menu/teams_selection_box.cpp:50
 msgid "Number of teams:"
 msgstr "隊伍數量:"
 
+#: src/menu/help_menu.cpp:83
+msgid "On a character: Changes active one"
+msgstr ""
+
+#: src/menu/help_menu.cpp:82
+msgid "On map: Select a target"
+msgstr ""
+
 #: src/menu/main_menu.cpp:66
 msgid "Options"
 msgstr "選項 "
@@ -878,42 +1085,55 @@ msgstr "選項功能表"
 msgid "Parachute"
 msgstr "降落傘"
 
-#: src/weapon/parachute.cpp:100
+#: src/weapon/parachute.cpp:101
 msgid "Parachute is activated automatically."
 msgstr "自動使用"
 
-#: src/menu/network_connection_menu.cpp:131
-#: src/menu/network_connection_menu.cpp:166
-#: src/menu/network_connection_menu.cpp:202
+#: src/menu/network_connection_menu.cpp:121
+#: src/menu/network_connection_menu.cpp:159
+#: src/menu/network_connection_menu.cpp:199
 msgid "Password:"
 msgstr ""
 
+#: src/menu/help_menu.cpp:87
+msgid "Pause"
+msgstr ""
+
 #: src/menu/main_menu.cpp:60
 msgid "Play"
 msgstr "要玩了哦"
 
-#: src/menu/teams_selection_box.cpp:63
+#: src/menu/network_menu.cpp:132
+msgid "Play several times"
+msgstr ""
+
+#: src/menu/teams_selection_box.cpp:65
 msgid "Player"
 msgstr "玩家"
 
-#: src/menu/options_menu.cpp:75
+#: src/menu/options_menu.cpp:81
 msgid "Player energy?"
 msgstr "耐久度?"
 
-#: src/menu/options_menu.cpp:78
+#: src/menu/options_menu.cpp:150
+#, fuzzy
+msgid "Player name"
+msgstr "請問尊姓大名?"
+
+#: src/menu/options_menu.cpp:84
 msgid "Player's name?"
 msgstr "請問尊姓大名?"
 
-#: src/weapon/polecat.cpp:165
+#: src/weapon/polecat.cpp:167
 msgid "Polecat Launcher"
 msgstr "臭鼬發射器"
 
-#: src/menu/network_connection_menu.cpp:108
-#: src/menu/network_connection_menu.cpp:191
+#: src/menu/network_connection_menu.cpp:148
+#: src/menu/network_connection_menu.cpp:176
 msgid "Port:"
 msgstr "通訊埠:"
 
-#: src/menu/network_connection_menu.cpp:155
+#: src/menu/network_connection_menu.cpp:108
 #, fuzzy
 msgid "Public battles"
 msgstr "推出戰斗"
@@ -922,7 +1142,7 @@ msgstr "推出戰斗"
 msgid "Quit"
 msgstr "結束"
 
-#: src/main.cpp:232
+#: src/main.cpp:267
 msgid "Quit Wormux"
 msgstr "結束"
 
@@ -930,19 +1150,24 @@ msgstr "結束"
 msgid "Quit battle"
 msgstr "推出戰斗"
 
-#: src/menu/map_selection_box.cpp:233
+#: src/menu/help_menu.cpp:66
+#, fuzzy
+msgid "Quit game"
+msgstr "執行游戲"
+
+#: src/menu/map_selection_box.cpp:228
 msgid "Random map"
 msgstr "隨機讀取地圖"
 
-#: src/game/config.cpp:346
+#: src/game/config.cpp:349
 msgid "Reading default config file"
 msgstr "正讀取預設設定檔案"
 
-#: src/game/config.cpp:394
+#: src/game/config.cpp:398
 msgid "Reading personal config file"
 msgstr "正讀取個人設定檔案"
 
-#: src/menu/options_menu.cpp:114
+#: src/menu/options_menu.cpp:122
 msgid "Resolution"
 msgstr "解析度"
 
@@ -950,34 +1175,34 @@ msgstr "解析度"
 msgid "Riot Bomb"
 msgstr "爆炸彈"
 
-#: src/main.cpp:80
+#: src/main.cpp:83
 msgid "Run game"
 msgstr "執行游戲"
 
-#: src/network/chat.cpp:80
+#: src/network/chat.cpp:82
 msgid "Say: "
 msgstr "說: "
 
-#: src/menu/options_menu.cpp:84
+#: src/menu/options_menu.cpp:90
 #, fuzzy
 msgid "Scroll border size"
 msgstr "捲動邊線"
 
-#: src/menu/options_menu.cpp:81
+#: src/menu/options_menu.cpp:87
 msgid "Scroll on border"
 msgstr "捲動邊線"
 
-#: src/menu/network_connection_menu.cpp:180
+#: src/menu/network_connection_menu.cpp:137
 msgid "Server address:"
 msgstr "伺服器位址"
 
 #. Available on internet ?
-#: src/menu/network_connection_menu.cpp:139
+#: src/menu/network_connection_menu.cpp:207
 msgid "Server available on Internet"
 msgstr "Internet可用伺服器"
 
 #. Server Mode
-#: src/menu/network_menu.cpp:112
+#: src/menu/network_menu.cpp:114
 msgid "Server mode"
 msgstr "伺服器設定"
 
@@ -985,10 +1210,35 @@ msgstr "伺服器設定"
 msgid "Shotgun"
 msgstr "獵槍"
 
+#: src/menu/help_menu.cpp:84
+#, fuzzy
+msgid "Show weapons menu"
+msgstr "選項功能表"
+
+#: src/menu/help_menu.cpp:70
+msgid "Show/hide interface"
+msgstr ""
+
+#: src/menu/help_menu.cpp:90
+msgid "Show/hide minimap"
+msgstr ""
+
 #: src/weapon/skip_turn.cpp:47
 msgid "Skip turn"
 msgstr "這次我不動."
 
+#: src/weapon/slap.cpp:73
+msgid "Slap"
+msgstr ""
+
+#: src/weapon/slap.cpp:74
+msgid "Slap the enemy to make him jump a bit."
+msgstr ""
+
+#: src/menu/help_menu.cpp:85
+msgid "Smaller aim angle and walk step"
+msgstr ""
+
 #: src/weapon/snipe_rifle.cpp:93
 msgid "Sniper Rifle"
 msgstr "狙擊步槍"
@@ -997,29 +1247,36 @@ msgstr "狙擊步槍"
 msgid "Someone put a booby trap into the crate!"
 msgstr "有人在箱子裡布置了炸彈作禮物!"
 
-#: src/menu/network_connection_menu.cpp:280
+#: src/menu/network_connection_menu.cpp:289
 msgid "Sorry, currently, no game is waiting for players"
 msgstr "抱歉噢. 沒人等你."
 
-#: src/menu/options_menu.cpp:178
+#: src/network/index_server.cpp:322
+#, c-format
+msgid ""
+"Sorry, your version is not supported anymore. Supported version are %s. You "
+"can download a updated version on http://www.wormux.org/wiki/download.php"
+msgstr ""
+
+#: src/menu/options_menu.cpp:245
 #, fuzzy
 msgid "Sound"
 msgstr "音響"
 
-#: src/menu/options_menu.cpp:149
+#: src/menu/options_menu.cpp:213
 msgid "Sound effects?"
 msgstr "音效?"
 
-#: src/menu/options_menu.cpp:174
+#: src/menu/options_menu.cpp:238
 msgid "Sound frequency"
 msgstr "聲訊"
 
 #. Load teams' sound profiles
-#: src/game/game_init.cpp:145
+#: src/game/game_init.cpp:143
 msgid "Sounds"
 msgstr "音響"
 
-#: src/game/game.cpp:95
+#: src/game/game.cpp:114
 msgid "Starting a new game"
 msgstr "重新來游戲"
 
@@ -1039,20 +1296,29 @@ msgstr "SuperTux-超級企鵝"
 msgid "Syringe"
 msgstr "注射器"
 
-#: src/menu/results_menu.cpp:389
+#: src/menu/help_menu.cpp:73
+#, fuzzy
+msgid "Talk in network battle"
+msgstr "傳回戰斗"
+
+#: src/menu/results_menu.cpp:427
 #, fuzzy
 msgid "Team graphs"
 msgstr "隊伍"
 
-#: src/menu/results_menu.cpp:378
+#: src/menu/results_menu.cpp:425
 #, fuzzy
 msgid "Team stats"
 msgstr "隊伍"
 
-#: src/game/game_init.cpp:120 src/menu/game_menu.cpp:72
+#: src/game/game_init.cpp:118 src/menu/game_menu.cpp:66
 msgid "Teams"
 msgstr "隊伍"
 
+#: src/menu/options_menu.cpp:186
+msgid "Teams editor"
+msgstr ""
+
 #: src/weapon/teleportation.cpp:50
 msgid "Teleportation"
 msgstr "傳輸"
@@ -1065,11 +1331,11 @@ msgstr "集束炸彈離開戰場---"
 msgid "The Football Bomb has left the battlefield before it could explode."
 msgstr "集束炸彈離開戰場---"
 
-#: src/weapon/gnu.cpp:143
+#: src/weapon/gnu.cpp:144
 msgid "The Gnu left the battlefield before exploding"
 msgstr "Gnu-野牛離開戰場..."
 
-#: src/weapon/polecat.cpp:148
+#: src/weapon/polecat.cpp:150
 msgid "The Polecat left the battlefield before exploding"
 msgstr "臭鼬離開了戰場..."
 
@@ -1081,6 +1347,13 @@ msgstr "制導火箭離開戰場..."
 msgid "The ball left the battlefield before exploding"
 msgstr "球膨脹前離開戰場"
 
+#: src/network/network_client.cpp:97
+#, c-format
+msgid ""
+"The client and server versions are incompatible (local=%s, server=%s). "
+"Please try another server."
+msgstr ""
+
 #: src/network/net_error_msg.cpp:48
 msgid "The connection timed out. Check there is no firewall in the way!"
 msgstr "連線逾時. 請檢查防火牆!"
@@ -1089,7 +1362,7 @@ msgstr "連線逾時. 請檢查防火牆!"
 msgid "The disco grenade has left the dance floor before exploding"
 msgstr "disco榴彈離開舞池前發生爆炸"
 
-#: src/game/game.cpp:436
+#: src/game/game.cpp:482
 msgid "The game was interrupted because you got disconnected."
 msgstr "您斷線了."
 
@@ -1097,7 +1370,7 @@ msgstr "您斷線了."
 msgid "The grenade left the battlefield before exploding"
 msgstr "手榴彈離開戰場前發生爆炸"
 
-#: src/menu/network_menu.cpp:323
+#: src/menu/network_menu.cpp:328
 msgid "The others are waiting for you! Wake up :-)"
 msgstr "別人在等你! 快醒吧:-)"
 
@@ -1114,14 +1387,19 @@ msgstr "伺服器拒絕"
 msgid "The server rejected the connection: wrong password!"
 msgstr "伺服器拒絕: 密碼錯了."
 
-#: src/menu/network_menu.cpp:239
+#: src/menu/network_menu.cpp:233
 #, c-format
 msgid "There is only %i team."
 msgid_plural "There are only %i teams."
 msgstr[0] "只有%i隊"
 msgstr[1] "只有%i隊"
 
-#: src/weapon/footbomb.cpp:159 src/weapon/cluster_bomb.cpp:189
+#. DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+#: src/menu/results_menu.cpp:322
+msgid "Time"
+msgstr ""
+
+#: src/weapon/cluster_bomb.cpp:189 src/weapon/footbomb.cpp:159
 msgid ""
 "Timeout : Wheel mouse or Page Up/Down\n"
 "Angle : Up/Down\n"
@@ -1145,7 +1423,7 @@ msgstr ""
 "開火: 白字元鍵\n"
 "每回合一個彈夾"
 
-#: src/interface/weapon_menu.cpp:169
+#: src/interface/weapon_menu.cpp:170
 msgid "Tools"
 msgstr "工具"
 
@@ -1153,12 +1431,12 @@ msgstr "工具"
 msgid "Unable to contact host."
 msgstr "連不上主機"
 
-#: src/map/maps_list.cpp:232
+#: src/map/maps_list.cpp:238
 #, c-format
 msgid "Unable to open maps directory (%s)!"
 msgstr "打不開地圖目錄(%s)!"
 
-#: src/map/maps_list.cpp:244
+#: src/map/maps_list.cpp:250
 #, c-format
 msgid "Unable to open personal maps directory (%s)!"
 msgstr "無法開啟個人地圖目錄 (%s)!"
@@ -1167,84 +1445,109 @@ msgstr "無法開啟個人地圖目錄 (%s)!"
 msgid "Unable to use this port!"
 msgstr "通訊埠不可用"
 
-#: src/network/network.cpp:110
+#: src/network/admin_commands.cpp:67
+msgid "Unknown command"
+msgstr ""
+
+#: src/menu/game_mode_editor.cpp:44
+#, fuzzy
+msgid "Unlimited"
+msgstr "(無限的)"
+
+#: src/network/network.cpp:145
 msgid "Unnamed"
 msgstr "未命名"
 
-#: src/main.cpp:188
+#: src/main.cpp:199
 msgid "Version"
 msgstr "版本"
 
-#: src/menu/options_menu.cpp:345
+#: src/menu/options_menu.cpp:444
 #, c-format
 msgid "Version verification failed because: %s\n"
 msgstr "版本改變失敗原因: %s\n"
 
-#: src/menu/network_menu.cpp:253
+#: src/menu/network_menu.cpp:247
 #, c-format
 msgid "Wait! %i player is not ready yet!"
 msgid_plural "Wait! %i players are not ready yet!"
 msgstr[0] "請等待! %i沒准備好!"
 msgstr[1] "請等待! %i沒准備好!"
 
-#: src/menu/network_menu.cpp:390
+#: src/menu/network_menu.cpp:395
 msgid "Waiting for server, all you can do is cancel or chat!"
 msgstr "等着接受服務吧, 現在先聊天 !"
 
+#: src/menu/help_menu.cpp:89
+msgid "Weapon: Fire / Bonus box: falls fast"
+msgstr ""
+
 #. Initialization of teams' energy
 #. Adding label
-#: src/game/game_init.cpp:131 src/interface/weapon_menu.cpp:167
+#: src/game/game_init.cpp:129 src/interface/weapon_menu.cpp:168
 msgid "Weapons"
 msgstr "武器"
 
-#: src/main.cpp:260
+#: src/main.cpp:295
 msgid "Website: "
 msgstr "網站Website: "
 
-#: src/game/game.cpp:678
+#: src/game/game.cpp:748
 #, c-format
 msgid "What a shame for %s - he was killed by a simple gun!"
 msgstr " %s 慘死在小槍之下...無法瞑目!"
 
 #. Various options
-#: src/menu/options_menu.cpp:72
+#: src/menu/options_menu.cpp:78
 msgid "Wind particles?"
 msgstr "風來了?"
 
 #
-#: src/menu/results_menu.cpp:305
+#: src/menu/results_menu.cpp:379
 msgid "Winner"
 msgstr "勝者"
 
-#: src/main.cpp:200
+#: src/main.cpp:211
 msgid "Wormux launching..."
 msgstr "准備中, Wormux!!!"
 
-#: src/main.cpp:250
+#: src/main.cpp:285
 msgid "Wormux version "
 msgstr " Wormux 版本"
 
-#: src/menu/network_menu.cpp:326
+#: src/include/action_handler.cpp:184
+msgid "Wrong map CRC!"
+msgstr ""
+
+#: src/include/action_handler.cpp:181
+msgid "Wrong map name!"
+msgstr ""
+
+#: src/include/action_handler.cpp:187
+msgid "Wrong team!"
+msgstr ""
+
+#: src/menu/network_menu.cpp:331
 msgid "You are alone :-/"
 msgstr "你是孤單的 :-/"
 
-#: src/menu/network_menu.cpp:247
+#: src/menu/network_menu.cpp:241
 msgid "You are alone..."
 msgstr "你是孤單的..."
 
-#: src/map/maps_list.cpp:253
+#: src/map/maps_list.cpp:259
 msgid "You need at least one valid map !"
 msgstr "你需要可用的地圖!"
 
-#: src/game/game_init.cpp:124 src/team/teams_list.cpp:168
+#: src/game/game_init.cpp:122 src/team/teams_list.cpp:168
 msgid "You need at least two valid teams !"
 msgstr "至少有2組才能開始 !"
 
-#: src/menu/network_menu.cpp:227
+#: src/menu/network_menu.cpp:221
 msgid "You won't be able to play before selecting a team !"
 msgstr "沒有隊伍,就不會有戰斗!"
 
-#: src/weapon/weapon_launcher.cpp:480
+#: src/weapon/weapon_launcher.cpp:496
 msgid "Your shot has missed!"
 msgstr "你打偏了!"
 
@@ -1253,7 +1556,7 @@ msgstr "你打偏了!"
 msgid "aka"
 msgstr "aka"
 
-#: src/weapon/air_attack.cpp:210
+#: src/weapon/air_attack.cpp:220
 msgid ""
 "attack direction : Left/Right\n"
 "Bombing : left clic on target\n"
@@ -1263,15 +1566,20 @@ msgstr ""
 "爆炸 : 左鍵點擊目標\n"
 "每回合一次"
 
-#: src/map/maps_list.cpp:75
+#: src/map/maps_list.cpp:78
 msgid "couldn't load config"
 msgstr "無法讀取設定"
 
-#: src/map/ground.cpp:60
+#. the default player name for custom teams
+#: src/team/custom_team.cpp:136
+msgid "custom player"
+msgstr ""
+
+#: src/map/ground.cpp:61
 msgid "done"
 msgstr "成"
 
-#: src/map/maps_list.cpp:82
+#: src/map/maps_list.cpp:85
 msgid "error parsing the config file"
 msgstr "黏貼配置檔案出錯"
 
@@ -1280,15 +1588,15 @@ msgstr "黏貼配置檔案出錯"
 msgid "from"
 msgstr "從"
 
-#: src/map/maps_list.cpp:71
+#: src/map/maps_list.cpp:74
 msgid "no configuration file!"
 msgstr "沒有配置檔案!"
 
-#: src/sound/jukebox.cpp:164
+#: src/sound/jukebox.cpp:167
 msgid "o Loading music"
 msgstr "o 讀取音樂"
 
-#: src/sound/jukebox.cpp:337
+#: src/sound/jukebox.cpp:343
 #, c-format
 msgid "o Loading sound profile: %s"
 msgstr "o讀取音樂檔案 : %s"
@@ -1298,14 +1606,22 @@ msgstr "o讀取音樂檔案 : %s"
 msgid "o Opened audio at %d Hz %d bit"
 msgstr "o音樂 %d Hz %d bit"
 
+#~ msgid ""
+#~ "Error: Your server is not reachable from the internet. Check your "
+#~ "firewall configuration"
+#~ msgstr "錯誤: 無法從互聯網上抓取伺服器.請檢查防火牆."
+
+#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
+#~ msgstr "%s 試着連線一個不同版本 : client=%s, me=%s."
+
 #~ msgid "Connect !"
 #~ msgstr "連線!"
 
 #~ msgid "Connect to an internet game"
 #~ msgstr "連上網去玩"
 
-#~ msgid "Refresh"
-#~ msgstr "清除"
+#~ msgid "Do you really want to quit? (Y/N)"
+#~ msgstr "您真的想結束嗎? (\"Y\"是 或 \"N\"不)"
 
 #~ msgid "Error loading team's data %s:"
 #~ msgstr "讀取隊伍資料 %s 時出錯 :"
@@ -1319,20 +1635,11 @@ msgstr "o音樂 %d Hz %d bit"
 #~ msgid "Error while loading game mode %s (file %s):"
 #~ msgstr "讀取游戲型態時出錯%s (file %s):"
 
-#~ msgid "XML error during loading map '%s': "
-#~ msgstr "讀取地圖 '%s' 時出現XML錯誤"
-
-#~ msgid "%s tries to connect with a different version : client=%s, me=%s."
-#~ msgstr "%s 試着連線一個不同版本 : client=%s, me=%s."
-
-#~ msgid "And the winner is..."
-#~ msgstr "生者是..."
-
-#~ msgid "Hurry up, you are too slow !!"
-#~ msgstr "快點,伙計你也太慢了!"
-
-#~ msgid "Do you really want to quit? (Y/N)"
-#~ msgstr "您真的想結束嗎? (\"Y\"是 或 \"N\"不)"
-
 #~ msgid "Host a game (Windows clients only)"
 #~ msgstr "建立主機(僅windows用戶端)"
+
+#~ msgid "Refresh"
+#~ msgstr "清除"
+
+#~ msgid "XML error during loading map '%s': "
+#~ msgstr "讀取地圖 '%s' 時出現XML錯誤"
diff --git a/src/Makefile.am b/src/Makefile.am
index e7cd0b0..98f609d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,6 +61,7 @@ wormux_SOURCES = \
         gui/spin_button.cpp gui/spin_button.h \
         gui/spin_button_picture.cpp gui/spin_button_picture.h \
 	gui/tabs.cpp gui/tabs.h \
+	gui/talk_box.cpp gui/talk_box.h \
         gui/text_box.cpp gui/text_box.h \
         gui/widget.cpp gui/widget.h \
         gui/widget_list.cpp gui/widget_list.h \
@@ -94,6 +95,7 @@ wormux_SOURCES = \
         map/wind.cpp map/wind.h \
         menu/credits_menu.cpp menu/credits_menu.h \
         menu/game_menu.cpp menu/game_menu.h \
+	menu/game_mode_editor.cpp menu/game_mode_editor.h \
         menu/help_menu.cpp menu/help_menu.h \
         menu/main_menu.cpp menu/main_menu.h \
         menu/map_selection_box.cpp menu/map_selection_box.h \
@@ -104,6 +106,7 @@ wormux_SOURCES = \
         menu/options_menu.cpp menu/options_menu.h \
         menu/pause_menu.cpp menu/pause_menu.h \
         menu/results_menu.cpp menu/results_menu.h \
+        menu/skin_menu.cpp menu/skin_menu.h \
         menu/team_box.cpp menu/team_box.h \
         menu/teams_selection_box.cpp menu/teams_selection_box.h \
         network/admin_commands.cpp network/admin_commands.h \
@@ -147,7 +150,9 @@ wormux_SOURCES = \
         sound/jukebox.cpp sound/jukebox.h \
         sound/sound_sample.cpp sound/sound_sample.h \
         sound/sample_cache.cpp sound/sample_cache.h \
-        team/macro.h \
+        team/custom_team.cpp team/custom_team.h \
+        team/custom_teams_list.cpp team/custom_teams_list.h \
+		team/macro.h \
         team/results.cpp team/results.h \
         team/team_config.h \
         team/team.cpp team/team.h \
@@ -200,6 +205,7 @@ wormux_SOURCES = \
         weapon/riot_bomb.cpp weapon/riot_bomb.h \
         weapon/shotgun.cpp weapon/shotgun.h \
         weapon/skip_turn.cpp weapon/skip_turn.h \
+        weapon/slap.cpp weapon/slap.h \
         weapon/snipe_rifle.cpp weapon/snipe_rifle.h \
         weapon/submachine_gun.cpp weapon/submachine_gun.h \
         weapon/suicide.cpp weapon/suicide.h \
@@ -225,9 +231,8 @@ if WIN32
 wormux_SOURCES += wormux.rc wormux.ico
 .rc.o:
 	@WINDRES@ -o $@ -i $<
-else
-AM_CXXFLAGS += -Werror
 endif
+AM_CXXFLAGS += -Werror
 
 if !INCLUDEDINTL
 LIBS+=@LIBINTL@
diff --git a/src/Makefile.in b/src/Makefile.in
index 6016745..4f2cab7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -39,10 +35,9 @@ host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = wormux$(EXEEXT)
 @WIN32_TRUE at am__append_1 = wormux.rc wormux.ico
- at WIN32_FALSE@am__append_2 = -Werror
- at INCLUDEDINTL_FALSE@am__append_3 = @LIBINTL@
- at STATIC_TRUE@am__append_4 = -lssl -lcrypto -lz -lpthread
- at STATIC_FALSE@am__append_5 = @LIBCURL@
+ at INCLUDEDINTL_FALSE@am__append_2 = @LIBINTL@
+ at STATIC_TRUE@am__append_3 = -lssl -lcrypto -lz -lpthread
+ at STATIC_FALSE@am__append_4 = @LIBCURL@
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in
@@ -98,19 +93,20 @@ am__wormux_SOURCES_DIST = ai/ai_engine.cpp ai/ai_engine.h \
 	gui/question.h gui/spin_button_big.cpp gui/spin_button_big.h \
 	gui/spin_button.cpp gui/spin_button.h \
 	gui/spin_button_picture.cpp gui/spin_button_picture.h \
-	gui/tabs.cpp gui/tabs.h gui/text_box.cpp gui/text_box.h \
-	gui/widget.cpp gui/widget.h gui/widget_list.cpp \
-	gui/widget_list.h gui/big/button_pic.cpp gui/big/button_pic.h \
-	include/action.cpp include/action.h include/action_handler.cpp \
-	include/action_handler.h include/app.h main.cpp include/base.h \
-	include/binreloc.h include/binreloc.c include/constant.cpp \
-	include/constant.h include/singleton.cpp include/singleton.h \
-	interface/cursor.cpp interface/cursor.h interface/game_msg.cpp \
-	interface/game_msg.h interface/interface.cpp \
-	interface/interface.h interface/joystick.cpp \
-	interface/joystick.h interface/keyboard.cpp \
-	interface/keyboard.h interface/loading_screen.cpp \
-	interface/loading_screen.h interface/man_machine_interface.cpp \
+	gui/tabs.cpp gui/tabs.h gui/talk_box.cpp gui/talk_box.h \
+	gui/text_box.cpp gui/text_box.h gui/widget.cpp gui/widget.h \
+	gui/widget_list.cpp gui/widget_list.h gui/big/button_pic.cpp \
+	gui/big/button_pic.h include/action.cpp include/action.h \
+	include/action_handler.cpp include/action_handler.h \
+	include/app.h main.cpp include/base.h include/binreloc.h \
+	include/binreloc.c include/constant.cpp include/constant.h \
+	include/singleton.cpp include/singleton.h interface/cursor.cpp \
+	interface/cursor.h interface/game_msg.cpp interface/game_msg.h \
+	interface/interface.cpp interface/interface.h \
+	interface/joystick.cpp interface/joystick.h \
+	interface/keyboard.cpp interface/keyboard.h \
+	interface/loading_screen.cpp interface/loading_screen.h \
+	interface/man_machine_interface.cpp \
 	interface/man_machine_interface.h interface/mouse.cpp \
 	interface/mouse.h interface/mouse_cursor.cpp \
 	interface/mouse_cursor.h interface/weapon_menu.cpp \
@@ -121,6 +117,7 @@ am__wormux_SOURCES_DIST = ai/ai_engine.cpp ai/ai_engine.h \
 	map/tileitem.cpp map/tileitem.h map/water.cpp map/water.h \
 	map/wind.cpp map/wind.h menu/credits_menu.cpp \
 	menu/credits_menu.h menu/game_menu.cpp menu/game_menu.h \
+	menu/game_mode_editor.cpp menu/game_mode_editor.h \
 	menu/help_menu.cpp menu/help_menu.h menu/main_menu.cpp \
 	menu/main_menu.h menu/map_selection_box.cpp \
 	menu/map_selection_box.h menu/menu.cpp menu/menu.h \
@@ -129,13 +126,13 @@ am__wormux_SOURCES_DIST = ai/ai_engine.cpp ai/ai_engine.h \
 	menu/network_menu.h menu/network_teams_selection_box.cpp \
 	menu/network_teams_selection_box.h menu/options_menu.cpp \
 	menu/options_menu.h menu/pause_menu.cpp menu/pause_menu.h \
-	menu/results_menu.cpp menu/results_menu.h menu/team_box.cpp \
-	menu/team_box.h menu/teams_selection_box.cpp \
-	menu/teams_selection_box.h network/admin_commands.cpp \
-	network/admin_commands.h network/chat.cpp network/chat.h \
-	network/chatlogger.cpp network/chatlogger.h \
-	network/distant_cpu.cpp network/distant_cpu.h \
-	network/download.cpp network/download.h \
+	menu/results_menu.cpp menu/results_menu.h menu/skin_menu.cpp \
+	menu/skin_menu.h menu/team_box.cpp menu/team_box.h \
+	menu/teams_selection_box.cpp menu/teams_selection_box.h \
+	network/admin_commands.cpp network/admin_commands.h \
+	network/chat.cpp network/chat.h network/chatlogger.cpp \
+	network/chatlogger.h network/distant_cpu.cpp \
+	network/distant_cpu.h network/download.cpp network/download.h \
 	network/index_server.cpp network/index_server.h \
 	network/index_svr_msg.h network/irc.cpp network/irc.h \
 	network/net_error_msg.cpp network/net_error_msg.h \
@@ -166,26 +163,29 @@ am__wormux_SOURCES_DIST = ai/ai_engine.cpp ai/ai_engine.h \
 	particles/teleport_member.h particles/water_drop.cpp \
 	particles/water_drop.h sound/jukebox.cpp sound/jukebox.h \
 	sound/sound_sample.cpp sound/sound_sample.h \
-	sound/sample_cache.cpp sound/sample_cache.h team/macro.h \
-	team/results.cpp team/results.h team/team_config.h \
-	team/team.cpp team/team.h team/team_energy.cpp \
-	team/team_energy.h team/teams_list.cpp team/teams_list.h \
-	tool/affine_transform.cpp tool/affine_transform.h \
-	tool/copynpaste.cpp tool/copynpaste.h tool/debug.cpp \
-	tool/debug.h tool/error.cpp tool/error.h tool/euler_vector.cpp \
-	tool/euler_vector.h tool/file_tools.cpp tool/file_tools.h \
-	tool/i18n.cpp tool/i18n.h tool/isnan.h tool/math_tools.h \
-	tool/random.cpp tool/random.h tool/rectangle.h tool/point.h \
-	tool/resource_manager.cpp tool/resource_manager.h \
-	tool/stats.cpp tool/stats.h tool/string_tools.cpp \
-	tool/string_tools.h tool/text_handling.cpp \
-	tool/text_handling.h tool/vector2.h tool/xml_document.cpp \
-	tool/xml_document.h weapon/air_attack.cpp weapon/air_attack.h \
-	weapon/airhammer.cpp weapon/airhammer.h weapon/all.h \
-	weapon/anvil.cpp weapon/anvil.h weapon/auto_bazooka.cpp \
-	weapon/auto_bazooka.h weapon/baseball.cpp weapon/baseball.h \
-	weapon/bazooka.cpp weapon/bazooka.h weapon/blowtorch.cpp \
-	weapon/blowtorch.h weapon/bounce_ball.cpp weapon/bounce_ball.h \
+	sound/sample_cache.cpp sound/sample_cache.h \
+	team/custom_team.cpp team/custom_team.h \
+	team/custom_teams_list.cpp team/custom_teams_list.h \
+	team/macro.h team/results.cpp team/results.h \
+	team/team_config.h team/team.cpp team/team.h \
+	team/team_energy.cpp team/team_energy.h team/teams_list.cpp \
+	team/teams_list.h tool/affine_transform.cpp \
+	tool/affine_transform.h tool/copynpaste.cpp tool/copynpaste.h \
+	tool/debug.cpp tool/debug.h tool/error.cpp tool/error.h \
+	tool/euler_vector.cpp tool/euler_vector.h tool/file_tools.cpp \
+	tool/file_tools.h tool/i18n.cpp tool/i18n.h tool/isnan.h \
+	tool/math_tools.h tool/random.cpp tool/random.h \
+	tool/rectangle.h tool/point.h tool/resource_manager.cpp \
+	tool/resource_manager.h tool/stats.cpp tool/stats.h \
+	tool/string_tools.cpp tool/string_tools.h \
+	tool/text_handling.cpp tool/text_handling.h tool/vector2.h \
+	tool/xml_document.cpp tool/xml_document.h \
+	weapon/air_attack.cpp weapon/air_attack.h weapon/airhammer.cpp \
+	weapon/airhammer.h weapon/all.h weapon/anvil.cpp \
+	weapon/anvil.h weapon/auto_bazooka.cpp weapon/auto_bazooka.h \
+	weapon/baseball.cpp weapon/baseball.h weapon/bazooka.cpp \
+	weapon/bazooka.h weapon/blowtorch.cpp weapon/blowtorch.h \
+	weapon/bounce_ball.cpp weapon/bounce_ball.h \
 	weapon/cluzooka.cpp weapon/cluzooka.h weapon/cluster_bomb.cpp \
 	weapon/cluster_bomb.h weapon/footbomb.cpp weapon/footbomb.h \
 	weapon/construct.cpp weapon/construct.h weapon/crosshair.cpp \
@@ -200,16 +200,17 @@ am__wormux_SOURCES_DIST = ai/ai_engine.cpp ai/ai_engine.h \
 	weapon/mine.h weapon/parachute.cpp weapon/parachute.h \
 	weapon/polecat.cpp weapon/polecat.h weapon/riot_bomb.cpp \
 	weapon/riot_bomb.h weapon/shotgun.cpp weapon/shotgun.h \
-	weapon/skip_turn.cpp weapon/skip_turn.h weapon/snipe_rifle.cpp \
-	weapon/snipe_rifle.h weapon/submachine_gun.cpp \
-	weapon/submachine_gun.h weapon/suicide.cpp weapon/suicide.h \
-	weapon/supertux.cpp weapon/supertux.h weapon/syringe.cpp \
-	weapon/syringe.h weapon/teleportation.cpp \
-	weapon/teleportation.h weapon/weapon_cfg.cpp \
-	weapon/weapon_cfg.h weapon/weapon.cpp weapon/weapon.h \
-	weapon/weapon_launcher.cpp weapon/weapon_launcher.h \
-	weapon/weapons_list.cpp weapon/weapons_list.h \
-	weapon/weapon_strength_bar.h wormux.rc wormux.ico
+	weapon/skip_turn.cpp weapon/skip_turn.h weapon/slap.cpp \
+	weapon/slap.h weapon/snipe_rifle.cpp weapon/snipe_rifle.h \
+	weapon/submachine_gun.cpp weapon/submachine_gun.h \
+	weapon/suicide.cpp weapon/suicide.h weapon/supertux.cpp \
+	weapon/supertux.h weapon/syringe.cpp weapon/syringe.h \
+	weapon/teleportation.cpp weapon/teleportation.h \
+	weapon/weapon_cfg.cpp weapon/weapon_cfg.h weapon/weapon.cpp \
+	weapon/weapon.h weapon/weapon_launcher.cpp \
+	weapon/weapon_launcher.h weapon/weapons_list.cpp \
+	weapon/weapons_list.h weapon/weapon_strength_bar.h wormux.rc \
+	wormux.ico
 @WIN32_TRUE at am__objects_1 = wormux.$(OBJEXT)
 am_wormux_OBJECTS = ai_engine.$(OBJEXT) ai_engine_stupid.$(OBJEXT) \
 	ai_movement_module.$(OBJEXT) ai_shoot_module.$(OBJEXT) \
@@ -231,22 +232,24 @@ am_wormux_OBJECTS = ai_engine.$(OBJEXT) ai_engine_stupid.$(OBJEXT) \
 	progress_bar.$(OBJEXT) question.$(OBJEXT) \
 	spin_button_big.$(OBJEXT) spin_button.$(OBJEXT) \
 	spin_button_picture.$(OBJEXT) tabs.$(OBJEXT) \
-	text_box.$(OBJEXT) widget.$(OBJEXT) widget_list.$(OBJEXT) \
-	button_pic.$(OBJEXT) action.$(OBJEXT) action_handler.$(OBJEXT) \
-	main.$(OBJEXT) binreloc.$(OBJEXT) constant.$(OBJEXT) \
-	singleton.$(OBJEXT) cursor.$(OBJEXT) game_msg.$(OBJEXT) \
-	interface.$(OBJEXT) joystick.$(OBJEXT) keyboard.$(OBJEXT) \
-	loading_screen.$(OBJEXT) man_machine_interface.$(OBJEXT) \
-	mouse.$(OBJEXT) mouse_cursor.$(OBJEXT) weapon_menu.$(OBJEXT) \
-	camera.$(OBJEXT) ground.$(OBJEXT) map.$(OBJEXT) \
-	maps_list.$(OBJEXT) random_map.$(OBJEXT) sky.$(OBJEXT) \
-	tile.$(OBJEXT) tileitem.$(OBJEXT) water.$(OBJEXT) \
-	wind.$(OBJEXT) credits_menu.$(OBJEXT) game_menu.$(OBJEXT) \
-	help_menu.$(OBJEXT) main_menu.$(OBJEXT) \
-	map_selection_box.$(OBJEXT) menu.$(OBJEXT) \
+	talk_box.$(OBJEXT) text_box.$(OBJEXT) widget.$(OBJEXT) \
+	widget_list.$(OBJEXT) button_pic.$(OBJEXT) action.$(OBJEXT) \
+	action_handler.$(OBJEXT) main.$(OBJEXT) binreloc.$(OBJEXT) \
+	constant.$(OBJEXT) singleton.$(OBJEXT) cursor.$(OBJEXT) \
+	game_msg.$(OBJEXT) interface.$(OBJEXT) joystick.$(OBJEXT) \
+	keyboard.$(OBJEXT) loading_screen.$(OBJEXT) \
+	man_machine_interface.$(OBJEXT) mouse.$(OBJEXT) \
+	mouse_cursor.$(OBJEXT) weapon_menu.$(OBJEXT) camera.$(OBJEXT) \
+	ground.$(OBJEXT) map.$(OBJEXT) maps_list.$(OBJEXT) \
+	random_map.$(OBJEXT) sky.$(OBJEXT) tile.$(OBJEXT) \
+	tileitem.$(OBJEXT) water.$(OBJEXT) wind.$(OBJEXT) \
+	credits_menu.$(OBJEXT) game_menu.$(OBJEXT) \
+	game_mode_editor.$(OBJEXT) help_menu.$(OBJEXT) \
+	main_menu.$(OBJEXT) map_selection_box.$(OBJEXT) menu.$(OBJEXT) \
 	network_connection_menu.$(OBJEXT) network_menu.$(OBJEXT) \
 	network_teams_selection_box.$(OBJEXT) options_menu.$(OBJEXT) \
-	pause_menu.$(OBJEXT) results_menu.$(OBJEXT) team_box.$(OBJEXT) \
+	pause_menu.$(OBJEXT) results_menu.$(OBJEXT) \
+	skin_menu.$(OBJEXT) team_box.$(OBJEXT) \
 	teams_selection_box.$(OBJEXT) admin_commands.$(OBJEXT) \
 	chat.$(OBJEXT) chatlogger.$(OBJEXT) distant_cpu.$(OBJEXT) \
 	download.$(OBJEXT) index_server.$(OBJEXT) irc.$(OBJEXT) \
@@ -262,7 +265,8 @@ am_wormux_OBJECTS = ai_engine.$(OBJEXT) ai_engine_stupid.$(OBJEXT) \
 	magic_star.$(OBJEXT) particle.$(OBJEXT) polecat_fart.$(OBJEXT) \
 	smoke.$(OBJEXT) star.$(OBJEXT) teleport_member.$(OBJEXT) \
 	water_drop.$(OBJEXT) jukebox.$(OBJEXT) sound_sample.$(OBJEXT) \
-	sample_cache.$(OBJEXT) results.$(OBJEXT) team.$(OBJEXT) \
+	sample_cache.$(OBJEXT) custom_team.$(OBJEXT) \
+	custom_teams_list.$(OBJEXT) results.$(OBJEXT) team.$(OBJEXT) \
 	team_energy.$(OBJEXT) teams_list.$(OBJEXT) \
 	affine_transform.$(OBJEXT) copynpaste.$(OBJEXT) \
 	debug.$(OBJEXT) error.$(OBJEXT) euler_vector.$(OBJEXT) \
@@ -279,14 +283,15 @@ am_wormux_OBJECTS = ai_engine.$(OBJEXT) ai_engine_stupid.$(OBJEXT) \
 	grapple.$(OBJEXT) grenade.$(OBJEXT) gun.$(OBJEXT) \
 	jetpack.$(OBJEXT) lowgrav.$(OBJEXT) mine.$(OBJEXT) \
 	parachute.$(OBJEXT) polecat.$(OBJEXT) riot_bomb.$(OBJEXT) \
-	shotgun.$(OBJEXT) skip_turn.$(OBJEXT) snipe_rifle.$(OBJEXT) \
-	submachine_gun.$(OBJEXT) suicide.$(OBJEXT) supertux.$(OBJEXT) \
-	syringe.$(OBJEXT) teleportation.$(OBJEXT) weapon_cfg.$(OBJEXT) \
-	weapon.$(OBJEXT) weapon_launcher.$(OBJEXT) \
-	weapons_list.$(OBJEXT) $(am__objects_1)
+	shotgun.$(OBJEXT) skip_turn.$(OBJEXT) slap.$(OBJEXT) \
+	snipe_rifle.$(OBJEXT) submachine_gun.$(OBJEXT) \
+	suicide.$(OBJEXT) supertux.$(OBJEXT) syringe.$(OBJEXT) \
+	teleportation.$(OBJEXT) weapon_cfg.$(OBJEXT) weapon.$(OBJEXT) \
+	weapon_launcher.$(OBJEXT) weapons_list.$(OBJEXT) \
+	$(am__objects_1)
 wormux_OBJECTS = $(am_wormux_OBJECTS)
 wormux_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I. at am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -302,23 +307,22 @@ SOURCES = $(wormux_SOURCES)
 DIST_SOURCES = $(am__wormux_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
-AUTOPACKAGE_FALSE = @AUTOPACKAGE_FALSE@
-AUTOPACKAGE_TRUE = @AUTOPACKAGE_TRUE@
 AWK = @AWK@
 BUILD_ENV = @BUILD_ENV@
 CC = @CC@
@@ -340,13 +344,10 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FONTFILE = @FONTFILE@
-GCC_FALSE = @GCC_FALSE@
-GCC_TRUE = @GCC_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-INCLUDEDINTL_FALSE = @INCLUDEDINTL_FALSE@
-INCLUDEDINTL_TRUE = @INCLUDEDINTL_TRUE@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -359,12 +360,13 @@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@ $(am__append_3) $(am__append_4) $(am__append_5)
+LIBS = @LIBS@ $(am__append_2) $(am__append_3) $(am__append_4)
 LOCALEDIR = @LOCALEDIR@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -384,23 +386,19 @@ SDL_GFX_PREFIX = @SDL_GFX_PREFIX@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STATIC_FALSE = @STATIC_FALSE@
-STATIC_TRUE = @STATIC_TRUE@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WIN32_FALSE = @WIN32_FALSE@
-WIN32_TRUE = @WIN32_TRUE@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 _libcurl_config = @_libcurl_config@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -412,6 +410,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cxx_present = @cxx_present@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -440,12 +439,15 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = .
 wormux_SOURCES = ai/ai_engine.cpp ai/ai_engine.h \
 	ai/ai_engine_stupid.cpp ai/ai_engine_stupid.h \
@@ -487,19 +489,20 @@ wormux_SOURCES = ai/ai_engine.cpp ai/ai_engine.h \
 	gui/question.h gui/spin_button_big.cpp gui/spin_button_big.h \
 	gui/spin_button.cpp gui/spin_button.h \
 	gui/spin_button_picture.cpp gui/spin_button_picture.h \
-	gui/tabs.cpp gui/tabs.h gui/text_box.cpp gui/text_box.h \
-	gui/widget.cpp gui/widget.h gui/widget_list.cpp \
-	gui/widget_list.h gui/big/button_pic.cpp gui/big/button_pic.h \
-	include/action.cpp include/action.h include/action_handler.cpp \
-	include/action_handler.h include/app.h main.cpp include/base.h \
-	include/binreloc.h include/binreloc.c include/constant.cpp \
-	include/constant.h include/singleton.cpp include/singleton.h \
-	interface/cursor.cpp interface/cursor.h interface/game_msg.cpp \
-	interface/game_msg.h interface/interface.cpp \
-	interface/interface.h interface/joystick.cpp \
-	interface/joystick.h interface/keyboard.cpp \
-	interface/keyboard.h interface/loading_screen.cpp \
-	interface/loading_screen.h interface/man_machine_interface.cpp \
+	gui/tabs.cpp gui/tabs.h gui/talk_box.cpp gui/talk_box.h \
+	gui/text_box.cpp gui/text_box.h gui/widget.cpp gui/widget.h \
+	gui/widget_list.cpp gui/widget_list.h gui/big/button_pic.cpp \
+	gui/big/button_pic.h include/action.cpp include/action.h \
+	include/action_handler.cpp include/action_handler.h \
+	include/app.h main.cpp include/base.h include/binreloc.h \
+	include/binreloc.c include/constant.cpp include/constant.h \
+	include/singleton.cpp include/singleton.h interface/cursor.cpp \
+	interface/cursor.h interface/game_msg.cpp interface/game_msg.h \
+	interface/interface.cpp interface/interface.h \
+	interface/joystick.cpp interface/joystick.h \
+	interface/keyboard.cpp interface/keyboard.h \
+	interface/loading_screen.cpp interface/loading_screen.h \
+	interface/man_machine_interface.cpp \
 	interface/man_machine_interface.h interface/mouse.cpp \
 	interface/mouse.h interface/mouse_cursor.cpp \
 	interface/mouse_cursor.h interface/weapon_menu.cpp \
@@ -510,6 +513,7 @@ wormux_SOURCES = ai/ai_engine.cpp ai/ai_engine.h \
 	map/tileitem.cpp map/tileitem.h map/water.cpp map/water.h \
 	map/wind.cpp map/wind.h menu/credits_menu.cpp \
 	menu/credits_menu.h menu/game_menu.cpp menu/game_menu.h \
+	menu/game_mode_editor.cpp menu/game_mode_editor.h \
 	menu/help_menu.cpp menu/help_menu.h menu/main_menu.cpp \
 	menu/main_menu.h menu/map_selection_box.cpp \
 	menu/map_selection_box.h menu/menu.cpp menu/menu.h \
@@ -518,13 +522,13 @@ wormux_SOURCES = ai/ai_engine.cpp ai/ai_engine.h \
 	menu/network_menu.h menu/network_teams_selection_box.cpp \
 	menu/network_teams_selection_box.h menu/options_menu.cpp \
 	menu/options_menu.h menu/pause_menu.cpp menu/pause_menu.h \
-	menu/results_menu.cpp menu/results_menu.h menu/team_box.cpp \
-	menu/team_box.h menu/teams_selection_box.cpp \
-	menu/teams_selection_box.h network/admin_commands.cpp \
-	network/admin_commands.h network/chat.cpp network/chat.h \
-	network/chatlogger.cpp network/chatlogger.h \
-	network/distant_cpu.cpp network/distant_cpu.h \
-	network/download.cpp network/download.h \
+	menu/results_menu.cpp menu/results_menu.h menu/skin_menu.cpp \
+	menu/skin_menu.h menu/team_box.cpp menu/team_box.h \
+	menu/teams_selection_box.cpp menu/teams_selection_box.h \
+	network/admin_commands.cpp network/admin_commands.h \
+	network/chat.cpp network/chat.h network/chatlogger.cpp \
+	network/chatlogger.h network/distant_cpu.cpp \
+	network/distant_cpu.h network/download.cpp network/download.h \
 	network/index_server.cpp network/index_server.h \
 	network/index_svr_msg.h network/irc.cpp network/irc.h \
 	network/net_error_msg.cpp network/net_error_msg.h \
@@ -555,26 +559,29 @@ wormux_SOURCES = ai/ai_engine.cpp ai/ai_engine.h \
 	particles/teleport_member.h particles/water_drop.cpp \
 	particles/water_drop.h sound/jukebox.cpp sound/jukebox.h \
 	sound/sound_sample.cpp sound/sound_sample.h \
-	sound/sample_cache.cpp sound/sample_cache.h team/macro.h \
-	team/results.cpp team/results.h team/team_config.h \
-	team/team.cpp team/team.h team/team_energy.cpp \
-	team/team_energy.h team/teams_list.cpp team/teams_list.h \
-	tool/affine_transform.cpp tool/affine_transform.h \
-	tool/copynpaste.cpp tool/copynpaste.h tool/debug.cpp \
-	tool/debug.h tool/error.cpp tool/error.h tool/euler_vector.cpp \
-	tool/euler_vector.h tool/file_tools.cpp tool/file_tools.h \
-	tool/i18n.cpp tool/i18n.h tool/isnan.h tool/math_tools.h \
-	tool/random.cpp tool/random.h tool/rectangle.h tool/point.h \
-	tool/resource_manager.cpp tool/resource_manager.h \
-	tool/stats.cpp tool/stats.h tool/string_tools.cpp \
-	tool/string_tools.h tool/text_handling.cpp \
-	tool/text_handling.h tool/vector2.h tool/xml_document.cpp \
-	tool/xml_document.h weapon/air_attack.cpp weapon/air_attack.h \
-	weapon/airhammer.cpp weapon/airhammer.h weapon/all.h \
-	weapon/anvil.cpp weapon/anvil.h weapon/auto_bazooka.cpp \
-	weapon/auto_bazooka.h weapon/baseball.cpp weapon/baseball.h \
-	weapon/bazooka.cpp weapon/bazooka.h weapon/blowtorch.cpp \
-	weapon/blowtorch.h weapon/bounce_ball.cpp weapon/bounce_ball.h \
+	sound/sample_cache.cpp sound/sample_cache.h \
+	team/custom_team.cpp team/custom_team.h \
+	team/custom_teams_list.cpp team/custom_teams_list.h \
+	team/macro.h team/results.cpp team/results.h \
+	team/team_config.h team/team.cpp team/team.h \
+	team/team_energy.cpp team/team_energy.h team/teams_list.cpp \
+	team/teams_list.h tool/affine_transform.cpp \
+	tool/affine_transform.h tool/copynpaste.cpp tool/copynpaste.h \
+	tool/debug.cpp tool/debug.h tool/error.cpp tool/error.h \
+	tool/euler_vector.cpp tool/euler_vector.h tool/file_tools.cpp \
+	tool/file_tools.h tool/i18n.cpp tool/i18n.h tool/isnan.h \
+	tool/math_tools.h tool/random.cpp tool/random.h \
+	tool/rectangle.h tool/point.h tool/resource_manager.cpp \
+	tool/resource_manager.h tool/stats.cpp tool/stats.h \
+	tool/string_tools.cpp tool/string_tools.h \
+	tool/text_handling.cpp tool/text_handling.h tool/vector2.h \
+	tool/xml_document.cpp tool/xml_document.h \
+	weapon/air_attack.cpp weapon/air_attack.h weapon/airhammer.cpp \
+	weapon/airhammer.h weapon/all.h weapon/anvil.cpp \
+	weapon/anvil.h weapon/auto_bazooka.cpp weapon/auto_bazooka.h \
+	weapon/baseball.cpp weapon/baseball.h weapon/bazooka.cpp \
+	weapon/bazooka.h weapon/blowtorch.cpp weapon/blowtorch.h \
+	weapon/bounce_ball.cpp weapon/bounce_ball.h \
 	weapon/cluzooka.cpp weapon/cluzooka.h weapon/cluster_bomb.cpp \
 	weapon/cluster_bomb.h weapon/footbomb.cpp weapon/footbomb.h \
 	weapon/construct.cpp weapon/construct.h weapon/crosshair.cpp \
@@ -589,21 +596,22 @@ wormux_SOURCES = ai/ai_engine.cpp ai/ai_engine.h \
 	weapon/mine.h weapon/parachute.cpp weapon/parachute.h \
 	weapon/polecat.cpp weapon/polecat.h weapon/riot_bomb.cpp \
 	weapon/riot_bomb.h weapon/shotgun.cpp weapon/shotgun.h \
-	weapon/skip_turn.cpp weapon/skip_turn.h weapon/snipe_rifle.cpp \
-	weapon/snipe_rifle.h weapon/submachine_gun.cpp \
-	weapon/submachine_gun.h weapon/suicide.cpp weapon/suicide.h \
-	weapon/supertux.cpp weapon/supertux.h weapon/syringe.cpp \
-	weapon/syringe.h weapon/teleportation.cpp \
-	weapon/teleportation.h weapon/weapon_cfg.cpp \
-	weapon/weapon_cfg.h weapon/weapon.cpp weapon/weapon.h \
-	weapon/weapon_launcher.cpp weapon/weapon_launcher.h \
-	weapon/weapons_list.cpp weapon/weapons_list.h \
-	weapon/weapon_strength_bar.h $(am__append_1)
+	weapon/skip_turn.cpp weapon/skip_turn.h weapon/slap.cpp \
+	weapon/slap.h weapon/snipe_rifle.cpp weapon/snipe_rifle.h \
+	weapon/submachine_gun.cpp weapon/submachine_gun.h \
+	weapon/suicide.cpp weapon/suicide.h weapon/supertux.cpp \
+	weapon/supertux.h weapon/syringe.cpp weapon/syringe.h \
+	weapon/teleportation.cpp weapon/teleportation.h \
+	weapon/weapon_cfg.cpp weapon/weapon_cfg.h weapon/weapon.cpp \
+	weapon/weapon.h weapon/weapon_launcher.cpp \
+	weapon/weapon_launcher.h weapon/weapons_list.cpp \
+	weapon/weapons_list.h weapon/weapon_strength_bar.h \
+	$(am__append_1)
 @AUTOPACKAGE_TRUE at DEFINE_AUTOPACKAGE = -DUSE_AUTOPACKAGE
 AM_CXXFLAGS = -I $(top_srcdir)/src -DINSTALL_DATADIR=\"@DATADIR@\" \
 	-DINSTALL_LOCALEDIR=\"@LOCALEDIR@\" -DFONT_FILE=\"@FONTFILE@\" \
 	-DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" $(DEFINE_AUTOPACKAGE) \
-	@LIBCURL_CPPFLAGS@ $(am__append_2)
+	@LIBCURL_CPPFLAGS@ -Werror
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -642,7 +650,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -657,7 +665,7 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -680,7 +688,7 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 wormux$(EXEEXT): $(wormux_OBJECTS) $(wormux_DEPENDENCIES) 
 	@rm -f wormux$(EXEEXT)
-	$(CXXLINK) $(wormux_LDFLAGS) $(wormux_OBJECTS) $(wormux_LDADD) $(LIBS)
+	$(CXXLINK) $(wormux_OBJECTS) $(wormux_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -733,6 +741,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/credits_menu.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/crosshair.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cursor.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/custom_team.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/custom_teams_list.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/damage_stats.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dark_smoke.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/debug.Po at am__quote@
@@ -759,6 +769,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/game_init.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/game_menu.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/game_mode.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/game_mode_editor.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/game_msg.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnu.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grapple.Po at am__quote@
@@ -832,8 +843,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sample_cache.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shotgun.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/singleton.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/skin_menu.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/skip_turn.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sky.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/slap.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smoke.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snipe_rifle.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/socket.Po at am__quote@
@@ -854,6 +867,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/surface.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/syringe.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tabs.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/talk_box.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/team.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/team_box.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/team_energy.Po at am__quote@
@@ -882,2707 +896,2790 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xml_document.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 binreloc.o: include/binreloc.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT binreloc.o -MD -MP -MF "$(DEPDIR)/binreloc.Tpo" -c -o binreloc.o `test -f 'include/binreloc.c' || echo '$(srcdir)/'`include/binreloc.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/binreloc.Tpo" "$(DEPDIR)/binreloc.Po"; else rm -f "$(DEPDIR)/binreloc.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT binreloc.o -MD -MP -MF $(DEPDIR)/binreloc.Tpo -c -o binreloc.o `test -f 'include/binreloc.c' || echo '$(srcdir)/'`include/binreloc.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/binreloc.Tpo $(DEPDIR)/binreloc.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='include/binreloc.c' object='binreloc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o binreloc.o `test -f 'include/binreloc.c' || echo '$(srcdir)/'`include/binreloc.c
 
 binreloc.obj: include/binreloc.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT binreloc.obj -MD -MP -MF "$(DEPDIR)/binreloc.Tpo" -c -o binreloc.obj `if test -f 'include/binreloc.c'; then $(CYGPATH_W) 'include/binreloc.c'; else $(CYGPATH_W) '$(srcdir)/include/binreloc.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/binreloc.Tpo" "$(DEPDIR)/binreloc.Po"; else rm -f "$(DEPDIR)/binreloc.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT binreloc.obj -MD -MP -MF $(DEPDIR)/binreloc.Tpo -c -o binreloc.obj `if test -f 'include/binreloc.c'; then $(CYGPATH_W) 'include/binreloc.c'; else $(CYGPATH_W) '$(srcdir)/include/binreloc.c'; fi`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/binreloc.Tpo $(DEPDIR)/binreloc.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='include/binreloc.c' object='binreloc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o binreloc.obj `if test -f 'include/binreloc.c'; then $(CYGPATH_W) 'include/binreloc.c'; else $(CYGPATH_W) '$(srcdir)/include/binreloc.c'; fi`
 
 .cpp.o:
- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 ai_engine.o: ai/ai_engine.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_engine.o -MD -MP -MF "$(DEPDIR)/ai_engine.Tpo" -c -o ai_engine.o `test -f 'ai/ai_engine.cpp' || echo '$(srcdir)/'`ai/ai_engine.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ai_engine.Tpo" "$(DEPDIR)/ai_engine.Po"; else rm -f "$(DEPDIR)/ai_engine.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_engine.o -MD -MP -MF $(DEPDIR)/ai_engine.Tpo -c -o ai_engine.o `test -f 'ai/ai_engine.cpp' || echo '$(srcdir)/'`ai/ai_engine.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ai_engine.Tpo $(DEPDIR)/ai_engine.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ai/ai_engine.cpp' object='ai_engine.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai_engine.o `test -f 'ai/ai_engine.cpp' || echo '$(srcdir)/'`ai/ai_engine.cpp
 
 ai_engine.obj: ai/ai_engine.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_engine.obj -MD -MP -MF "$(DEPDIR)/ai_engine.Tpo" -c -o ai_engine.obj `if test -f 'ai/ai_engine.cpp'; then $(CYGPATH_W) 'ai/ai_engine.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_engine.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ai_engine.Tpo" "$(DEPDIR)/ai_engine.Po"; else rm -f "$(DEPDIR)/ai_engine.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_engine.obj -MD -MP -MF $(DEPDIR)/ai_engine.Tpo -c -o ai_engine.obj `if test -f 'ai/ai_engine.cpp'; then $(CYGPATH_W) 'ai/ai_engine.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_engine.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ai_engine.Tpo $(DEPDIR)/ai_engine.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ai/ai_engine.cpp' object='ai_engine.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai_engine.obj `if test -f 'ai/ai_engine.cpp'; then $(CYGPATH_W) 'ai/ai_engine.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_engine.cpp'; fi`
 
 ai_engine_stupid.o: ai/ai_engine_stupid.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_engine_stupid.o -MD -MP -MF "$(DEPDIR)/ai_engine_stupid.Tpo" -c -o ai_engine_stupid.o `test -f 'ai/ai_engine_stupid.cpp' || echo '$(srcdir)/'`ai/ai_engine_stupid.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ai_engine_stupid.Tpo" "$(DEPDIR)/ai_engine_stupid.Po"; else rm -f "$(DEPDIR)/ai_engine_stupid.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_engine_stupid.o -MD -MP -MF $(DEPDIR)/ai_engine_stupid.Tpo -c -o ai_engine_stupid.o `test -f 'ai/ai_engine_stupid.cpp' || echo '$(srcdir)/'`ai/ai_engine_stupid.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ai_engine_stupid.Tpo $(DEPDIR)/ai_engine_stupid.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ai/ai_engine_stupid.cpp' object='ai_engine_stupid.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai_engine_stupid.o `test -f 'ai/ai_engine_stupid.cpp' || echo '$(srcdir)/'`ai/ai_engine_stupid.cpp
 
 ai_engine_stupid.obj: ai/ai_engine_stupid.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_engine_stupid.obj -MD -MP -MF "$(DEPDIR)/ai_engine_stupid.Tpo" -c -o ai_engine_stupid.obj `if test -f 'ai/ai_engine_stupid.cpp'; then $(CYGPATH_W) 'ai/ai_engine_stupid.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_engine_stupid.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ai_engine_stupid.Tpo" "$(DEPDIR)/ai_engine_stupid.Po"; else rm -f "$(DEPDIR)/ai_engine_stupid.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_engine_stupid.obj -MD -MP -MF $(DEPDIR)/ai_engine_stupid.Tpo -c -o ai_engine_stupid.obj `if test -f 'ai/ai_engine_stupid.cpp'; then $(CYGPATH_W) 'ai/ai_engine_stupid.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_engine_stupid.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ai_engine_stupid.Tpo $(DEPDIR)/ai_engine_stupid.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ai/ai_engine_stupid.cpp' object='ai_engine_stupid.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai_engine_stupid.obj `if test -f 'ai/ai_engine_stupid.cpp'; then $(CYGPATH_W) 'ai/ai_engine_stupid.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_engine_stupid.cpp'; fi`
 
 ai_movement_module.o: ai/ai_movement_module.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_movement_module.o -MD -MP -MF "$(DEPDIR)/ai_movement_module.Tpo" -c -o ai_movement_module.o `test -f 'ai/ai_movement_module.cpp' || echo '$(srcdir)/'`ai/ai_movement_module.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ai_movement_module.Tpo" "$(DEPDIR)/ai_movement_module.Po"; else rm -f "$(DEPDIR)/ai_movement_module.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_movement_module.o -MD -MP -MF $(DEPDIR)/ai_movement_module.Tpo -c -o ai_movement_module.o `test -f 'ai/ai_movement_module.cpp' || echo '$(srcdir)/'`ai/ai_movement_module.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ai_movement_module.Tpo $(DEPDIR)/ai_movement_module.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ai/ai_movement_module.cpp' object='ai_movement_module.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai_movement_module.o `test -f 'ai/ai_movement_module.cpp' || echo '$(srcdir)/'`ai/ai_movement_module.cpp
 
 ai_movement_module.obj: ai/ai_movement_module.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_movement_module.obj -MD -MP -MF "$(DEPDIR)/ai_movement_module.Tpo" -c -o ai_movement_module.obj `if test -f 'ai/ai_movement_module.cpp'; then $(CYGPATH_W) 'ai/ai_movement_module.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_movement_module.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ai_movement_module.Tpo" "$(DEPDIR)/ai_movement_module.Po"; else rm -f "$(DEPDIR)/ai_movement_module.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_movement_module.obj -MD -MP -MF $(DEPDIR)/ai_movement_module.Tpo -c -o ai_movement_module.obj `if test -f 'ai/ai_movement_module.cpp'; then $(CYGPATH_W) 'ai/ai_movement_module.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_movement_module.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ai_movement_module.Tpo $(DEPDIR)/ai_movement_module.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ai/ai_movement_module.cpp' object='ai_movement_module.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai_movement_module.obj `if test -f 'ai/ai_movement_module.cpp'; then $(CYGPATH_W) 'ai/ai_movement_module.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_movement_module.cpp'; fi`
 
 ai_shoot_module.o: ai/ai_shoot_module.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_shoot_module.o -MD -MP -MF "$(DEPDIR)/ai_shoot_module.Tpo" -c -o ai_shoot_module.o `test -f 'ai/ai_shoot_module.cpp' || echo '$(srcdir)/'`ai/ai_shoot_module.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ai_shoot_module.Tpo" "$(DEPDIR)/ai_shoot_module.Po"; else rm -f "$(DEPDIR)/ai_shoot_module.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_shoot_module.o -MD -MP -MF $(DEPDIR)/ai_shoot_module.Tpo -c -o ai_shoot_module.o `test -f 'ai/ai_shoot_module.cpp' || echo '$(srcdir)/'`ai/ai_shoot_module.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ai_shoot_module.Tpo $(DEPDIR)/ai_shoot_module.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ai/ai_shoot_module.cpp' object='ai_shoot_module.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai_shoot_module.o `test -f 'ai/ai_shoot_module.cpp' || echo '$(srcdir)/'`ai/ai_shoot_module.cpp
 
 ai_shoot_module.obj: ai/ai_shoot_module.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_shoot_module.obj -MD -MP -MF "$(DEPDIR)/ai_shoot_module.Tpo" -c -o ai_shoot_module.obj `if test -f 'ai/ai_shoot_module.cpp'; then $(CYGPATH_W) 'ai/ai_shoot_module.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_shoot_module.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ai_shoot_module.Tpo" "$(DEPDIR)/ai_shoot_module.Po"; else rm -f "$(DEPDIR)/ai_shoot_module.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ai_shoot_module.obj -MD -MP -MF $(DEPDIR)/ai_shoot_module.Tpo -c -o ai_shoot_module.obj `if test -f 'ai/ai_shoot_module.cpp'; then $(CYGPATH_W) 'ai/ai_shoot_module.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_shoot_module.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ai_shoot_module.Tpo $(DEPDIR)/ai_shoot_module.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ai/ai_shoot_module.cpp' object='ai_shoot_module.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ai_shoot_module.obj `if test -f 'ai/ai_shoot_module.cpp'; then $(CYGPATH_W) 'ai/ai_shoot_module.cpp'; else $(CYGPATH_W) '$(srcdir)/ai/ai_shoot_module.cpp'; fi`
 
 body.o: character/body.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body.o -MD -MP -MF "$(DEPDIR)/body.Tpo" -c -o body.o `test -f 'character/body.cpp' || echo '$(srcdir)/'`character/body.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/body.Tpo" "$(DEPDIR)/body.Po"; else rm -f "$(DEPDIR)/body.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body.o -MD -MP -MF $(DEPDIR)/body.Tpo -c -o body.o `test -f 'character/body.cpp' || echo '$(srcdir)/'`character/body.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/body.Tpo $(DEPDIR)/body.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/body.cpp' object='body.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o body.o `test -f 'character/body.cpp' || echo '$(srcdir)/'`character/body.cpp
 
 body.obj: character/body.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body.obj -MD -MP -MF "$(DEPDIR)/body.Tpo" -c -o body.obj `if test -f 'character/body.cpp'; then $(CYGPATH_W) 'character/body.cpp'; else $(CYGPATH_W) '$(srcdir)/character/body.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/body.Tpo" "$(DEPDIR)/body.Po"; else rm -f "$(DEPDIR)/body.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body.obj -MD -MP -MF $(DEPDIR)/body.Tpo -c -o body.obj `if test -f 'character/body.cpp'; then $(CYGPATH_W) 'character/body.cpp'; else $(CYGPATH_W) '$(srcdir)/character/body.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/body.Tpo $(DEPDIR)/body.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/body.cpp' object='body.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o body.obj `if test -f 'character/body.cpp'; then $(CYGPATH_W) 'character/body.cpp'; else $(CYGPATH_W) '$(srcdir)/character/body.cpp'; fi`
 
 body_list.o: character/body_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body_list.o -MD -MP -MF "$(DEPDIR)/body_list.Tpo" -c -o body_list.o `test -f 'character/body_list.cpp' || echo '$(srcdir)/'`character/body_list.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/body_list.Tpo" "$(DEPDIR)/body_list.Po"; else rm -f "$(DEPDIR)/body_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body_list.o -MD -MP -MF $(DEPDIR)/body_list.Tpo -c -o body_list.o `test -f 'character/body_list.cpp' || echo '$(srcdir)/'`character/body_list.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/body_list.Tpo $(DEPDIR)/body_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/body_list.cpp' object='body_list.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o body_list.o `test -f 'character/body_list.cpp' || echo '$(srcdir)/'`character/body_list.cpp
 
 body_list.obj: character/body_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body_list.obj -MD -MP -MF "$(DEPDIR)/body_list.Tpo" -c -o body_list.obj `if test -f 'character/body_list.cpp'; then $(CYGPATH_W) 'character/body_list.cpp'; else $(CYGPATH_W) '$(srcdir)/character/body_list.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/body_list.Tpo" "$(DEPDIR)/body_list.Po"; else rm -f "$(DEPDIR)/body_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body_list.obj -MD -MP -MF $(DEPDIR)/body_list.Tpo -c -o body_list.obj `if test -f 'character/body_list.cpp'; then $(CYGPATH_W) 'character/body_list.cpp'; else $(CYGPATH_W) '$(srcdir)/character/body_list.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/body_list.Tpo $(DEPDIR)/body_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/body_list.cpp' object='body_list.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o body_list.obj `if test -f 'character/body_list.cpp'; then $(CYGPATH_W) 'character/body_list.cpp'; else $(CYGPATH_W) '$(srcdir)/character/body_list.cpp'; fi`
 
 character.o: character/character.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT character.o -MD -MP -MF "$(DEPDIR)/character.Tpo" -c -o character.o `test -f 'character/character.cpp' || echo '$(srcdir)/'`character/character.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/character.Tpo" "$(DEPDIR)/character.Po"; else rm -f "$(DEPDIR)/character.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT character.o -MD -MP -MF $(DEPDIR)/character.Tpo -c -o character.o `test -f 'character/character.cpp' || echo '$(srcdir)/'`character/character.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/character.Tpo $(DEPDIR)/character.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/character.cpp' object='character.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o character.o `test -f 'character/character.cpp' || echo '$(srcdir)/'`character/character.cpp
 
 character.obj: character/character.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT character.obj -MD -MP -MF "$(DEPDIR)/character.Tpo" -c -o character.obj `if test -f 'character/character.cpp'; then $(CYGPATH_W) 'character/character.cpp'; else $(CYGPATH_W) '$(srcdir)/character/character.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/character.Tpo" "$(DEPDIR)/character.Po"; else rm -f "$(DEPDIR)/character.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT character.obj -MD -MP -MF $(DEPDIR)/character.Tpo -c -o character.obj `if test -f 'character/character.cpp'; then $(CYGPATH_W) 'character/character.cpp'; else $(CYGPATH_W) '$(srcdir)/character/character.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/character.Tpo $(DEPDIR)/character.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/character.cpp' object='character.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o character.obj `if test -f 'character/character.cpp'; then $(CYGPATH_W) 'character/character.cpp'; else $(CYGPATH_W) '$(srcdir)/character/character.cpp'; fi`
 
 clothe.o: character/clothe.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT clothe.o -MD -MP -MF "$(DEPDIR)/clothe.Tpo" -c -o clothe.o `test -f 'character/clothe.cpp' || echo '$(srcdir)/'`character/clothe.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/clothe.Tpo" "$(DEPDIR)/clothe.Po"; else rm -f "$(DEPDIR)/clothe.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT clothe.o -MD -MP -MF $(DEPDIR)/clothe.Tpo -c -o clothe.o `test -f 'character/clothe.cpp' || echo '$(srcdir)/'`character/clothe.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/clothe.Tpo $(DEPDIR)/clothe.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/clothe.cpp' object='clothe.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o clothe.o `test -f 'character/clothe.cpp' || echo '$(srcdir)/'`character/clothe.cpp
 
 clothe.obj: character/clothe.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT clothe.obj -MD -MP -MF "$(DEPDIR)/clothe.Tpo" -c -o clothe.obj `if test -f 'character/clothe.cpp'; then $(CYGPATH_W) 'character/clothe.cpp'; else $(CYGPATH_W) '$(srcdir)/character/clothe.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/clothe.Tpo" "$(DEPDIR)/clothe.Po"; else rm -f "$(DEPDIR)/clothe.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT clothe.obj -MD -MP -MF $(DEPDIR)/clothe.Tpo -c -o clothe.obj `if test -f 'character/clothe.cpp'; then $(CYGPATH_W) 'character/clothe.cpp'; else $(CYGPATH_W) '$(srcdir)/character/clothe.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/clothe.Tpo $(DEPDIR)/clothe.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/clothe.cpp' object='clothe.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o clothe.obj `if test -f 'character/clothe.cpp'; then $(CYGPATH_W) 'character/clothe.cpp'; else $(CYGPATH_W) '$(srcdir)/character/clothe.cpp'; fi`
 
 damage_stats.o: character/damage_stats.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT damage_stats.o -MD -MP -MF "$(DEPDIR)/damage_stats.Tpo" -c -o damage_stats.o `test -f 'character/damage_stats.cpp' || echo '$(srcdir)/'`character/damage_stats.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/damage_stats.Tpo" "$(DEPDIR)/damage_stats.Po"; else rm -f "$(DEPDIR)/damage_stats.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT damage_stats.o -MD -MP -MF $(DEPDIR)/damage_stats.Tpo -c -o damage_stats.o `test -f 'character/damage_stats.cpp' || echo '$(srcdir)/'`character/damage_stats.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/damage_stats.Tpo $(DEPDIR)/damage_stats.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/damage_stats.cpp' object='damage_stats.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o damage_stats.o `test -f 'character/damage_stats.cpp' || echo '$(srcdir)/'`character/damage_stats.cpp
 
 damage_stats.obj: character/damage_stats.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT damage_stats.obj -MD -MP -MF "$(DEPDIR)/damage_stats.Tpo" -c -o damage_stats.obj `if test -f 'character/damage_stats.cpp'; then $(CYGPATH_W) 'character/damage_stats.cpp'; else $(CYGPATH_W) '$(srcdir)/character/damage_stats.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/damage_stats.Tpo" "$(DEPDIR)/damage_stats.Po"; else rm -f "$(DEPDIR)/damage_stats.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT damage_stats.obj -MD -MP -MF $(DEPDIR)/damage_stats.Tpo -c -o damage_stats.obj `if test -f 'character/damage_stats.cpp'; then $(CYGPATH_W) 'character/damage_stats.cpp'; else $(CYGPATH_W) '$(srcdir)/character/damage_stats.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/damage_stats.Tpo $(DEPDIR)/damage_stats.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/damage_stats.cpp' object='damage_stats.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o damage_stats.obj `if test -f 'character/damage_stats.cpp'; then $(CYGPATH_W) 'character/damage_stats.cpp'; else $(CYGPATH_W) '$(srcdir)/character/damage_stats.cpp'; fi`
 
 member.o: character/member.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT member.o -MD -MP -MF "$(DEPDIR)/member.Tpo" -c -o member.o `test -f 'character/member.cpp' || echo '$(srcdir)/'`character/member.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/member.Tpo" "$(DEPDIR)/member.Po"; else rm -f "$(DEPDIR)/member.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT member.o -MD -MP -MF $(DEPDIR)/member.Tpo -c -o member.o `test -f 'character/member.cpp' || echo '$(srcdir)/'`character/member.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/member.Tpo $(DEPDIR)/member.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/member.cpp' object='member.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o member.o `test -f 'character/member.cpp' || echo '$(srcdir)/'`character/member.cpp
 
 member.obj: character/member.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT member.obj -MD -MP -MF "$(DEPDIR)/member.Tpo" -c -o member.obj `if test -f 'character/member.cpp'; then $(CYGPATH_W) 'character/member.cpp'; else $(CYGPATH_W) '$(srcdir)/character/member.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/member.Tpo" "$(DEPDIR)/member.Po"; else rm -f "$(DEPDIR)/member.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT member.obj -MD -MP -MF $(DEPDIR)/member.Tpo -c -o member.obj `if test -f 'character/member.cpp'; then $(CYGPATH_W) 'character/member.cpp'; else $(CYGPATH_W) '$(srcdir)/character/member.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/member.Tpo $(DEPDIR)/member.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/member.cpp' object='member.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o member.obj `if test -f 'character/member.cpp'; then $(CYGPATH_W) 'character/member.cpp'; else $(CYGPATH_W) '$(srcdir)/character/member.cpp'; fi`
 
 move.o: character/move.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT move.o -MD -MP -MF "$(DEPDIR)/move.Tpo" -c -o move.o `test -f 'character/move.cpp' || echo '$(srcdir)/'`character/move.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/move.Tpo" "$(DEPDIR)/move.Po"; else rm -f "$(DEPDIR)/move.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT move.o -MD -MP -MF $(DEPDIR)/move.Tpo -c -o move.o `test -f 'character/move.cpp' || echo '$(srcdir)/'`character/move.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/move.Tpo $(DEPDIR)/move.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/move.cpp' object='move.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o move.o `test -f 'character/move.cpp' || echo '$(srcdir)/'`character/move.cpp
 
 move.obj: character/move.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT move.obj -MD -MP -MF "$(DEPDIR)/move.Tpo" -c -o move.obj `if test -f 'character/move.cpp'; then $(CYGPATH_W) 'character/move.cpp'; else $(CYGPATH_W) '$(srcdir)/character/move.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/move.Tpo" "$(DEPDIR)/move.Po"; else rm -f "$(DEPDIR)/move.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT move.obj -MD -MP -MF $(DEPDIR)/move.Tpo -c -o move.obj `if test -f 'character/move.cpp'; then $(CYGPATH_W) 'character/move.cpp'; else $(CYGPATH_W) '$(srcdir)/character/move.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/move.Tpo $(DEPDIR)/move.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/move.cpp' object='move.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o move.obj `if test -f 'character/move.cpp'; then $(CYGPATH_W) 'character/move.cpp'; else $(CYGPATH_W) '$(srcdir)/character/move.cpp'; fi`
 
 movement.o: character/movement.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT movement.o -MD -MP -MF "$(DEPDIR)/movement.Tpo" -c -o movement.o `test -f 'character/movement.cpp' || echo '$(srcdir)/'`character/movement.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/movement.Tpo" "$(DEPDIR)/movement.Po"; else rm -f "$(DEPDIR)/movement.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT movement.o -MD -MP -MF $(DEPDIR)/movement.Tpo -c -o movement.o `test -f 'character/movement.cpp' || echo '$(srcdir)/'`character/movement.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/movement.Tpo $(DEPDIR)/movement.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/movement.cpp' object='movement.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o movement.o `test -f 'character/movement.cpp' || echo '$(srcdir)/'`character/movement.cpp
 
 movement.obj: character/movement.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT movement.obj -MD -MP -MF "$(DEPDIR)/movement.Tpo" -c -o movement.obj `if test -f 'character/movement.cpp'; then $(CYGPATH_W) 'character/movement.cpp'; else $(CYGPATH_W) '$(srcdir)/character/movement.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/movement.Tpo" "$(DEPDIR)/movement.Po"; else rm -f "$(DEPDIR)/movement.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT movement.obj -MD -MP -MF $(DEPDIR)/movement.Tpo -c -o movement.obj `if test -f 'character/movement.cpp'; then $(CYGPATH_W) 'character/movement.cpp'; else $(CYGPATH_W) '$(srcdir)/character/movement.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/movement.Tpo $(DEPDIR)/movement.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='character/movement.cpp' object='movement.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o movement.obj `if test -f 'character/movement.cpp'; then $(CYGPATH_W) 'character/movement.cpp'; else $(CYGPATH_W) '$(srcdir)/character/movement.cpp'; fi`
 
 config.o: game/config.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.o -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.o `test -f 'game/config.cpp' || echo '$(srcdir)/'`game/config.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.o -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.o `test -f 'game/config.cpp' || echo '$(srcdir)/'`game/config.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/config.Tpo $(DEPDIR)/config.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/config.cpp' object='config.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.o `test -f 'game/config.cpp' || echo '$(srcdir)/'`game/config.cpp
 
 config.obj: game/config.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.obj -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.obj `if test -f 'game/config.cpp'; then $(CYGPATH_W) 'game/config.cpp'; else $(CYGPATH_W) '$(srcdir)/game/config.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.obj -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.obj `if test -f 'game/config.cpp'; then $(CYGPATH_W) 'game/config.cpp'; else $(CYGPATH_W) '$(srcdir)/game/config.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/config.Tpo $(DEPDIR)/config.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/config.cpp' object='config.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.obj `if test -f 'game/config.cpp'; then $(CYGPATH_W) 'game/config.cpp'; else $(CYGPATH_W) '$(srcdir)/game/config.cpp'; fi`
 
 game.o: game/game.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game.o -MD -MP -MF "$(DEPDIR)/game.Tpo" -c -o game.o `test -f 'game/game.cpp' || echo '$(srcdir)/'`game/game.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game.Tpo" "$(DEPDIR)/game.Po"; else rm -f "$(DEPDIR)/game.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game.o -MD -MP -MF $(DEPDIR)/game.Tpo -c -o game.o `test -f 'game/game.cpp' || echo '$(srcdir)/'`game/game.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game.Tpo $(DEPDIR)/game.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game.cpp' object='game.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game.o `test -f 'game/game.cpp' || echo '$(srcdir)/'`game/game.cpp
 
 game.obj: game/game.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game.obj -MD -MP -MF "$(DEPDIR)/game.Tpo" -c -o game.obj `if test -f 'game/game.cpp'; then $(CYGPATH_W) 'game/game.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game.Tpo" "$(DEPDIR)/game.Po"; else rm -f "$(DEPDIR)/game.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game.obj -MD -MP -MF $(DEPDIR)/game.Tpo -c -o game.obj `if test -f 'game/game.cpp'; then $(CYGPATH_W) 'game/game.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game.Tpo $(DEPDIR)/game.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game.cpp' object='game.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game.obj `if test -f 'game/game.cpp'; then $(CYGPATH_W) 'game/game.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game.cpp'; fi`
 
 game_blitz.o: game/game_blitz.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_blitz.o -MD -MP -MF "$(DEPDIR)/game_blitz.Tpo" -c -o game_blitz.o `test -f 'game/game_blitz.cpp' || echo '$(srcdir)/'`game/game_blitz.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_blitz.Tpo" "$(DEPDIR)/game_blitz.Po"; else rm -f "$(DEPDIR)/game_blitz.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_blitz.o -MD -MP -MF $(DEPDIR)/game_blitz.Tpo -c -o game_blitz.o `test -f 'game/game_blitz.cpp' || echo '$(srcdir)/'`game/game_blitz.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_blitz.Tpo $(DEPDIR)/game_blitz.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game_blitz.cpp' object='game_blitz.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_blitz.o `test -f 'game/game_blitz.cpp' || echo '$(srcdir)/'`game/game_blitz.cpp
 
 game_blitz.obj: game/game_blitz.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_blitz.obj -MD -MP -MF "$(DEPDIR)/game_blitz.Tpo" -c -o game_blitz.obj `if test -f 'game/game_blitz.cpp'; then $(CYGPATH_W) 'game/game_blitz.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_blitz.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_blitz.Tpo" "$(DEPDIR)/game_blitz.Po"; else rm -f "$(DEPDIR)/game_blitz.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_blitz.obj -MD -MP -MF $(DEPDIR)/game_blitz.Tpo -c -o game_blitz.obj `if test -f 'game/game_blitz.cpp'; then $(CYGPATH_W) 'game/game_blitz.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_blitz.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_blitz.Tpo $(DEPDIR)/game_blitz.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game_blitz.cpp' object='game_blitz.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_blitz.obj `if test -f 'game/game_blitz.cpp'; then $(CYGPATH_W) 'game/game_blitz.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_blitz.cpp'; fi`
 
 game_classic.o: game/game_classic.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_classic.o -MD -MP -MF "$(DEPDIR)/game_classic.Tpo" -c -o game_classic.o `test -f 'game/game_classic.cpp' || echo '$(srcdir)/'`game/game_classic.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_classic.Tpo" "$(DEPDIR)/game_classic.Po"; else rm -f "$(DEPDIR)/game_classic.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_classic.o -MD -MP -MF $(DEPDIR)/game_classic.Tpo -c -o game_classic.o `test -f 'game/game_classic.cpp' || echo '$(srcdir)/'`game/game_classic.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_classic.Tpo $(DEPDIR)/game_classic.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game_classic.cpp' object='game_classic.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_classic.o `test -f 'game/game_classic.cpp' || echo '$(srcdir)/'`game/game_classic.cpp
 
 game_classic.obj: game/game_classic.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_classic.obj -MD -MP -MF "$(DEPDIR)/game_classic.Tpo" -c -o game_classic.obj `if test -f 'game/game_classic.cpp'; then $(CYGPATH_W) 'game/game_classic.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_classic.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_classic.Tpo" "$(DEPDIR)/game_classic.Po"; else rm -f "$(DEPDIR)/game_classic.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_classic.obj -MD -MP -MF $(DEPDIR)/game_classic.Tpo -c -o game_classic.obj `if test -f 'game/game_classic.cpp'; then $(CYGPATH_W) 'game/game_classic.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_classic.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_classic.Tpo $(DEPDIR)/game_classic.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game_classic.cpp' object='game_classic.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_classic.obj `if test -f 'game/game_classic.cpp'; then $(CYGPATH_W) 'game/game_classic.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_classic.cpp'; fi`
 
 game_init.o: game/game_init.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_init.o -MD -MP -MF "$(DEPDIR)/game_init.Tpo" -c -o game_init.o `test -f 'game/game_init.cpp' || echo '$(srcdir)/'`game/game_init.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_init.Tpo" "$(DEPDIR)/game_init.Po"; else rm -f "$(DEPDIR)/game_init.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_init.o -MD -MP -MF $(DEPDIR)/game_init.Tpo -c -o game_init.o `test -f 'game/game_init.cpp' || echo '$(srcdir)/'`game/game_init.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_init.Tpo $(DEPDIR)/game_init.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game_init.cpp' object='game_init.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_init.o `test -f 'game/game_init.cpp' || echo '$(srcdir)/'`game/game_init.cpp
 
 game_init.obj: game/game_init.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_init.obj -MD -MP -MF "$(DEPDIR)/game_init.Tpo" -c -o game_init.obj `if test -f 'game/game_init.cpp'; then $(CYGPATH_W) 'game/game_init.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_init.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_init.Tpo" "$(DEPDIR)/game_init.Po"; else rm -f "$(DEPDIR)/game_init.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_init.obj -MD -MP -MF $(DEPDIR)/game_init.Tpo -c -o game_init.obj `if test -f 'game/game_init.cpp'; then $(CYGPATH_W) 'game/game_init.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_init.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_init.Tpo $(DEPDIR)/game_init.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game_init.cpp' object='game_init.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_init.obj `if test -f 'game/game_init.cpp'; then $(CYGPATH_W) 'game/game_init.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_init.cpp'; fi`
 
 game_mode.o: game/game_mode.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_mode.o -MD -MP -MF "$(DEPDIR)/game_mode.Tpo" -c -o game_mode.o `test -f 'game/game_mode.cpp' || echo '$(srcdir)/'`game/game_mode.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_mode.Tpo" "$(DEPDIR)/game_mode.Po"; else rm -f "$(DEPDIR)/game_mode.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_mode.o -MD -MP -MF $(DEPDIR)/game_mode.Tpo -c -o game_mode.o `test -f 'game/game_mode.cpp' || echo '$(srcdir)/'`game/game_mode.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_mode.Tpo $(DEPDIR)/game_mode.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game_mode.cpp' object='game_mode.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_mode.o `test -f 'game/game_mode.cpp' || echo '$(srcdir)/'`game/game_mode.cpp
 
 game_mode.obj: game/game_mode.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_mode.obj -MD -MP -MF "$(DEPDIR)/game_mode.Tpo" -c -o game_mode.obj `if test -f 'game/game_mode.cpp'; then $(CYGPATH_W) 'game/game_mode.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_mode.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_mode.Tpo" "$(DEPDIR)/game_mode.Po"; else rm -f "$(DEPDIR)/game_mode.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_mode.obj -MD -MP -MF $(DEPDIR)/game_mode.Tpo -c -o game_mode.obj `if test -f 'game/game_mode.cpp'; then $(CYGPATH_W) 'game/game_mode.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_mode.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_mode.Tpo $(DEPDIR)/game_mode.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/game_mode.cpp' object='game_mode.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_mode.obj `if test -f 'game/game_mode.cpp'; then $(CYGPATH_W) 'game/game_mode.cpp'; else $(CYGPATH_W) '$(srcdir)/game/game_mode.cpp'; fi`
 
 time.o: game/time.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT time.o -MD -MP -MF "$(DEPDIR)/time.Tpo" -c -o time.o `test -f 'game/time.cpp' || echo '$(srcdir)/'`game/time.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/time.Tpo" "$(DEPDIR)/time.Po"; else rm -f "$(DEPDIR)/time.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT time.o -MD -MP -MF $(DEPDIR)/time.Tpo -c -o time.o `test -f 'game/time.cpp' || echo '$(srcdir)/'`game/time.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/time.Tpo $(DEPDIR)/time.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/time.cpp' object='time.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o time.o `test -f 'game/time.cpp' || echo '$(srcdir)/'`game/time.cpp
 
 time.obj: game/time.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT time.obj -MD -MP -MF "$(DEPDIR)/time.Tpo" -c -o time.obj `if test -f 'game/time.cpp'; then $(CYGPATH_W) 'game/time.cpp'; else $(CYGPATH_W) '$(srcdir)/game/time.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/time.Tpo" "$(DEPDIR)/time.Po"; else rm -f "$(DEPDIR)/time.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT time.obj -MD -MP -MF $(DEPDIR)/time.Tpo -c -o time.obj `if test -f 'game/time.cpp'; then $(CYGPATH_W) 'game/time.cpp'; else $(CYGPATH_W) '$(srcdir)/game/time.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/time.Tpo $(DEPDIR)/time.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game/time.cpp' object='time.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o time.obj `if test -f 'game/time.cpp'; then $(CYGPATH_W) 'game/time.cpp'; else $(CYGPATH_W) '$(srcdir)/game/time.cpp'; fi`
 
 color.o: graphic/color.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT color.o -MD -MP -MF "$(DEPDIR)/color.Tpo" -c -o color.o `test -f 'graphic/color.cpp' || echo '$(srcdir)/'`graphic/color.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/color.Tpo" "$(DEPDIR)/color.Po"; else rm -f "$(DEPDIR)/color.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT color.o -MD -MP -MF $(DEPDIR)/color.Tpo -c -o color.o `test -f 'graphic/color.cpp' || echo '$(srcdir)/'`graphic/color.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/color.Tpo $(DEPDIR)/color.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/color.cpp' object='color.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o color.o `test -f 'graphic/color.cpp' || echo '$(srcdir)/'`graphic/color.cpp
 
 color.obj: graphic/color.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT color.obj -MD -MP -MF "$(DEPDIR)/color.Tpo" -c -o color.obj `if test -f 'graphic/color.cpp'; then $(CYGPATH_W) 'graphic/color.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/color.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/color.Tpo" "$(DEPDIR)/color.Po"; else rm -f "$(DEPDIR)/color.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT color.obj -MD -MP -MF $(DEPDIR)/color.Tpo -c -o color.obj `if test -f 'graphic/color.cpp'; then $(CYGPATH_W) 'graphic/color.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/color.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/color.Tpo $(DEPDIR)/color.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/color.cpp' object='color.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o color.obj `if test -f 'graphic/color.cpp'; then $(CYGPATH_W) 'graphic/color.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/color.cpp'; fi`
 
 composite_shape.o: graphic/composite_shape.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT composite_shape.o -MD -MP -MF "$(DEPDIR)/composite_shape.Tpo" -c -o composite_shape.o `test -f 'graphic/composite_shape.cpp' || echo '$(srcdir)/'`graphic/composite_shape.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/composite_shape.Tpo" "$(DEPDIR)/composite_shape.Po"; else rm -f "$(DEPDIR)/composite_shape.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT composite_shape.o -MD -MP -MF $(DEPDIR)/composite_shape.Tpo -c -o composite_shape.o `test -f 'graphic/composite_shape.cpp' || echo '$(srcdir)/'`graphic/composite_shape.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/composite_shape.Tpo $(DEPDIR)/composite_shape.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/composite_shape.cpp' object='composite_shape.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o composite_shape.o `test -f 'graphic/composite_shape.cpp' || echo '$(srcdir)/'`graphic/composite_shape.cpp
 
 composite_shape.obj: graphic/composite_shape.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT composite_shape.obj -MD -MP -MF "$(DEPDIR)/composite_shape.Tpo" -c -o composite_shape.obj `if test -f 'graphic/composite_shape.cpp'; then $(CYGPATH_W) 'graphic/composite_shape.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/composite_shape.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/composite_shape.Tpo" "$(DEPDIR)/composite_shape.Po"; else rm -f "$(DEPDIR)/composite_shape.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT composite_shape.obj -MD -MP -MF $(DEPDIR)/composite_shape.Tpo -c -o composite_shape.obj `if test -f 'graphic/composite_shape.cpp'; then $(CYGPATH_W) 'graphic/composite_shape.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/composite_shape.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/composite_shape.Tpo $(DEPDIR)/composite_shape.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/composite_shape.cpp' object='composite_shape.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o composite_shape.obj `if test -f 'graphic/composite_shape.cpp'; then $(CYGPATH_W) 'graphic/composite_shape.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/composite_shape.cpp'; fi`
 
 effects.o: graphic/effects.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT effects.o -MD -MP -MF "$(DEPDIR)/effects.Tpo" -c -o effects.o `test -f 'graphic/effects.cpp' || echo '$(srcdir)/'`graphic/effects.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/effects.Tpo" "$(DEPDIR)/effects.Po"; else rm -f "$(DEPDIR)/effects.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT effects.o -MD -MP -MF $(DEPDIR)/effects.Tpo -c -o effects.o `test -f 'graphic/effects.cpp' || echo '$(srcdir)/'`graphic/effects.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/effects.Tpo $(DEPDIR)/effects.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/effects.cpp' object='effects.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o effects.o `test -f 'graphic/effects.cpp' || echo '$(srcdir)/'`graphic/effects.cpp
 
 effects.obj: graphic/effects.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT effects.obj -MD -MP -MF "$(DEPDIR)/effects.Tpo" -c -o effects.obj `if test -f 'graphic/effects.cpp'; then $(CYGPATH_W) 'graphic/effects.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/effects.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/effects.Tpo" "$(DEPDIR)/effects.Po"; else rm -f "$(DEPDIR)/effects.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT effects.obj -MD -MP -MF $(DEPDIR)/effects.Tpo -c -o effects.obj `if test -f 'graphic/effects.cpp'; then $(CYGPATH_W) 'graphic/effects.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/effects.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/effects.Tpo $(DEPDIR)/effects.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/effects.cpp' object='effects.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o effects.obj `if test -f 'graphic/effects.cpp'; then $(CYGPATH_W) 'graphic/effects.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/effects.cpp'; fi`
 
 font.o: graphic/font.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.o -MD -MP -MF "$(DEPDIR)/font.Tpo" -c -o font.o `test -f 'graphic/font.cpp' || echo '$(srcdir)/'`graphic/font.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Po"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.o -MD -MP -MF $(DEPDIR)/font.Tpo -c -o font.o `test -f 'graphic/font.cpp' || echo '$(srcdir)/'`graphic/font.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/font.Tpo $(DEPDIR)/font.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/font.cpp' object='font.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.o `test -f 'graphic/font.cpp' || echo '$(srcdir)/'`graphic/font.cpp
 
 font.obj: graphic/font.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.obj -MD -MP -MF "$(DEPDIR)/font.Tpo" -c -o font.obj `if test -f 'graphic/font.cpp'; then $(CYGPATH_W) 'graphic/font.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/font.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Po"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.obj -MD -MP -MF $(DEPDIR)/font.Tpo -c -o font.obj `if test -f 'graphic/font.cpp'; then $(CYGPATH_W) 'graphic/font.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/font.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/font.Tpo $(DEPDIR)/font.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/font.cpp' object='font.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.obj `if test -f 'graphic/font.cpp'; then $(CYGPATH_W) 'graphic/font.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/font.cpp'; fi`
 
 fps.o: graphic/fps.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fps.o -MD -MP -MF "$(DEPDIR)/fps.Tpo" -c -o fps.o `test -f 'graphic/fps.cpp' || echo '$(srcdir)/'`graphic/fps.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fps.Tpo" "$(DEPDIR)/fps.Po"; else rm -f "$(DEPDIR)/fps.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fps.o -MD -MP -MF $(DEPDIR)/fps.Tpo -c -o fps.o `test -f 'graphic/fps.cpp' || echo '$(srcdir)/'`graphic/fps.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/fps.Tpo $(DEPDIR)/fps.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/fps.cpp' object='fps.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fps.o `test -f 'graphic/fps.cpp' || echo '$(srcdir)/'`graphic/fps.cpp
 
 fps.obj: graphic/fps.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fps.obj -MD -MP -MF "$(DEPDIR)/fps.Tpo" -c -o fps.obj `if test -f 'graphic/fps.cpp'; then $(CYGPATH_W) 'graphic/fps.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/fps.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fps.Tpo" "$(DEPDIR)/fps.Po"; else rm -f "$(DEPDIR)/fps.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fps.obj -MD -MP -MF $(DEPDIR)/fps.Tpo -c -o fps.obj `if test -f 'graphic/fps.cpp'; then $(CYGPATH_W) 'graphic/fps.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/fps.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/fps.Tpo $(DEPDIR)/fps.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/fps.cpp' object='fps.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fps.obj `if test -f 'graphic/fps.cpp'; then $(CYGPATH_W) 'graphic/fps.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/fps.cpp'; fi`
 
 polygon.o: graphic/polygon.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polygon.o -MD -MP -MF "$(DEPDIR)/polygon.Tpo" -c -o polygon.o `test -f 'graphic/polygon.cpp' || echo '$(srcdir)/'`graphic/polygon.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polygon.Tpo" "$(DEPDIR)/polygon.Po"; else rm -f "$(DEPDIR)/polygon.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polygon.o -MD -MP -MF $(DEPDIR)/polygon.Tpo -c -o polygon.o `test -f 'graphic/polygon.cpp' || echo '$(srcdir)/'`graphic/polygon.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polygon.Tpo $(DEPDIR)/polygon.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/polygon.cpp' object='polygon.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o polygon.o `test -f 'graphic/polygon.cpp' || echo '$(srcdir)/'`graphic/polygon.cpp
 
 polygon.obj: graphic/polygon.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polygon.obj -MD -MP -MF "$(DEPDIR)/polygon.Tpo" -c -o polygon.obj `if test -f 'graphic/polygon.cpp'; then $(CYGPATH_W) 'graphic/polygon.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/polygon.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polygon.Tpo" "$(DEPDIR)/polygon.Po"; else rm -f "$(DEPDIR)/polygon.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polygon.obj -MD -MP -MF $(DEPDIR)/polygon.Tpo -c -o polygon.obj `if test -f 'graphic/polygon.cpp'; then $(CYGPATH_W) 'graphic/polygon.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/polygon.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polygon.Tpo $(DEPDIR)/polygon.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/polygon.cpp' object='polygon.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o polygon.obj `if test -f 'graphic/polygon.cpp'; then $(CYGPATH_W) 'graphic/polygon.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/polygon.cpp'; fi`
 
 polygon_generator.o: graphic/polygon_generator.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polygon_generator.o -MD -MP -MF "$(DEPDIR)/polygon_generator.Tpo" -c -o polygon_generator.o `test -f 'graphic/polygon_generator.cpp' || echo '$(srcdir)/'`graphic/polygon_generator.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polygon_generator.Tpo" "$(DEPDIR)/polygon_generator.Po"; else rm -f "$(DEPDIR)/polygon_generator.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polygon_generator.o -MD -MP -MF $(DEPDIR)/polygon_generator.Tpo -c -o polygon_generator.o `test -f 'graphic/polygon_generator.cpp' || echo '$(srcdir)/'`graphic/polygon_generator.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polygon_generator.Tpo $(DEPDIR)/polygon_generator.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/polygon_generator.cpp' object='polygon_generator.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o polygon_generator.o `test -f 'graphic/polygon_generator.cpp' || echo '$(srcdir)/'`graphic/polygon_generator.cpp
 
 polygon_generator.obj: graphic/polygon_generator.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polygon_generator.obj -MD -MP -MF "$(DEPDIR)/polygon_generator.Tpo" -c -o polygon_generator.obj `if test -f 'graphic/polygon_generator.cpp'; then $(CYGPATH_W) 'graphic/polygon_generator.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/polygon_generator.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polygon_generator.Tpo" "$(DEPDIR)/polygon_generator.Po"; else rm -f "$(DEPDIR)/polygon_generator.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polygon_generator.obj -MD -MP -MF $(DEPDIR)/polygon_generator.Tpo -c -o polygon_generator.obj `if test -f 'graphic/polygon_generator.cpp'; then $(CYGPATH_W) 'graphic/polygon_generator.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/polygon_generator.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polygon_generator.Tpo $(DEPDIR)/polygon_generator.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/polygon_generator.cpp' object='polygon_generator.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o polygon_generator.obj `if test -f 'graphic/polygon_generator.cpp'; then $(CYGPATH_W) 'graphic/polygon_generator.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/polygon_generator.cpp'; fi`
 
 spriteanimation.o: graphic/spriteanimation.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spriteanimation.o -MD -MP -MF "$(DEPDIR)/spriteanimation.Tpo" -c -o spriteanimation.o `test -f 'graphic/spriteanimation.cpp' || echo '$(srcdir)/'`graphic/spriteanimation.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spriteanimation.Tpo" "$(DEPDIR)/spriteanimation.Po"; else rm -f "$(DEPDIR)/spriteanimation.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spriteanimation.o -MD -MP -MF $(DEPDIR)/spriteanimation.Tpo -c -o spriteanimation.o `test -f 'graphic/spriteanimation.cpp' || echo '$(srcdir)/'`graphic/spriteanimation.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spriteanimation.Tpo $(DEPDIR)/spriteanimation.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/spriteanimation.cpp' object='spriteanimation.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spriteanimation.o `test -f 'graphic/spriteanimation.cpp' || echo '$(srcdir)/'`graphic/spriteanimation.cpp
 
 spriteanimation.obj: graphic/spriteanimation.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spriteanimation.obj -MD -MP -MF "$(DEPDIR)/spriteanimation.Tpo" -c -o spriteanimation.obj `if test -f 'graphic/spriteanimation.cpp'; then $(CYGPATH_W) 'graphic/spriteanimation.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/spriteanimation.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spriteanimation.Tpo" "$(DEPDIR)/spriteanimation.Po"; else rm -f "$(DEPDIR)/spriteanimation.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spriteanimation.obj -MD -MP -MF $(DEPDIR)/spriteanimation.Tpo -c -o spriteanimation.obj `if test -f 'graphic/spriteanimation.cpp'; then $(CYGPATH_W) 'graphic/spriteanimation.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/spriteanimation.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spriteanimation.Tpo $(DEPDIR)/spriteanimation.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/spriteanimation.cpp' object='spriteanimation.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spriteanimation.obj `if test -f 'graphic/spriteanimation.cpp'; then $(CYGPATH_W) 'graphic/spriteanimation.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/spriteanimation.cpp'; fi`
 
 spritecache.o: graphic/spritecache.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spritecache.o -MD -MP -MF "$(DEPDIR)/spritecache.Tpo" -c -o spritecache.o `test -f 'graphic/spritecache.cpp' || echo '$(srcdir)/'`graphic/spritecache.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spritecache.Tpo" "$(DEPDIR)/spritecache.Po"; else rm -f "$(DEPDIR)/spritecache.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spritecache.o -MD -MP -MF $(DEPDIR)/spritecache.Tpo -c -o spritecache.o `test -f 'graphic/spritecache.cpp' || echo '$(srcdir)/'`graphic/spritecache.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spritecache.Tpo $(DEPDIR)/spritecache.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/spritecache.cpp' object='spritecache.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spritecache.o `test -f 'graphic/spritecache.cpp' || echo '$(srcdir)/'`graphic/spritecache.cpp
 
 spritecache.obj: graphic/spritecache.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spritecache.obj -MD -MP -MF "$(DEPDIR)/spritecache.Tpo" -c -o spritecache.obj `if test -f 'graphic/spritecache.cpp'; then $(CYGPATH_W) 'graphic/spritecache.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/spritecache.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spritecache.Tpo" "$(DEPDIR)/spritecache.Po"; else rm -f "$(DEPDIR)/spritecache.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spritecache.obj -MD -MP -MF $(DEPDIR)/spritecache.Tpo -c -o spritecache.obj `if test -f 'graphic/spritecache.cpp'; then $(CYGPATH_W) 'graphic/spritecache.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/spritecache.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spritecache.Tpo $(DEPDIR)/spritecache.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/spritecache.cpp' object='spritecache.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spritecache.obj `if test -f 'graphic/spritecache.cpp'; then $(CYGPATH_W) 'graphic/spritecache.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/spritecache.cpp'; fi`
 
 sprite.o: graphic/sprite.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sprite.o -MD -MP -MF "$(DEPDIR)/sprite.Tpo" -c -o sprite.o `test -f 'graphic/sprite.cpp' || echo '$(srcdir)/'`graphic/sprite.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sprite.Tpo" "$(DEPDIR)/sprite.Po"; else rm -f "$(DEPDIR)/sprite.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sprite.o -MD -MP -MF $(DEPDIR)/sprite.Tpo -c -o sprite.o `test -f 'graphic/sprite.cpp' || echo '$(srcdir)/'`graphic/sprite.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sprite.Tpo $(DEPDIR)/sprite.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/sprite.cpp' object='sprite.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sprite.o `test -f 'graphic/sprite.cpp' || echo '$(srcdir)/'`graphic/sprite.cpp
 
 sprite.obj: graphic/sprite.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sprite.obj -MD -MP -MF "$(DEPDIR)/sprite.Tpo" -c -o sprite.obj `if test -f 'graphic/sprite.cpp'; then $(CYGPATH_W) 'graphic/sprite.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/sprite.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sprite.Tpo" "$(DEPDIR)/sprite.Po"; else rm -f "$(DEPDIR)/sprite.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sprite.obj -MD -MP -MF $(DEPDIR)/sprite.Tpo -c -o sprite.obj `if test -f 'graphic/sprite.cpp'; then $(CYGPATH_W) 'graphic/sprite.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/sprite.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sprite.Tpo $(DEPDIR)/sprite.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/sprite.cpp' object='sprite.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sprite.obj `if test -f 'graphic/sprite.cpp'; then $(CYGPATH_W) 'graphic/sprite.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/sprite.cpp'; fi`
 
 spriteframe.o: graphic/spriteframe.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spriteframe.o -MD -MP -MF "$(DEPDIR)/spriteframe.Tpo" -c -o spriteframe.o `test -f 'graphic/spriteframe.cpp' || echo '$(srcdir)/'`graphic/spriteframe.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spriteframe.Tpo" "$(DEPDIR)/spriteframe.Po"; else rm -f "$(DEPDIR)/spriteframe.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spriteframe.o -MD -MP -MF $(DEPDIR)/spriteframe.Tpo -c -o spriteframe.o `test -f 'graphic/spriteframe.cpp' || echo '$(srcdir)/'`graphic/spriteframe.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spriteframe.Tpo $(DEPDIR)/spriteframe.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/spriteframe.cpp' object='spriteframe.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spriteframe.o `test -f 'graphic/spriteframe.cpp' || echo '$(srcdir)/'`graphic/spriteframe.cpp
 
 spriteframe.obj: graphic/spriteframe.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spriteframe.obj -MD -MP -MF "$(DEPDIR)/spriteframe.Tpo" -c -o spriteframe.obj `if test -f 'graphic/spriteframe.cpp'; then $(CYGPATH_W) 'graphic/spriteframe.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/spriteframe.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spriteframe.Tpo" "$(DEPDIR)/spriteframe.Po"; else rm -f "$(DEPDIR)/spriteframe.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spriteframe.obj -MD -MP -MF $(DEPDIR)/spriteframe.Tpo -c -o spriteframe.obj `if test -f 'graphic/spriteframe.cpp'; then $(CYGPATH_W) 'graphic/spriteframe.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/spriteframe.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spriteframe.Tpo $(DEPDIR)/spriteframe.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/spriteframe.cpp' object='spriteframe.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spriteframe.obj `if test -f 'graphic/spriteframe.cpp'; then $(CYGPATH_W) 'graphic/spriteframe.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/spriteframe.cpp'; fi`
 
 surface.o: graphic/surface.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surface.o -MD -MP -MF "$(DEPDIR)/surface.Tpo" -c -o surface.o `test -f 'graphic/surface.cpp' || echo '$(srcdir)/'`graphic/surface.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/surface.Tpo" "$(DEPDIR)/surface.Po"; else rm -f "$(DEPDIR)/surface.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surface.o -MD -MP -MF $(DEPDIR)/surface.Tpo -c -o surface.o `test -f 'graphic/surface.cpp' || echo '$(srcdir)/'`graphic/surface.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/surface.Tpo $(DEPDIR)/surface.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/surface.cpp' object='surface.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o surface.o `test -f 'graphic/surface.cpp' || echo '$(srcdir)/'`graphic/surface.cpp
 
 surface.obj: graphic/surface.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surface.obj -MD -MP -MF "$(DEPDIR)/surface.Tpo" -c -o surface.obj `if test -f 'graphic/surface.cpp'; then $(CYGPATH_W) 'graphic/surface.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/surface.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/surface.Tpo" "$(DEPDIR)/surface.Po"; else rm -f "$(DEPDIR)/surface.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surface.obj -MD -MP -MF $(DEPDIR)/surface.Tpo -c -o surface.obj `if test -f 'graphic/surface.cpp'; then $(CYGPATH_W) 'graphic/surface.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/surface.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/surface.Tpo $(DEPDIR)/surface.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/surface.cpp' object='surface.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o surface.obj `if test -f 'graphic/surface.cpp'; then $(CYGPATH_W) 'graphic/surface.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/surface.cpp'; fi`
 
 text.o: graphic/text.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.o -MD -MP -MF "$(DEPDIR)/text.Tpo" -c -o text.o `test -f 'graphic/text.cpp' || echo '$(srcdir)/'`graphic/text.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Po"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.o -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.o `test -f 'graphic/text.cpp' || echo '$(srcdir)/'`graphic/text.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/text.cpp' object='text.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.o `test -f 'graphic/text.cpp' || echo '$(srcdir)/'`graphic/text.cpp
 
 text.obj: graphic/text.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.obj -MD -MP -MF "$(DEPDIR)/text.Tpo" -c -o text.obj `if test -f 'graphic/text.cpp'; then $(CYGPATH_W) 'graphic/text.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/text.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Po"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.obj -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.obj `if test -f 'graphic/text.cpp'; then $(CYGPATH_W) 'graphic/text.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/text.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/text.cpp' object='text.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.obj `if test -f 'graphic/text.cpp'; then $(CYGPATH_W) 'graphic/text.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/text.cpp'; fi`
 
 text_list.o: graphic/text_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_list.o -MD -MP -MF "$(DEPDIR)/text_list.Tpo" -c -o text_list.o `test -f 'graphic/text_list.cpp' || echo '$(srcdir)/'`graphic/text_list.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text_list.Tpo" "$(DEPDIR)/text_list.Po"; else rm -f "$(DEPDIR)/text_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_list.o -MD -MP -MF $(DEPDIR)/text_list.Tpo -c -o text_list.o `test -f 'graphic/text_list.cpp' || echo '$(srcdir)/'`graphic/text_list.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/text_list.Tpo $(DEPDIR)/text_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/text_list.cpp' object='text_list.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_list.o `test -f 'graphic/text_list.cpp' || echo '$(srcdir)/'`graphic/text_list.cpp
 
 text_list.obj: graphic/text_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_list.obj -MD -MP -MF "$(DEPDIR)/text_list.Tpo" -c -o text_list.obj `if test -f 'graphic/text_list.cpp'; then $(CYGPATH_W) 'graphic/text_list.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/text_list.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text_list.Tpo" "$(DEPDIR)/text_list.Po"; else rm -f "$(DEPDIR)/text_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_list.obj -MD -MP -MF $(DEPDIR)/text_list.Tpo -c -o text_list.obj `if test -f 'graphic/text_list.cpp'; then $(CYGPATH_W) 'graphic/text_list.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/text_list.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/text_list.Tpo $(DEPDIR)/text_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/text_list.cpp' object='text_list.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_list.obj `if test -f 'graphic/text_list.cpp'; then $(CYGPATH_W) 'graphic/text_list.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/text_list.cpp'; fi`
 
 video.o: graphic/video.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT video.o -MD -MP -MF "$(DEPDIR)/video.Tpo" -c -o video.o `test -f 'graphic/video.cpp' || echo '$(srcdir)/'`graphic/video.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/video.Tpo" "$(DEPDIR)/video.Po"; else rm -f "$(DEPDIR)/video.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT video.o -MD -MP -MF $(DEPDIR)/video.Tpo -c -o video.o `test -f 'graphic/video.cpp' || echo '$(srcdir)/'`graphic/video.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/video.Tpo $(DEPDIR)/video.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/video.cpp' object='video.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o video.o `test -f 'graphic/video.cpp' || echo '$(srcdir)/'`graphic/video.cpp
 
 video.obj: graphic/video.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT video.obj -MD -MP -MF "$(DEPDIR)/video.Tpo" -c -o video.obj `if test -f 'graphic/video.cpp'; then $(CYGPATH_W) 'graphic/video.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/video.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/video.Tpo" "$(DEPDIR)/video.Po"; else rm -f "$(DEPDIR)/video.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT video.obj -MD -MP -MF $(DEPDIR)/video.Tpo -c -o video.obj `if test -f 'graphic/video.cpp'; then $(CYGPATH_W) 'graphic/video.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/video.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/video.Tpo $(DEPDIR)/video.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='graphic/video.cpp' object='video.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o video.obj `if test -f 'graphic/video.cpp'; then $(CYGPATH_W) 'graphic/video.cpp'; else $(CYGPATH_W) '$(srcdir)/graphic/video.cpp'; fi`
 
 box.o: gui/box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT box.o -MD -MP -MF "$(DEPDIR)/box.Tpo" -c -o box.o `test -f 'gui/box.cpp' || echo '$(srcdir)/'`gui/box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/box.Tpo" "$(DEPDIR)/box.Po"; else rm -f "$(DEPDIR)/box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT box.o -MD -MP -MF $(DEPDIR)/box.Tpo -c -o box.o `test -f 'gui/box.cpp' || echo '$(srcdir)/'`gui/box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/box.Tpo $(DEPDIR)/box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/box.cpp' object='box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o box.o `test -f 'gui/box.cpp' || echo '$(srcdir)/'`gui/box.cpp
 
 box.obj: gui/box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT box.obj -MD -MP -MF "$(DEPDIR)/box.Tpo" -c -o box.obj `if test -f 'gui/box.cpp'; then $(CYGPATH_W) 'gui/box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/box.Tpo" "$(DEPDIR)/box.Po"; else rm -f "$(DEPDIR)/box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT box.obj -MD -MP -MF $(DEPDIR)/box.Tpo -c -o box.obj `if test -f 'gui/box.cpp'; then $(CYGPATH_W) 'gui/box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/box.Tpo $(DEPDIR)/box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/box.cpp' object='box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o box.obj `if test -f 'gui/box.cpp'; then $(CYGPATH_W) 'gui/box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/box.cpp'; fi`
 
 button.o: gui/button.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button.o -MD -MP -MF "$(DEPDIR)/button.Tpo" -c -o button.o `test -f 'gui/button.cpp' || echo '$(srcdir)/'`gui/button.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/button.Tpo" "$(DEPDIR)/button.Po"; else rm -f "$(DEPDIR)/button.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button.o -MD -MP -MF $(DEPDIR)/button.Tpo -c -o button.o `test -f 'gui/button.cpp' || echo '$(srcdir)/'`gui/button.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/button.Tpo $(DEPDIR)/button.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/button.cpp' object='button.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o button.o `test -f 'gui/button.cpp' || echo '$(srcdir)/'`gui/button.cpp
 
 button.obj: gui/button.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button.obj -MD -MP -MF "$(DEPDIR)/button.Tpo" -c -o button.obj `if test -f 'gui/button.cpp'; then $(CYGPATH_W) 'gui/button.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/button.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/button.Tpo" "$(DEPDIR)/button.Po"; else rm -f "$(DEPDIR)/button.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button.obj -MD -MP -MF $(DEPDIR)/button.Tpo -c -o button.obj `if test -f 'gui/button.cpp'; then $(CYGPATH_W) 'gui/button.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/button.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/button.Tpo $(DEPDIR)/button.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/button.cpp' object='button.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o button.obj `if test -f 'gui/button.cpp'; then $(CYGPATH_W) 'gui/button.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/button.cpp'; fi`
 
 button_text.o: gui/button_text.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button_text.o -MD -MP -MF "$(DEPDIR)/button_text.Tpo" -c -o button_text.o `test -f 'gui/button_text.cpp' || echo '$(srcdir)/'`gui/button_text.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/button_text.Tpo" "$(DEPDIR)/button_text.Po"; else rm -f "$(DEPDIR)/button_text.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button_text.o -MD -MP -MF $(DEPDIR)/button_text.Tpo -c -o button_text.o `test -f 'gui/button_text.cpp' || echo '$(srcdir)/'`gui/button_text.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/button_text.Tpo $(DEPDIR)/button_text.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/button_text.cpp' object='button_text.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o button_text.o `test -f 'gui/button_text.cpp' || echo '$(srcdir)/'`gui/button_text.cpp
 
 button_text.obj: gui/button_text.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button_text.obj -MD -MP -MF "$(DEPDIR)/button_text.Tpo" -c -o button_text.obj `if test -f 'gui/button_text.cpp'; then $(CYGPATH_W) 'gui/button_text.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/button_text.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/button_text.Tpo" "$(DEPDIR)/button_text.Po"; else rm -f "$(DEPDIR)/button_text.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button_text.obj -MD -MP -MF $(DEPDIR)/button_text.Tpo -c -o button_text.obj `if test -f 'gui/button_text.cpp'; then $(CYGPATH_W) 'gui/button_text.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/button_text.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/button_text.Tpo $(DEPDIR)/button_text.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/button_text.cpp' object='button_text.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o button_text.obj `if test -f 'gui/button_text.cpp'; then $(CYGPATH_W) 'gui/button_text.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/button_text.cpp'; fi`
 
 check_box.o: gui/check_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT check_box.o -MD -MP -MF "$(DEPDIR)/check_box.Tpo" -c -o check_box.o `test -f 'gui/check_box.cpp' || echo '$(srcdir)/'`gui/check_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/check_box.Tpo" "$(DEPDIR)/check_box.Po"; else rm -f "$(DEPDIR)/check_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT check_box.o -MD -MP -MF $(DEPDIR)/check_box.Tpo -c -o check_box.o `test -f 'gui/check_box.cpp' || echo '$(srcdir)/'`gui/check_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/check_box.Tpo $(DEPDIR)/check_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/check_box.cpp' object='check_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o check_box.o `test -f 'gui/check_box.cpp' || echo '$(srcdir)/'`gui/check_box.cpp
 
 check_box.obj: gui/check_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT check_box.obj -MD -MP -MF "$(DEPDIR)/check_box.Tpo" -c -o check_box.obj `if test -f 'gui/check_box.cpp'; then $(CYGPATH_W) 'gui/check_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/check_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/check_box.Tpo" "$(DEPDIR)/check_box.Po"; else rm -f "$(DEPDIR)/check_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT check_box.obj -MD -MP -MF $(DEPDIR)/check_box.Tpo -c -o check_box.obj `if test -f 'gui/check_box.cpp'; then $(CYGPATH_W) 'gui/check_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/check_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/check_box.Tpo $(DEPDIR)/check_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/check_box.cpp' object='check_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o check_box.obj `if test -f 'gui/check_box.cpp'; then $(CYGPATH_W) 'gui/check_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/check_box.cpp'; fi`
 
 combo_box.o: gui/combo_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT combo_box.o -MD -MP -MF "$(DEPDIR)/combo_box.Tpo" -c -o combo_box.o `test -f 'gui/combo_box.cpp' || echo '$(srcdir)/'`gui/combo_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/combo_box.Tpo" "$(DEPDIR)/combo_box.Po"; else rm -f "$(DEPDIR)/combo_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT combo_box.o -MD -MP -MF $(DEPDIR)/combo_box.Tpo -c -o combo_box.o `test -f 'gui/combo_box.cpp' || echo '$(srcdir)/'`gui/combo_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/combo_box.Tpo $(DEPDIR)/combo_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/combo_box.cpp' object='combo_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o combo_box.o `test -f 'gui/combo_box.cpp' || echo '$(srcdir)/'`gui/combo_box.cpp
 
 combo_box.obj: gui/combo_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT combo_box.obj -MD -MP -MF "$(DEPDIR)/combo_box.Tpo" -c -o combo_box.obj `if test -f 'gui/combo_box.cpp'; then $(CYGPATH_W) 'gui/combo_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/combo_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/combo_box.Tpo" "$(DEPDIR)/combo_box.Po"; else rm -f "$(DEPDIR)/combo_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT combo_box.obj -MD -MP -MF $(DEPDIR)/combo_box.Tpo -c -o combo_box.obj `if test -f 'gui/combo_box.cpp'; then $(CYGPATH_W) 'gui/combo_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/combo_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/combo_box.Tpo $(DEPDIR)/combo_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/combo_box.cpp' object='combo_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o combo_box.obj `if test -f 'gui/combo_box.cpp'; then $(CYGPATH_W) 'gui/combo_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/combo_box.cpp'; fi`
 
 energy_bar.o: gui/energy_bar.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT energy_bar.o -MD -MP -MF "$(DEPDIR)/energy_bar.Tpo" -c -o energy_bar.o `test -f 'gui/energy_bar.cpp' || echo '$(srcdir)/'`gui/energy_bar.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/energy_bar.Tpo" "$(DEPDIR)/energy_bar.Po"; else rm -f "$(DEPDIR)/energy_bar.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT energy_bar.o -MD -MP -MF $(DEPDIR)/energy_bar.Tpo -c -o energy_bar.o `test -f 'gui/energy_bar.cpp' || echo '$(srcdir)/'`gui/energy_bar.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/energy_bar.Tpo $(DEPDIR)/energy_bar.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/energy_bar.cpp' object='energy_bar.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o energy_bar.o `test -f 'gui/energy_bar.cpp' || echo '$(srcdir)/'`gui/energy_bar.cpp
 
 energy_bar.obj: gui/energy_bar.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT energy_bar.obj -MD -MP -MF "$(DEPDIR)/energy_bar.Tpo" -c -o energy_bar.obj `if test -f 'gui/energy_bar.cpp'; then $(CYGPATH_W) 'gui/energy_bar.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/energy_bar.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/energy_bar.Tpo" "$(DEPDIR)/energy_bar.Po"; else rm -f "$(DEPDIR)/energy_bar.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT energy_bar.obj -MD -MP -MF $(DEPDIR)/energy_bar.Tpo -c -o energy_bar.obj `if test -f 'gui/energy_bar.cpp'; then $(CYGPATH_W) 'gui/energy_bar.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/energy_bar.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/energy_bar.Tpo $(DEPDIR)/energy_bar.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/energy_bar.cpp' object='energy_bar.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o energy_bar.obj `if test -f 'gui/energy_bar.cpp'; then $(CYGPATH_W) 'gui/energy_bar.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/energy_bar.cpp'; fi`
 
 label.o: gui/label.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT label.o -MD -MP -MF "$(DEPDIR)/label.Tpo" -c -o label.o `test -f 'gui/label.cpp' || echo '$(srcdir)/'`gui/label.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/label.Tpo" "$(DEPDIR)/label.Po"; else rm -f "$(DEPDIR)/label.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT label.o -MD -MP -MF $(DEPDIR)/label.Tpo -c -o label.o `test -f 'gui/label.cpp' || echo '$(srcdir)/'`gui/label.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/label.Tpo $(DEPDIR)/label.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/label.cpp' object='label.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o label.o `test -f 'gui/label.cpp' || echo '$(srcdir)/'`gui/label.cpp
 
 label.obj: gui/label.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT label.obj -MD -MP -MF "$(DEPDIR)/label.Tpo" -c -o label.obj `if test -f 'gui/label.cpp'; then $(CYGPATH_W) 'gui/label.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/label.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/label.Tpo" "$(DEPDIR)/label.Po"; else rm -f "$(DEPDIR)/label.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT label.obj -MD -MP -MF $(DEPDIR)/label.Tpo -c -o label.obj `if test -f 'gui/label.cpp'; then $(CYGPATH_W) 'gui/label.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/label.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/label.Tpo $(DEPDIR)/label.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/label.cpp' object='label.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o label.obj `if test -f 'gui/label.cpp'; then $(CYGPATH_W) 'gui/label.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/label.cpp'; fi`
 
 list_box.o: gui/list_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list_box.o -MD -MP -MF "$(DEPDIR)/list_box.Tpo" -c -o list_box.o `test -f 'gui/list_box.cpp' || echo '$(srcdir)/'`gui/list_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/list_box.Tpo" "$(DEPDIR)/list_box.Po"; else rm -f "$(DEPDIR)/list_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list_box.o -MD -MP -MF $(DEPDIR)/list_box.Tpo -c -o list_box.o `test -f 'gui/list_box.cpp' || echo '$(srcdir)/'`gui/list_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/list_box.Tpo $(DEPDIR)/list_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/list_box.cpp' object='list_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list_box.o `test -f 'gui/list_box.cpp' || echo '$(srcdir)/'`gui/list_box.cpp
 
 list_box.obj: gui/list_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list_box.obj -MD -MP -MF "$(DEPDIR)/list_box.Tpo" -c -o list_box.obj `if test -f 'gui/list_box.cpp'; then $(CYGPATH_W) 'gui/list_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/list_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/list_box.Tpo" "$(DEPDIR)/list_box.Po"; else rm -f "$(DEPDIR)/list_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list_box.obj -MD -MP -MF $(DEPDIR)/list_box.Tpo -c -o list_box.obj `if test -f 'gui/list_box.cpp'; then $(CYGPATH_W) 'gui/list_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/list_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/list_box.Tpo $(DEPDIR)/list_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/list_box.cpp' object='list_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list_box.obj `if test -f 'gui/list_box.cpp'; then $(CYGPATH_W) 'gui/list_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/list_box.cpp'; fi`
 
 list_box_w_label.o: gui/list_box_w_label.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list_box_w_label.o -MD -MP -MF "$(DEPDIR)/list_box_w_label.Tpo" -c -o list_box_w_label.o `test -f 'gui/list_box_w_label.cpp' || echo '$(srcdir)/'`gui/list_box_w_label.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/list_box_w_label.Tpo" "$(DEPDIR)/list_box_w_label.Po"; else rm -f "$(DEPDIR)/list_box_w_label.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list_box_w_label.o -MD -MP -MF $(DEPDIR)/list_box_w_label.Tpo -c -o list_box_w_label.o `test -f 'gui/list_box_w_label.cpp' || echo '$(srcdir)/'`gui/list_box_w_label.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/list_box_w_label.Tpo $(DEPDIR)/list_box_w_label.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/list_box_w_label.cpp' object='list_box_w_label.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list_box_w_label.o `test -f 'gui/list_box_w_label.cpp' || echo '$(srcdir)/'`gui/list_box_w_label.cpp
 
 list_box_w_label.obj: gui/list_box_w_label.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list_box_w_label.obj -MD -MP -MF "$(DEPDIR)/list_box_w_label.Tpo" -c -o list_box_w_label.obj `if test -f 'gui/list_box_w_label.cpp'; then $(CYGPATH_W) 'gui/list_box_w_label.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/list_box_w_label.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/list_box_w_label.Tpo" "$(DEPDIR)/list_box_w_label.Po"; else rm -f "$(DEPDIR)/list_box_w_label.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list_box_w_label.obj -MD -MP -MF $(DEPDIR)/list_box_w_label.Tpo -c -o list_box_w_label.obj `if test -f 'gui/list_box_w_label.cpp'; then $(CYGPATH_W) 'gui/list_box_w_label.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/list_box_w_label.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/list_box_w_label.Tpo $(DEPDIR)/list_box_w_label.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/list_box_w_label.cpp' object='list_box_w_label.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list_box_w_label.obj `if test -f 'gui/list_box_w_label.cpp'; then $(CYGPATH_W) 'gui/list_box_w_label.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/list_box_w_label.cpp'; fi`
 
 msg_box.o: gui/msg_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msg_box.o -MD -MP -MF "$(DEPDIR)/msg_box.Tpo" -c -o msg_box.o `test -f 'gui/msg_box.cpp' || echo '$(srcdir)/'`gui/msg_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/msg_box.Tpo" "$(DEPDIR)/msg_box.Po"; else rm -f "$(DEPDIR)/msg_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msg_box.o -MD -MP -MF $(DEPDIR)/msg_box.Tpo -c -o msg_box.o `test -f 'gui/msg_box.cpp' || echo '$(srcdir)/'`gui/msg_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/msg_box.Tpo $(DEPDIR)/msg_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/msg_box.cpp' object='msg_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msg_box.o `test -f 'gui/msg_box.cpp' || echo '$(srcdir)/'`gui/msg_box.cpp
 
 msg_box.obj: gui/msg_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msg_box.obj -MD -MP -MF "$(DEPDIR)/msg_box.Tpo" -c -o msg_box.obj `if test -f 'gui/msg_box.cpp'; then $(CYGPATH_W) 'gui/msg_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/msg_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/msg_box.Tpo" "$(DEPDIR)/msg_box.Po"; else rm -f "$(DEPDIR)/msg_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msg_box.obj -MD -MP -MF $(DEPDIR)/msg_box.Tpo -c -o msg_box.obj `if test -f 'gui/msg_box.cpp'; then $(CYGPATH_W) 'gui/msg_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/msg_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/msg_box.Tpo $(DEPDIR)/msg_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/msg_box.cpp' object='msg_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msg_box.obj `if test -f 'gui/msg_box.cpp'; then $(CYGPATH_W) 'gui/msg_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/msg_box.cpp'; fi`
 
 picture_text_cbox.o: gui/picture_text_cbox.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT picture_text_cbox.o -MD -MP -MF "$(DEPDIR)/picture_text_cbox.Tpo" -c -o picture_text_cbox.o `test -f 'gui/picture_text_cbox.cpp' || echo '$(srcdir)/'`gui/picture_text_cbox.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/picture_text_cbox.Tpo" "$(DEPDIR)/picture_text_cbox.Po"; else rm -f "$(DEPDIR)/picture_text_cbox.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT picture_text_cbox.o -MD -MP -MF $(DEPDIR)/picture_text_cbox.Tpo -c -o picture_text_cbox.o `test -f 'gui/picture_text_cbox.cpp' || echo '$(srcdir)/'`gui/picture_text_cbox.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/picture_text_cbox.Tpo $(DEPDIR)/picture_text_cbox.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/picture_text_cbox.cpp' object='picture_text_cbox.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o picture_text_cbox.o `test -f 'gui/picture_text_cbox.cpp' || echo '$(srcdir)/'`gui/picture_text_cbox.cpp
 
 picture_text_cbox.obj: gui/picture_text_cbox.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT picture_text_cbox.obj -MD -MP -MF "$(DEPDIR)/picture_text_cbox.Tpo" -c -o picture_text_cbox.obj `if test -f 'gui/picture_text_cbox.cpp'; then $(CYGPATH_W) 'gui/picture_text_cbox.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/picture_text_cbox.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/picture_text_cbox.Tpo" "$(DEPDIR)/picture_text_cbox.Po"; else rm -f "$(DEPDIR)/picture_text_cbox.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT picture_text_cbox.obj -MD -MP -MF $(DEPDIR)/picture_text_cbox.Tpo -c -o picture_text_cbox.obj `if test -f 'gui/picture_text_cbox.cpp'; then $(CYGPATH_W) 'gui/picture_text_cbox.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/picture_text_cbox.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/picture_text_cbox.Tpo $(DEPDIR)/picture_text_cbox.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/picture_text_cbox.cpp' object='picture_text_cbox.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o picture_text_cbox.obj `if test -f 'gui/picture_text_cbox.cpp'; then $(CYGPATH_W) 'gui/picture_text_cbox.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/picture_text_cbox.cpp'; fi`
 
 picture_widget.o: gui/picture_widget.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT picture_widget.o -MD -MP -MF "$(DEPDIR)/picture_widget.Tpo" -c -o picture_widget.o `test -f 'gui/picture_widget.cpp' || echo '$(srcdir)/'`gui/picture_widget.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/picture_widget.Tpo" "$(DEPDIR)/picture_widget.Po"; else rm -f "$(DEPDIR)/picture_widget.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT picture_widget.o -MD -MP -MF $(DEPDIR)/picture_widget.Tpo -c -o picture_widget.o `test -f 'gui/picture_widget.cpp' || echo '$(srcdir)/'`gui/picture_widget.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/picture_widget.Tpo $(DEPDIR)/picture_widget.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/picture_widget.cpp' object='picture_widget.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o picture_widget.o `test -f 'gui/picture_widget.cpp' || echo '$(srcdir)/'`gui/picture_widget.cpp
 
 picture_widget.obj: gui/picture_widget.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT picture_widget.obj -MD -MP -MF "$(DEPDIR)/picture_widget.Tpo" -c -o picture_widget.obj `if test -f 'gui/picture_widget.cpp'; then $(CYGPATH_W) 'gui/picture_widget.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/picture_widget.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/picture_widget.Tpo" "$(DEPDIR)/picture_widget.Po"; else rm -f "$(DEPDIR)/picture_widget.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT picture_widget.obj -MD -MP -MF $(DEPDIR)/picture_widget.Tpo -c -o picture_widget.obj `if test -f 'gui/picture_widget.cpp'; then $(CYGPATH_W) 'gui/picture_widget.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/picture_widget.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/picture_widget.Tpo $(DEPDIR)/picture_widget.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/picture_widget.cpp' object='picture_widget.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o picture_widget.obj `if test -f 'gui/picture_widget.cpp'; then $(CYGPATH_W) 'gui/picture_widget.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/picture_widget.cpp'; fi`
 
 progress_bar.o: gui/progress_bar.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT progress_bar.o -MD -MP -MF "$(DEPDIR)/progress_bar.Tpo" -c -o progress_bar.o `test -f 'gui/progress_bar.cpp' || echo '$(srcdir)/'`gui/progress_bar.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/progress_bar.Tpo" "$(DEPDIR)/progress_bar.Po"; else rm -f "$(DEPDIR)/progress_bar.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT progress_bar.o -MD -MP -MF $(DEPDIR)/progress_bar.Tpo -c -o progress_bar.o `test -f 'gui/progress_bar.cpp' || echo '$(srcdir)/'`gui/progress_bar.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/progress_bar.Tpo $(DEPDIR)/progress_bar.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/progress_bar.cpp' object='progress_bar.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o progress_bar.o `test -f 'gui/progress_bar.cpp' || echo '$(srcdir)/'`gui/progress_bar.cpp
 
 progress_bar.obj: gui/progress_bar.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT progress_bar.obj -MD -MP -MF "$(DEPDIR)/progress_bar.Tpo" -c -o progress_bar.obj `if test -f 'gui/progress_bar.cpp'; then $(CYGPATH_W) 'gui/progress_bar.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/progress_bar.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/progress_bar.Tpo" "$(DEPDIR)/progress_bar.Po"; else rm -f "$(DEPDIR)/progress_bar.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT progress_bar.obj -MD -MP -MF $(DEPDIR)/progress_bar.Tpo -c -o progress_bar.obj `if test -f 'gui/progress_bar.cpp'; then $(CYGPATH_W) 'gui/progress_bar.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/progress_bar.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/progress_bar.Tpo $(DEPDIR)/progress_bar.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/progress_bar.cpp' object='progress_bar.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o progress_bar.obj `if test -f 'gui/progress_bar.cpp'; then $(CYGPATH_W) 'gui/progress_bar.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/progress_bar.cpp'; fi`
 
 question.o: gui/question.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT question.o -MD -MP -MF "$(DEPDIR)/question.Tpo" -c -o question.o `test -f 'gui/question.cpp' || echo '$(srcdir)/'`gui/question.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/question.Tpo" "$(DEPDIR)/question.Po"; else rm -f "$(DEPDIR)/question.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT question.o -MD -MP -MF $(DEPDIR)/question.Tpo -c -o question.o `test -f 'gui/question.cpp' || echo '$(srcdir)/'`gui/question.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/question.Tpo $(DEPDIR)/question.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/question.cpp' object='question.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o question.o `test -f 'gui/question.cpp' || echo '$(srcdir)/'`gui/question.cpp
 
 question.obj: gui/question.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT question.obj -MD -MP -MF "$(DEPDIR)/question.Tpo" -c -o question.obj `if test -f 'gui/question.cpp'; then $(CYGPATH_W) 'gui/question.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/question.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/question.Tpo" "$(DEPDIR)/question.Po"; else rm -f "$(DEPDIR)/question.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT question.obj -MD -MP -MF $(DEPDIR)/question.Tpo -c -o question.obj `if test -f 'gui/question.cpp'; then $(CYGPATH_W) 'gui/question.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/question.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/question.Tpo $(DEPDIR)/question.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/question.cpp' object='question.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o question.obj `if test -f 'gui/question.cpp'; then $(CYGPATH_W) 'gui/question.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/question.cpp'; fi`
 
 spin_button_big.o: gui/spin_button_big.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button_big.o -MD -MP -MF "$(DEPDIR)/spin_button_big.Tpo" -c -o spin_button_big.o `test -f 'gui/spin_button_big.cpp' || echo '$(srcdir)/'`gui/spin_button_big.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spin_button_big.Tpo" "$(DEPDIR)/spin_button_big.Po"; else rm -f "$(DEPDIR)/spin_button_big.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button_big.o -MD -MP -MF $(DEPDIR)/spin_button_big.Tpo -c -o spin_button_big.o `test -f 'gui/spin_button_big.cpp' || echo '$(srcdir)/'`gui/spin_button_big.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spin_button_big.Tpo $(DEPDIR)/spin_button_big.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/spin_button_big.cpp' object='spin_button_big.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spin_button_big.o `test -f 'gui/spin_button_big.cpp' || echo '$(srcdir)/'`gui/spin_button_big.cpp
 
 spin_button_big.obj: gui/spin_button_big.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button_big.obj -MD -MP -MF "$(DEPDIR)/spin_button_big.Tpo" -c -o spin_button_big.obj `if test -f 'gui/spin_button_big.cpp'; then $(CYGPATH_W) 'gui/spin_button_big.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/spin_button_big.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spin_button_big.Tpo" "$(DEPDIR)/spin_button_big.Po"; else rm -f "$(DEPDIR)/spin_button_big.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button_big.obj -MD -MP -MF $(DEPDIR)/spin_button_big.Tpo -c -o spin_button_big.obj `if test -f 'gui/spin_button_big.cpp'; then $(CYGPATH_W) 'gui/spin_button_big.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/spin_button_big.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spin_button_big.Tpo $(DEPDIR)/spin_button_big.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/spin_button_big.cpp' object='spin_button_big.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spin_button_big.obj `if test -f 'gui/spin_button_big.cpp'; then $(CYGPATH_W) 'gui/spin_button_big.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/spin_button_big.cpp'; fi`
 
 spin_button.o: gui/spin_button.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button.o -MD -MP -MF "$(DEPDIR)/spin_button.Tpo" -c -o spin_button.o `test -f 'gui/spin_button.cpp' || echo '$(srcdir)/'`gui/spin_button.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spin_button.Tpo" "$(DEPDIR)/spin_button.Po"; else rm -f "$(DEPDIR)/spin_button.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button.o -MD -MP -MF $(DEPDIR)/spin_button.Tpo -c -o spin_button.o `test -f 'gui/spin_button.cpp' || echo '$(srcdir)/'`gui/spin_button.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spin_button.Tpo $(DEPDIR)/spin_button.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/spin_button.cpp' object='spin_button.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spin_button.o `test -f 'gui/spin_button.cpp' || echo '$(srcdir)/'`gui/spin_button.cpp
 
 spin_button.obj: gui/spin_button.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button.obj -MD -MP -MF "$(DEPDIR)/spin_button.Tpo" -c -o spin_button.obj `if test -f 'gui/spin_button.cpp'; then $(CYGPATH_W) 'gui/spin_button.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/spin_button.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spin_button.Tpo" "$(DEPDIR)/spin_button.Po"; else rm -f "$(DEPDIR)/spin_button.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button.obj -MD -MP -MF $(DEPDIR)/spin_button.Tpo -c -o spin_button.obj `if test -f 'gui/spin_button.cpp'; then $(CYGPATH_W) 'gui/spin_button.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/spin_button.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spin_button.Tpo $(DEPDIR)/spin_button.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/spin_button.cpp' object='spin_button.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spin_button.obj `if test -f 'gui/spin_button.cpp'; then $(CYGPATH_W) 'gui/spin_button.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/spin_button.cpp'; fi`
 
 spin_button_picture.o: gui/spin_button_picture.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button_picture.o -MD -MP -MF "$(DEPDIR)/spin_button_picture.Tpo" -c -o spin_button_picture.o `test -f 'gui/spin_button_picture.cpp' || echo '$(srcdir)/'`gui/spin_button_picture.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spin_button_picture.Tpo" "$(DEPDIR)/spin_button_picture.Po"; else rm -f "$(DEPDIR)/spin_button_picture.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button_picture.o -MD -MP -MF $(DEPDIR)/spin_button_picture.Tpo -c -o spin_button_picture.o `test -f 'gui/spin_button_picture.cpp' || echo '$(srcdir)/'`gui/spin_button_picture.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spin_button_picture.Tpo $(DEPDIR)/spin_button_picture.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/spin_button_picture.cpp' object='spin_button_picture.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spin_button_picture.o `test -f 'gui/spin_button_picture.cpp' || echo '$(srcdir)/'`gui/spin_button_picture.cpp
 
 spin_button_picture.obj: gui/spin_button_picture.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button_picture.obj -MD -MP -MF "$(DEPDIR)/spin_button_picture.Tpo" -c -o spin_button_picture.obj `if test -f 'gui/spin_button_picture.cpp'; then $(CYGPATH_W) 'gui/spin_button_picture.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/spin_button_picture.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/spin_button_picture.Tpo" "$(DEPDIR)/spin_button_picture.Po"; else rm -f "$(DEPDIR)/spin_button_picture.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spin_button_picture.obj -MD -MP -MF $(DEPDIR)/spin_button_picture.Tpo -c -o spin_button_picture.obj `if test -f 'gui/spin_button_picture.cpp'; then $(CYGPATH_W) 'gui/spin_button_picture.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/spin_button_picture.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/spin_button_picture.Tpo $(DEPDIR)/spin_button_picture.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/spin_button_picture.cpp' object='spin_button_picture.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spin_button_picture.obj `if test -f 'gui/spin_button_picture.cpp'; then $(CYGPATH_W) 'gui/spin_button_picture.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/spin_button_picture.cpp'; fi`
 
 tabs.o: gui/tabs.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tabs.o -MD -MP -MF "$(DEPDIR)/tabs.Tpo" -c -o tabs.o `test -f 'gui/tabs.cpp' || echo '$(srcdir)/'`gui/tabs.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/tabs.Tpo" "$(DEPDIR)/tabs.Po"; else rm -f "$(DEPDIR)/tabs.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tabs.o -MD -MP -MF $(DEPDIR)/tabs.Tpo -c -o tabs.o `test -f 'gui/tabs.cpp' || echo '$(srcdir)/'`gui/tabs.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/tabs.Tpo $(DEPDIR)/tabs.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/tabs.cpp' object='tabs.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tabs.o `test -f 'gui/tabs.cpp' || echo '$(srcdir)/'`gui/tabs.cpp
 
 tabs.obj: gui/tabs.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tabs.obj -MD -MP -MF "$(DEPDIR)/tabs.Tpo" -c -o tabs.obj `if test -f 'gui/tabs.cpp'; then $(CYGPATH_W) 'gui/tabs.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/tabs.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/tabs.Tpo" "$(DEPDIR)/tabs.Po"; else rm -f "$(DEPDIR)/tabs.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tabs.obj -MD -MP -MF $(DEPDIR)/tabs.Tpo -c -o tabs.obj `if test -f 'gui/tabs.cpp'; then $(CYGPATH_W) 'gui/tabs.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/tabs.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/tabs.Tpo $(DEPDIR)/tabs.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/tabs.cpp' object='tabs.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tabs.obj `if test -f 'gui/tabs.cpp'; then $(CYGPATH_W) 'gui/tabs.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/tabs.cpp'; fi`
 
+talk_box.o: gui/talk_box.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT talk_box.o -MD -MP -MF $(DEPDIR)/talk_box.Tpo -c -o talk_box.o `test -f 'gui/talk_box.cpp' || echo '$(srcdir)/'`gui/talk_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/talk_box.Tpo $(DEPDIR)/talk_box.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/talk_box.cpp' object='talk_box.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o talk_box.o `test -f 'gui/talk_box.cpp' || echo '$(srcdir)/'`gui/talk_box.cpp
+
+talk_box.obj: gui/talk_box.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT talk_box.obj -MD -MP -MF $(DEPDIR)/talk_box.Tpo -c -o talk_box.obj `if test -f 'gui/talk_box.cpp'; then $(CYGPATH_W) 'gui/talk_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/talk_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/talk_box.Tpo $(DEPDIR)/talk_box.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/talk_box.cpp' object='talk_box.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o talk_box.obj `if test -f 'gui/talk_box.cpp'; then $(CYGPATH_W) 'gui/talk_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/talk_box.cpp'; fi`
+
 text_box.o: gui/text_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_box.o -MD -MP -MF "$(DEPDIR)/text_box.Tpo" -c -o text_box.o `test -f 'gui/text_box.cpp' || echo '$(srcdir)/'`gui/text_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text_box.Tpo" "$(DEPDIR)/text_box.Po"; else rm -f "$(DEPDIR)/text_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_box.o -MD -MP -MF $(DEPDIR)/text_box.Tpo -c -o text_box.o `test -f 'gui/text_box.cpp' || echo '$(srcdir)/'`gui/text_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/text_box.Tpo $(DEPDIR)/text_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/text_box.cpp' object='text_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_box.o `test -f 'gui/text_box.cpp' || echo '$(srcdir)/'`gui/text_box.cpp
 
 text_box.obj: gui/text_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_box.obj -MD -MP -MF "$(DEPDIR)/text_box.Tpo" -c -o text_box.obj `if test -f 'gui/text_box.cpp'; then $(CYGPATH_W) 'gui/text_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/text_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text_box.Tpo" "$(DEPDIR)/text_box.Po"; else rm -f "$(DEPDIR)/text_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_box.obj -MD -MP -MF $(DEPDIR)/text_box.Tpo -c -o text_box.obj `if test -f 'gui/text_box.cpp'; then $(CYGPATH_W) 'gui/text_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/text_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/text_box.Tpo $(DEPDIR)/text_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/text_box.cpp' object='text_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_box.obj `if test -f 'gui/text_box.cpp'; then $(CYGPATH_W) 'gui/text_box.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/text_box.cpp'; fi`
 
 widget.o: gui/widget.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget.o -MD -MP -MF "$(DEPDIR)/widget.Tpo" -c -o widget.o `test -f 'gui/widget.cpp' || echo '$(srcdir)/'`gui/widget.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/widget.Tpo" "$(DEPDIR)/widget.Po"; else rm -f "$(DEPDIR)/widget.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget.o -MD -MP -MF $(DEPDIR)/widget.Tpo -c -o widget.o `test -f 'gui/widget.cpp' || echo '$(srcdir)/'`gui/widget.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/widget.Tpo $(DEPDIR)/widget.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/widget.cpp' object='widget.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o widget.o `test -f 'gui/widget.cpp' || echo '$(srcdir)/'`gui/widget.cpp
 
 widget.obj: gui/widget.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget.obj -MD -MP -MF "$(DEPDIR)/widget.Tpo" -c -o widget.obj `if test -f 'gui/widget.cpp'; then $(CYGPATH_W) 'gui/widget.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/widget.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/widget.Tpo" "$(DEPDIR)/widget.Po"; else rm -f "$(DEPDIR)/widget.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget.obj -MD -MP -MF $(DEPDIR)/widget.Tpo -c -o widget.obj `if test -f 'gui/widget.cpp'; then $(CYGPATH_W) 'gui/widget.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/widget.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/widget.Tpo $(DEPDIR)/widget.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/widget.cpp' object='widget.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o widget.obj `if test -f 'gui/widget.cpp'; then $(CYGPATH_W) 'gui/widget.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/widget.cpp'; fi`
 
 widget_list.o: gui/widget_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget_list.o -MD -MP -MF "$(DEPDIR)/widget_list.Tpo" -c -o widget_list.o `test -f 'gui/widget_list.cpp' || echo '$(srcdir)/'`gui/widget_list.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/widget_list.Tpo" "$(DEPDIR)/widget_list.Po"; else rm -f "$(DEPDIR)/widget_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget_list.o -MD -MP -MF $(DEPDIR)/widget_list.Tpo -c -o widget_list.o `test -f 'gui/widget_list.cpp' || echo '$(srcdir)/'`gui/widget_list.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/widget_list.Tpo $(DEPDIR)/widget_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/widget_list.cpp' object='widget_list.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o widget_list.o `test -f 'gui/widget_list.cpp' || echo '$(srcdir)/'`gui/widget_list.cpp
 
 widget_list.obj: gui/widget_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget_list.obj -MD -MP -MF "$(DEPDIR)/widget_list.Tpo" -c -o widget_list.obj `if test -f 'gui/widget_list.cpp'; then $(CYGPATH_W) 'gui/widget_list.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/widget_list.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/widget_list.Tpo" "$(DEPDIR)/widget_list.Po"; else rm -f "$(DEPDIR)/widget_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget_list.obj -MD -MP -MF $(DEPDIR)/widget_list.Tpo -c -o widget_list.obj `if test -f 'gui/widget_list.cpp'; then $(CYGPATH_W) 'gui/widget_list.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/widget_list.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/widget_list.Tpo $(DEPDIR)/widget_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/widget_list.cpp' object='widget_list.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o widget_list.obj `if test -f 'gui/widget_list.cpp'; then $(CYGPATH_W) 'gui/widget_list.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/widget_list.cpp'; fi`
 
 button_pic.o: gui/big/button_pic.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button_pic.o -MD -MP -MF "$(DEPDIR)/button_pic.Tpo" -c -o button_pic.o `test -f 'gui/big/button_pic.cpp' || echo '$(srcdir)/'`gui/big/button_pic.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/button_pic.Tpo" "$(DEPDIR)/button_pic.Po"; else rm -f "$(DEPDIR)/button_pic.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button_pic.o -MD -MP -MF $(DEPDIR)/button_pic.Tpo -c -o button_pic.o `test -f 'gui/big/button_pic.cpp' || echo '$(srcdir)/'`gui/big/button_pic.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/button_pic.Tpo $(DEPDIR)/button_pic.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/big/button_pic.cpp' object='button_pic.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o button_pic.o `test -f 'gui/big/button_pic.cpp' || echo '$(srcdir)/'`gui/big/button_pic.cpp
 
 button_pic.obj: gui/big/button_pic.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button_pic.obj -MD -MP -MF "$(DEPDIR)/button_pic.Tpo" -c -o button_pic.obj `if test -f 'gui/big/button_pic.cpp'; then $(CYGPATH_W) 'gui/big/button_pic.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/big/button_pic.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/button_pic.Tpo" "$(DEPDIR)/button_pic.Po"; else rm -f "$(DEPDIR)/button_pic.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button_pic.obj -MD -MP -MF $(DEPDIR)/button_pic.Tpo -c -o button_pic.obj `if test -f 'gui/big/button_pic.cpp'; then $(CYGPATH_W) 'gui/big/button_pic.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/big/button_pic.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/button_pic.Tpo $(DEPDIR)/button_pic.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/big/button_pic.cpp' object='button_pic.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o button_pic.obj `if test -f 'gui/big/button_pic.cpp'; then $(CYGPATH_W) 'gui/big/button_pic.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/big/button_pic.cpp'; fi`
 
 action.o: include/action.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action.o -MD -MP -MF "$(DEPDIR)/action.Tpo" -c -o action.o `test -f 'include/action.cpp' || echo '$(srcdir)/'`include/action.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/action.Tpo" "$(DEPDIR)/action.Po"; else rm -f "$(DEPDIR)/action.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action.o -MD -MP -MF $(DEPDIR)/action.Tpo -c -o action.o `test -f 'include/action.cpp' || echo '$(srcdir)/'`include/action.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/action.Tpo $(DEPDIR)/action.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='include/action.cpp' object='action.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o action.o `test -f 'include/action.cpp' || echo '$(srcdir)/'`include/action.cpp
 
 action.obj: include/action.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action.obj -MD -MP -MF "$(DEPDIR)/action.Tpo" -c -o action.obj `if test -f 'include/action.cpp'; then $(CYGPATH_W) 'include/action.cpp'; else $(CYGPATH_W) '$(srcdir)/include/action.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/action.Tpo" "$(DEPDIR)/action.Po"; else rm -f "$(DEPDIR)/action.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action.obj -MD -MP -MF $(DEPDIR)/action.Tpo -c -o action.obj `if test -f 'include/action.cpp'; then $(CYGPATH_W) 'include/action.cpp'; else $(CYGPATH_W) '$(srcdir)/include/action.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/action.Tpo $(DEPDIR)/action.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='include/action.cpp' object='action.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o action.obj `if test -f 'include/action.cpp'; then $(CYGPATH_W) 'include/action.cpp'; else $(CYGPATH_W) '$(srcdir)/include/action.cpp'; fi`
 
 action_handler.o: include/action_handler.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action_handler.o -MD -MP -MF "$(DEPDIR)/action_handler.Tpo" -c -o action_handler.o `test -f 'include/action_handler.cpp' || echo '$(srcdir)/'`include/action_handler.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/action_handler.Tpo" "$(DEPDIR)/action_handler.Po"; else rm -f "$(DEPDIR)/action_handler.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action_handler.o -MD -MP -MF $(DEPDIR)/action_handler.Tpo -c -o action_handler.o `test -f 'include/action_handler.cpp' || echo '$(srcdir)/'`include/action_handler.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/action_handler.Tpo $(DEPDIR)/action_handler.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='include/action_handler.cpp' object='action_handler.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o action_handler.o `test -f 'include/action_handler.cpp' || echo '$(srcdir)/'`include/action_handler.cpp
 
 action_handler.obj: include/action_handler.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action_handler.obj -MD -MP -MF "$(DEPDIR)/action_handler.Tpo" -c -o action_handler.obj `if test -f 'include/action_handler.cpp'; then $(CYGPATH_W) 'include/action_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/include/action_handler.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/action_handler.Tpo" "$(DEPDIR)/action_handler.Po"; else rm -f "$(DEPDIR)/action_handler.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action_handler.obj -MD -MP -MF $(DEPDIR)/action_handler.Tpo -c -o action_handler.obj `if test -f 'include/action_handler.cpp'; then $(CYGPATH_W) 'include/action_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/include/action_handler.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/action_handler.Tpo $(DEPDIR)/action_handler.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='include/action_handler.cpp' object='action_handler.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o action_handler.obj `if test -f 'include/action_handler.cpp'; then $(CYGPATH_W) 'include/action_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/include/action_handler.cpp'; fi`
 
 constant.o: include/constant.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT constant.o -MD -MP -MF "$(DEPDIR)/constant.Tpo" -c -o constant.o `test -f 'include/constant.cpp' || echo '$(srcdir)/'`include/constant.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/constant.Tpo" "$(DEPDIR)/constant.Po"; else rm -f "$(DEPDIR)/constant.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT constant.o -MD -MP -MF $(DEPDIR)/constant.Tpo -c -o constant.o `test -f 'include/constant.cpp' || echo '$(srcdir)/'`include/constant.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/constant.Tpo $(DEPDIR)/constant.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='include/constant.cpp' object='constant.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o constant.o `test -f 'include/constant.cpp' || echo '$(srcdir)/'`include/constant.cpp
 
 constant.obj: include/constant.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT constant.obj -MD -MP -MF "$(DEPDIR)/constant.Tpo" -c -o constant.obj `if test -f 'include/constant.cpp'; then $(CYGPATH_W) 'include/constant.cpp'; else $(CYGPATH_W) '$(srcdir)/include/constant.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/constant.Tpo" "$(DEPDIR)/constant.Po"; else rm -f "$(DEPDIR)/constant.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT constant.obj -MD -MP -MF $(DEPDIR)/constant.Tpo -c -o constant.obj `if test -f 'include/constant.cpp'; then $(CYGPATH_W) 'include/constant.cpp'; else $(CYGPATH_W) '$(srcdir)/include/constant.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/constant.Tpo $(DEPDIR)/constant.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='include/constant.cpp' object='constant.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o constant.obj `if test -f 'include/constant.cpp'; then $(CYGPATH_W) 'include/constant.cpp'; else $(CYGPATH_W) '$(srcdir)/include/constant.cpp'; fi`
 
 singleton.o: include/singleton.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT singleton.o -MD -MP -MF "$(DEPDIR)/singleton.Tpo" -c -o singleton.o `test -f 'include/singleton.cpp' || echo '$(srcdir)/'`include/singleton.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/singleton.Tpo" "$(DEPDIR)/singleton.Po"; else rm -f "$(DEPDIR)/singleton.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT singleton.o -MD -MP -MF $(DEPDIR)/singleton.Tpo -c -o singleton.o `test -f 'include/singleton.cpp' || echo '$(srcdir)/'`include/singleton.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/singleton.Tpo $(DEPDIR)/singleton.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='include/singleton.cpp' object='singleton.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o singleton.o `test -f 'include/singleton.cpp' || echo '$(srcdir)/'`include/singleton.cpp
 
 singleton.obj: include/singleton.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT singleton.obj -MD -MP -MF "$(DEPDIR)/singleton.Tpo" -c -o singleton.obj `if test -f 'include/singleton.cpp'; then $(CYGPATH_W) 'include/singleton.cpp'; else $(CYGPATH_W) '$(srcdir)/include/singleton.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/singleton.Tpo" "$(DEPDIR)/singleton.Po"; else rm -f "$(DEPDIR)/singleton.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT singleton.obj -MD -MP -MF $(DEPDIR)/singleton.Tpo -c -o singleton.obj `if test -f 'include/singleton.cpp'; then $(CYGPATH_W) 'include/singleton.cpp'; else $(CYGPATH_W) '$(srcdir)/include/singleton.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/singleton.Tpo $(DEPDIR)/singleton.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='include/singleton.cpp' object='singleton.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o singleton.obj `if test -f 'include/singleton.cpp'; then $(CYGPATH_W) 'include/singleton.cpp'; else $(CYGPATH_W) '$(srcdir)/include/singleton.cpp'; fi`
 
 cursor.o: interface/cursor.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cursor.o -MD -MP -MF "$(DEPDIR)/cursor.Tpo" -c -o cursor.o `test -f 'interface/cursor.cpp' || echo '$(srcdir)/'`interface/cursor.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/cursor.Tpo" "$(DEPDIR)/cursor.Po"; else rm -f "$(DEPDIR)/cursor.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cursor.o -MD -MP -MF $(DEPDIR)/cursor.Tpo -c -o cursor.o `test -f 'interface/cursor.cpp' || echo '$(srcdir)/'`interface/cursor.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/cursor.Tpo $(DEPDIR)/cursor.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/cursor.cpp' object='cursor.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cursor.o `test -f 'interface/cursor.cpp' || echo '$(srcdir)/'`interface/cursor.cpp
 
 cursor.obj: interface/cursor.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cursor.obj -MD -MP -MF "$(DEPDIR)/cursor.Tpo" -c -o cursor.obj `if test -f 'interface/cursor.cpp'; then $(CYGPATH_W) 'interface/cursor.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/cursor.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/cursor.Tpo" "$(DEPDIR)/cursor.Po"; else rm -f "$(DEPDIR)/cursor.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cursor.obj -MD -MP -MF $(DEPDIR)/cursor.Tpo -c -o cursor.obj `if test -f 'interface/cursor.cpp'; then $(CYGPATH_W) 'interface/cursor.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/cursor.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/cursor.Tpo $(DEPDIR)/cursor.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/cursor.cpp' object='cursor.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cursor.obj `if test -f 'interface/cursor.cpp'; then $(CYGPATH_W) 'interface/cursor.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/cursor.cpp'; fi`
 
 game_msg.o: interface/game_msg.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_msg.o -MD -MP -MF "$(DEPDIR)/game_msg.Tpo" -c -o game_msg.o `test -f 'interface/game_msg.cpp' || echo '$(srcdir)/'`interface/game_msg.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_msg.Tpo" "$(DEPDIR)/game_msg.Po"; else rm -f "$(DEPDIR)/game_msg.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_msg.o -MD -MP -MF $(DEPDIR)/game_msg.Tpo -c -o game_msg.o `test -f 'interface/game_msg.cpp' || echo '$(srcdir)/'`interface/game_msg.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_msg.Tpo $(DEPDIR)/game_msg.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/game_msg.cpp' object='game_msg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_msg.o `test -f 'interface/game_msg.cpp' || echo '$(srcdir)/'`interface/game_msg.cpp
 
 game_msg.obj: interface/game_msg.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_msg.obj -MD -MP -MF "$(DEPDIR)/game_msg.Tpo" -c -o game_msg.obj `if test -f 'interface/game_msg.cpp'; then $(CYGPATH_W) 'interface/game_msg.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/game_msg.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_msg.Tpo" "$(DEPDIR)/game_msg.Po"; else rm -f "$(DEPDIR)/game_msg.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_msg.obj -MD -MP -MF $(DEPDIR)/game_msg.Tpo -c -o game_msg.obj `if test -f 'interface/game_msg.cpp'; then $(CYGPATH_W) 'interface/game_msg.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/game_msg.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_msg.Tpo $(DEPDIR)/game_msg.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/game_msg.cpp' object='game_msg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_msg.obj `if test -f 'interface/game_msg.cpp'; then $(CYGPATH_W) 'interface/game_msg.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/game_msg.cpp'; fi`
 
 interface.o: interface/interface.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT interface.o -MD -MP -MF "$(DEPDIR)/interface.Tpo" -c -o interface.o `test -f 'interface/interface.cpp' || echo '$(srcdir)/'`interface/interface.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/interface.Tpo" "$(DEPDIR)/interface.Po"; else rm -f "$(DEPDIR)/interface.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT interface.o -MD -MP -MF $(DEPDIR)/interface.Tpo -c -o interface.o `test -f 'interface/interface.cpp' || echo '$(srcdir)/'`interface/interface.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/interface.Tpo $(DEPDIR)/interface.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/interface.cpp' object='interface.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o interface.o `test -f 'interface/interface.cpp' || echo '$(srcdir)/'`interface/interface.cpp
 
 interface.obj: interface/interface.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT interface.obj -MD -MP -MF "$(DEPDIR)/interface.Tpo" -c -o interface.obj `if test -f 'interface/interface.cpp'; then $(CYGPATH_W) 'interface/interface.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/interface.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/interface.Tpo" "$(DEPDIR)/interface.Po"; else rm -f "$(DEPDIR)/interface.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT interface.obj -MD -MP -MF $(DEPDIR)/interface.Tpo -c -o interface.obj `if test -f 'interface/interface.cpp'; then $(CYGPATH_W) 'interface/interface.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/interface.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/interface.Tpo $(DEPDIR)/interface.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/interface.cpp' object='interface.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o interface.obj `if test -f 'interface/interface.cpp'; then $(CYGPATH_W) 'interface/interface.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/interface.cpp'; fi`
 
 joystick.o: interface/joystick.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT joystick.o -MD -MP -MF "$(DEPDIR)/joystick.Tpo" -c -o joystick.o `test -f 'interface/joystick.cpp' || echo '$(srcdir)/'`interface/joystick.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/joystick.Tpo" "$(DEPDIR)/joystick.Po"; else rm -f "$(DEPDIR)/joystick.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT joystick.o -MD -MP -MF $(DEPDIR)/joystick.Tpo -c -o joystick.o `test -f 'interface/joystick.cpp' || echo '$(srcdir)/'`interface/joystick.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/joystick.Tpo $(DEPDIR)/joystick.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/joystick.cpp' object='joystick.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o joystick.o `test -f 'interface/joystick.cpp' || echo '$(srcdir)/'`interface/joystick.cpp
 
 joystick.obj: interface/joystick.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT joystick.obj -MD -MP -MF "$(DEPDIR)/joystick.Tpo" -c -o joystick.obj `if test -f 'interface/joystick.cpp'; then $(CYGPATH_W) 'interface/joystick.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/joystick.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/joystick.Tpo" "$(DEPDIR)/joystick.Po"; else rm -f "$(DEPDIR)/joystick.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT joystick.obj -MD -MP -MF $(DEPDIR)/joystick.Tpo -c -o joystick.obj `if test -f 'interface/joystick.cpp'; then $(CYGPATH_W) 'interface/joystick.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/joystick.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/joystick.Tpo $(DEPDIR)/joystick.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/joystick.cpp' object='joystick.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o joystick.obj `if test -f 'interface/joystick.cpp'; then $(CYGPATH_W) 'interface/joystick.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/joystick.cpp'; fi`
 
 keyboard.o: interface/keyboard.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT keyboard.o -MD -MP -MF "$(DEPDIR)/keyboard.Tpo" -c -o keyboard.o `test -f 'interface/keyboard.cpp' || echo '$(srcdir)/'`interface/keyboard.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/keyboard.Tpo" "$(DEPDIR)/keyboard.Po"; else rm -f "$(DEPDIR)/keyboard.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT keyboard.o -MD -MP -MF $(DEPDIR)/keyboard.Tpo -c -o keyboard.o `test -f 'interface/keyboard.cpp' || echo '$(srcdir)/'`interface/keyboard.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/keyboard.Tpo $(DEPDIR)/keyboard.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/keyboard.cpp' object='keyboard.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o keyboard.o `test -f 'interface/keyboard.cpp' || echo '$(srcdir)/'`interface/keyboard.cpp
 
 keyboard.obj: interface/keyboard.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT keyboard.obj -MD -MP -MF "$(DEPDIR)/keyboard.Tpo" -c -o keyboard.obj `if test -f 'interface/keyboard.cpp'; then $(CYGPATH_W) 'interface/keyboard.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/keyboard.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/keyboard.Tpo" "$(DEPDIR)/keyboard.Po"; else rm -f "$(DEPDIR)/keyboard.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT keyboard.obj -MD -MP -MF $(DEPDIR)/keyboard.Tpo -c -o keyboard.obj `if test -f 'interface/keyboard.cpp'; then $(CYGPATH_W) 'interface/keyboard.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/keyboard.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/keyboard.Tpo $(DEPDIR)/keyboard.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/keyboard.cpp' object='keyboard.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o keyboard.obj `if test -f 'interface/keyboard.cpp'; then $(CYGPATH_W) 'interface/keyboard.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/keyboard.cpp'; fi`
 
 loading_screen.o: interface/loading_screen.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT loading_screen.o -MD -MP -MF "$(DEPDIR)/loading_screen.Tpo" -c -o loading_screen.o `test -f 'interface/loading_screen.cpp' || echo '$(srcdir)/'`interface/loading_screen.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/loading_screen.Tpo" "$(DEPDIR)/loading_screen.Po"; else rm -f "$(DEPDIR)/loading_screen.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT loading_screen.o -MD -MP -MF $(DEPDIR)/loading_screen.Tpo -c -o loading_screen.o `test -f 'interface/loading_screen.cpp' || echo '$(srcdir)/'`interface/loading_screen.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/loading_screen.Tpo $(DEPDIR)/loading_screen.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/loading_screen.cpp' object='loading_screen.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o loading_screen.o `test -f 'interface/loading_screen.cpp' || echo '$(srcdir)/'`interface/loading_screen.cpp
 
 loading_screen.obj: interface/loading_screen.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT loading_screen.obj -MD -MP -MF "$(DEPDIR)/loading_screen.Tpo" -c -o loading_screen.obj `if test -f 'interface/loading_screen.cpp'; then $(CYGPATH_W) 'interface/loading_screen.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/loading_screen.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/loading_screen.Tpo" "$(DEPDIR)/loading_screen.Po"; else rm -f "$(DEPDIR)/loading_screen.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT loading_screen.obj -MD -MP -MF $(DEPDIR)/loading_screen.Tpo -c -o loading_screen.obj `if test -f 'interface/loading_screen.cpp'; then $(CYGPATH_W) 'interface/loading_screen.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/loading_screen.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/loading_screen.Tpo $(DEPDIR)/loading_screen.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/loading_screen.cpp' object='loading_screen.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o loading_screen.obj `if test -f 'interface/loading_screen.cpp'; then $(CYGPATH_W) 'interface/loading_screen.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/loading_screen.cpp'; fi`
 
 man_machine_interface.o: interface/man_machine_interface.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT man_machine_interface.o -MD -MP -MF "$(DEPDIR)/man_machine_interface.Tpo" -c -o man_machine_interface.o `test -f 'interface/man_machine_interface.cpp' || echo '$(srcdir)/'`interface/man_machine_interface.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/man_machine_interface.Tpo" "$(DEPDIR)/man_machine_interface.Po"; else rm -f "$(DEPDIR)/man_machine_interface.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT man_machine_interface.o -MD -MP -MF $(DEPDIR)/man_machine_interface.Tpo -c -o man_machine_interface.o `test -f 'interface/man_machine_interface.cpp' || echo '$(srcdir)/'`interface/man_machine_interface.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/man_machine_interface.Tpo $(DEPDIR)/man_machine_interface.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/man_machine_interface.cpp' object='man_machine_interface.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o man_machine_interface.o `test -f 'interface/man_machine_interface.cpp' || echo '$(srcdir)/'`interface/man_machine_interface.cpp
 
 man_machine_interface.obj: interface/man_machine_interface.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT man_machine_interface.obj -MD -MP -MF "$(DEPDIR)/man_machine_interface.Tpo" -c -o man_machine_interface.obj `if test -f 'interface/man_machine_interface.cpp'; then $(CYGPATH_W) 'interface/man_machine_interface.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/man_machine_interface.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/man_machine_interface.Tpo" "$(DEPDIR)/man_machine_interface.Po"; else rm -f "$(DEPDIR)/man_machine_interface.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT man_machine_interface.obj -MD -MP -MF $(DEPDIR)/man_machine_interface.Tpo -c -o man_machine_interface.obj `if test -f 'interface/man_machine_interface.cpp'; then $(CYGPATH_W) 'interface/man_machine_interface.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/man_machine_interface.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/man_machine_interface.Tpo $(DEPDIR)/man_machine_interface.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/man_machine_interface.cpp' object='man_machine_interface.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o man_machine_interface.obj `if test -f 'interface/man_machine_interface.cpp'; then $(CYGPATH_W) 'interface/man_machine_interface.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/man_machine_interface.cpp'; fi`
 
 mouse.o: interface/mouse.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mouse.o -MD -MP -MF "$(DEPDIR)/mouse.Tpo" -c -o mouse.o `test -f 'interface/mouse.cpp' || echo '$(srcdir)/'`interface/mouse.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mouse.Tpo" "$(DEPDIR)/mouse.Po"; else rm -f "$(DEPDIR)/mouse.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mouse.o -MD -MP -MF $(DEPDIR)/mouse.Tpo -c -o mouse.o `test -f 'interface/mouse.cpp' || echo '$(srcdir)/'`interface/mouse.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mouse.Tpo $(DEPDIR)/mouse.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/mouse.cpp' object='mouse.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mouse.o `test -f 'interface/mouse.cpp' || echo '$(srcdir)/'`interface/mouse.cpp
 
 mouse.obj: interface/mouse.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mouse.obj -MD -MP -MF "$(DEPDIR)/mouse.Tpo" -c -o mouse.obj `if test -f 'interface/mouse.cpp'; then $(CYGPATH_W) 'interface/mouse.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/mouse.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mouse.Tpo" "$(DEPDIR)/mouse.Po"; else rm -f "$(DEPDIR)/mouse.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mouse.obj -MD -MP -MF $(DEPDIR)/mouse.Tpo -c -o mouse.obj `if test -f 'interface/mouse.cpp'; then $(CYGPATH_W) 'interface/mouse.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/mouse.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mouse.Tpo $(DEPDIR)/mouse.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/mouse.cpp' object='mouse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mouse.obj `if test -f 'interface/mouse.cpp'; then $(CYGPATH_W) 'interface/mouse.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/mouse.cpp'; fi`
 
 mouse_cursor.o: interface/mouse_cursor.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mouse_cursor.o -MD -MP -MF "$(DEPDIR)/mouse_cursor.Tpo" -c -o mouse_cursor.o `test -f 'interface/mouse_cursor.cpp' || echo '$(srcdir)/'`interface/mouse_cursor.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mouse_cursor.Tpo" "$(DEPDIR)/mouse_cursor.Po"; else rm -f "$(DEPDIR)/mouse_cursor.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mouse_cursor.o -MD -MP -MF $(DEPDIR)/mouse_cursor.Tpo -c -o mouse_cursor.o `test -f 'interface/mouse_cursor.cpp' || echo '$(srcdir)/'`interface/mouse_cursor.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mouse_cursor.Tpo $(DEPDIR)/mouse_cursor.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/mouse_cursor.cpp' object='mouse_cursor.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mouse_cursor.o `test -f 'interface/mouse_cursor.cpp' || echo '$(srcdir)/'`interface/mouse_cursor.cpp
 
 mouse_cursor.obj: interface/mouse_cursor.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mouse_cursor.obj -MD -MP -MF "$(DEPDIR)/mouse_cursor.Tpo" -c -o mouse_cursor.obj `if test -f 'interface/mouse_cursor.cpp'; then $(CYGPATH_W) 'interface/mouse_cursor.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/mouse_cursor.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mouse_cursor.Tpo" "$(DEPDIR)/mouse_cursor.Po"; else rm -f "$(DEPDIR)/mouse_cursor.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mouse_cursor.obj -MD -MP -MF $(DEPDIR)/mouse_cursor.Tpo -c -o mouse_cursor.obj `if test -f 'interface/mouse_cursor.cpp'; then $(CYGPATH_W) 'interface/mouse_cursor.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/mouse_cursor.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mouse_cursor.Tpo $(DEPDIR)/mouse_cursor.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/mouse_cursor.cpp' object='mouse_cursor.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mouse_cursor.obj `if test -f 'interface/mouse_cursor.cpp'; then $(CYGPATH_W) 'interface/mouse_cursor.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/mouse_cursor.cpp'; fi`
 
 weapon_menu.o: interface/weapon_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_menu.o -MD -MP -MF "$(DEPDIR)/weapon_menu.Tpo" -c -o weapon_menu.o `test -f 'interface/weapon_menu.cpp' || echo '$(srcdir)/'`interface/weapon_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapon_menu.Tpo" "$(DEPDIR)/weapon_menu.Po"; else rm -f "$(DEPDIR)/weapon_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_menu.o -MD -MP -MF $(DEPDIR)/weapon_menu.Tpo -c -o weapon_menu.o `test -f 'interface/weapon_menu.cpp' || echo '$(srcdir)/'`interface/weapon_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapon_menu.Tpo $(DEPDIR)/weapon_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/weapon_menu.cpp' object='weapon_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon_menu.o `test -f 'interface/weapon_menu.cpp' || echo '$(srcdir)/'`interface/weapon_menu.cpp
 
 weapon_menu.obj: interface/weapon_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_menu.obj -MD -MP -MF "$(DEPDIR)/weapon_menu.Tpo" -c -o weapon_menu.obj `if test -f 'interface/weapon_menu.cpp'; then $(CYGPATH_W) 'interface/weapon_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/weapon_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapon_menu.Tpo" "$(DEPDIR)/weapon_menu.Po"; else rm -f "$(DEPDIR)/weapon_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_menu.obj -MD -MP -MF $(DEPDIR)/weapon_menu.Tpo -c -o weapon_menu.obj `if test -f 'interface/weapon_menu.cpp'; then $(CYGPATH_W) 'interface/weapon_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/weapon_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapon_menu.Tpo $(DEPDIR)/weapon_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='interface/weapon_menu.cpp' object='weapon_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon_menu.obj `if test -f 'interface/weapon_menu.cpp'; then $(CYGPATH_W) 'interface/weapon_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/interface/weapon_menu.cpp'; fi`
 
 camera.o: map/camera.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT camera.o -MD -MP -MF "$(DEPDIR)/camera.Tpo" -c -o camera.o `test -f 'map/camera.cpp' || echo '$(srcdir)/'`map/camera.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/camera.Tpo" "$(DEPDIR)/camera.Po"; else rm -f "$(DEPDIR)/camera.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT camera.o -MD -MP -MF $(DEPDIR)/camera.Tpo -c -o camera.o `test -f 'map/camera.cpp' || echo '$(srcdir)/'`map/camera.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/camera.Tpo $(DEPDIR)/camera.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/camera.cpp' object='camera.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o camera.o `test -f 'map/camera.cpp' || echo '$(srcdir)/'`map/camera.cpp
 
 camera.obj: map/camera.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT camera.obj -MD -MP -MF "$(DEPDIR)/camera.Tpo" -c -o camera.obj `if test -f 'map/camera.cpp'; then $(CYGPATH_W) 'map/camera.cpp'; else $(CYGPATH_W) '$(srcdir)/map/camera.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/camera.Tpo" "$(DEPDIR)/camera.Po"; else rm -f "$(DEPDIR)/camera.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT camera.obj -MD -MP -MF $(DEPDIR)/camera.Tpo -c -o camera.obj `if test -f 'map/camera.cpp'; then $(CYGPATH_W) 'map/camera.cpp'; else $(CYGPATH_W) '$(srcdir)/map/camera.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/camera.Tpo $(DEPDIR)/camera.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/camera.cpp' object='camera.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o camera.obj `if test -f 'map/camera.cpp'; then $(CYGPATH_W) 'map/camera.cpp'; else $(CYGPATH_W) '$(srcdir)/map/camera.cpp'; fi`
 
 ground.o: map/ground.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ground.o -MD -MP -MF "$(DEPDIR)/ground.Tpo" -c -o ground.o `test -f 'map/ground.cpp' || echo '$(srcdir)/'`map/ground.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ground.Tpo" "$(DEPDIR)/ground.Po"; else rm -f "$(DEPDIR)/ground.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ground.o -MD -MP -MF $(DEPDIR)/ground.Tpo -c -o ground.o `test -f 'map/ground.cpp' || echo '$(srcdir)/'`map/ground.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ground.Tpo $(DEPDIR)/ground.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/ground.cpp' object='ground.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ground.o `test -f 'map/ground.cpp' || echo '$(srcdir)/'`map/ground.cpp
 
 ground.obj: map/ground.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ground.obj -MD -MP -MF "$(DEPDIR)/ground.Tpo" -c -o ground.obj `if test -f 'map/ground.cpp'; then $(CYGPATH_W) 'map/ground.cpp'; else $(CYGPATH_W) '$(srcdir)/map/ground.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ground.Tpo" "$(DEPDIR)/ground.Po"; else rm -f "$(DEPDIR)/ground.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ground.obj -MD -MP -MF $(DEPDIR)/ground.Tpo -c -o ground.obj `if test -f 'map/ground.cpp'; then $(CYGPATH_W) 'map/ground.cpp'; else $(CYGPATH_W) '$(srcdir)/map/ground.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ground.Tpo $(DEPDIR)/ground.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/ground.cpp' object='ground.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ground.obj `if test -f 'map/ground.cpp'; then $(CYGPATH_W) 'map/ground.cpp'; else $(CYGPATH_W) '$(srcdir)/map/ground.cpp'; fi`
 
 map.o: map/map.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map.o -MD -MP -MF "$(DEPDIR)/map.Tpo" -c -o map.o `test -f 'map/map.cpp' || echo '$(srcdir)/'`map/map.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/map.Tpo" "$(DEPDIR)/map.Po"; else rm -f "$(DEPDIR)/map.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map.o -MD -MP -MF $(DEPDIR)/map.Tpo -c -o map.o `test -f 'map/map.cpp' || echo '$(srcdir)/'`map/map.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/map.Tpo $(DEPDIR)/map.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/map.cpp' object='map.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o map.o `test -f 'map/map.cpp' || echo '$(srcdir)/'`map/map.cpp
 
 map.obj: map/map.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map.obj -MD -MP -MF "$(DEPDIR)/map.Tpo" -c -o map.obj `if test -f 'map/map.cpp'; then $(CYGPATH_W) 'map/map.cpp'; else $(CYGPATH_W) '$(srcdir)/map/map.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/map.Tpo" "$(DEPDIR)/map.Po"; else rm -f "$(DEPDIR)/map.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map.obj -MD -MP -MF $(DEPDIR)/map.Tpo -c -o map.obj `if test -f 'map/map.cpp'; then $(CYGPATH_W) 'map/map.cpp'; else $(CYGPATH_W) '$(srcdir)/map/map.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/map.Tpo $(DEPDIR)/map.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/map.cpp' object='map.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o map.obj `if test -f 'map/map.cpp'; then $(CYGPATH_W) 'map/map.cpp'; else $(CYGPATH_W) '$(srcdir)/map/map.cpp'; fi`
 
 maps_list.o: map/maps_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maps_list.o -MD -MP -MF "$(DEPDIR)/maps_list.Tpo" -c -o maps_list.o `test -f 'map/maps_list.cpp' || echo '$(srcdir)/'`map/maps_list.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/maps_list.Tpo" "$(DEPDIR)/maps_list.Po"; else rm -f "$(DEPDIR)/maps_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maps_list.o -MD -MP -MF $(DEPDIR)/maps_list.Tpo -c -o maps_list.o `test -f 'map/maps_list.cpp' || echo '$(srcdir)/'`map/maps_list.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/maps_list.Tpo $(DEPDIR)/maps_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/maps_list.cpp' object='maps_list.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o maps_list.o `test -f 'map/maps_list.cpp' || echo '$(srcdir)/'`map/maps_list.cpp
 
 maps_list.obj: map/maps_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maps_list.obj -MD -MP -MF "$(DEPDIR)/maps_list.Tpo" -c -o maps_list.obj `if test -f 'map/maps_list.cpp'; then $(CYGPATH_W) 'map/maps_list.cpp'; else $(CYGPATH_W) '$(srcdir)/map/maps_list.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/maps_list.Tpo" "$(DEPDIR)/maps_list.Po"; else rm -f "$(DEPDIR)/maps_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maps_list.obj -MD -MP -MF $(DEPDIR)/maps_list.Tpo -c -o maps_list.obj `if test -f 'map/maps_list.cpp'; then $(CYGPATH_W) 'map/maps_list.cpp'; else $(CYGPATH_W) '$(srcdir)/map/maps_list.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/maps_list.Tpo $(DEPDIR)/maps_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/maps_list.cpp' object='maps_list.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o maps_list.obj `if test -f 'map/maps_list.cpp'; then $(CYGPATH_W) 'map/maps_list.cpp'; else $(CYGPATH_W) '$(srcdir)/map/maps_list.cpp'; fi`
 
 random_map.o: map/random_map.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT random_map.o -MD -MP -MF "$(DEPDIR)/random_map.Tpo" -c -o random_map.o `test -f 'map/random_map.cpp' || echo '$(srcdir)/'`map/random_map.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/random_map.Tpo" "$(DEPDIR)/random_map.Po"; else rm -f "$(DEPDIR)/random_map.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT random_map.o -MD -MP -MF $(DEPDIR)/random_map.Tpo -c -o random_map.o `test -f 'map/random_map.cpp' || echo '$(srcdir)/'`map/random_map.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/random_map.Tpo $(DEPDIR)/random_map.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/random_map.cpp' object='random_map.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o random_map.o `test -f 'map/random_map.cpp' || echo '$(srcdir)/'`map/random_map.cpp
 
 random_map.obj: map/random_map.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT random_map.obj -MD -MP -MF "$(DEPDIR)/random_map.Tpo" -c -o random_map.obj `if test -f 'map/random_map.cpp'; then $(CYGPATH_W) 'map/random_map.cpp'; else $(CYGPATH_W) '$(srcdir)/map/random_map.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/random_map.Tpo" "$(DEPDIR)/random_map.Po"; else rm -f "$(DEPDIR)/random_map.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT random_map.obj -MD -MP -MF $(DEPDIR)/random_map.Tpo -c -o random_map.obj `if test -f 'map/random_map.cpp'; then $(CYGPATH_W) 'map/random_map.cpp'; else $(CYGPATH_W) '$(srcdir)/map/random_map.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/random_map.Tpo $(DEPDIR)/random_map.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/random_map.cpp' object='random_map.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o random_map.obj `if test -f 'map/random_map.cpp'; then $(CYGPATH_W) 'map/random_map.cpp'; else $(CYGPATH_W) '$(srcdir)/map/random_map.cpp'; fi`
 
 sky.o: map/sky.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sky.o -MD -MP -MF "$(DEPDIR)/sky.Tpo" -c -o sky.o `test -f 'map/sky.cpp' || echo '$(srcdir)/'`map/sky.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sky.Tpo" "$(DEPDIR)/sky.Po"; else rm -f "$(DEPDIR)/sky.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sky.o -MD -MP -MF $(DEPDIR)/sky.Tpo -c -o sky.o `test -f 'map/sky.cpp' || echo '$(srcdir)/'`map/sky.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sky.Tpo $(DEPDIR)/sky.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/sky.cpp' object='sky.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sky.o `test -f 'map/sky.cpp' || echo '$(srcdir)/'`map/sky.cpp
 
 sky.obj: map/sky.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sky.obj -MD -MP -MF "$(DEPDIR)/sky.Tpo" -c -o sky.obj `if test -f 'map/sky.cpp'; then $(CYGPATH_W) 'map/sky.cpp'; else $(CYGPATH_W) '$(srcdir)/map/sky.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sky.Tpo" "$(DEPDIR)/sky.Po"; else rm -f "$(DEPDIR)/sky.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sky.obj -MD -MP -MF $(DEPDIR)/sky.Tpo -c -o sky.obj `if test -f 'map/sky.cpp'; then $(CYGPATH_W) 'map/sky.cpp'; else $(CYGPATH_W) '$(srcdir)/map/sky.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sky.Tpo $(DEPDIR)/sky.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/sky.cpp' object='sky.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sky.obj `if test -f 'map/sky.cpp'; then $(CYGPATH_W) 'map/sky.cpp'; else $(CYGPATH_W) '$(srcdir)/map/sky.cpp'; fi`
 
 tile.o: map/tile.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tile.o -MD -MP -MF "$(DEPDIR)/tile.Tpo" -c -o tile.o `test -f 'map/tile.cpp' || echo '$(srcdir)/'`map/tile.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/tile.Tpo" "$(DEPDIR)/tile.Po"; else rm -f "$(DEPDIR)/tile.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tile.o -MD -MP -MF $(DEPDIR)/tile.Tpo -c -o tile.o `test -f 'map/tile.cpp' || echo '$(srcdir)/'`map/tile.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/tile.Tpo $(DEPDIR)/tile.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/tile.cpp' object='tile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tile.o `test -f 'map/tile.cpp' || echo '$(srcdir)/'`map/tile.cpp
 
 tile.obj: map/tile.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tile.obj -MD -MP -MF "$(DEPDIR)/tile.Tpo" -c -o tile.obj `if test -f 'map/tile.cpp'; then $(CYGPATH_W) 'map/tile.cpp'; else $(CYGPATH_W) '$(srcdir)/map/tile.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/tile.Tpo" "$(DEPDIR)/tile.Po"; else rm -f "$(DEPDIR)/tile.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tile.obj -MD -MP -MF $(DEPDIR)/tile.Tpo -c -o tile.obj `if test -f 'map/tile.cpp'; then $(CYGPATH_W) 'map/tile.cpp'; else $(CYGPATH_W) '$(srcdir)/map/tile.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/tile.Tpo $(DEPDIR)/tile.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/tile.cpp' object='tile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tile.obj `if test -f 'map/tile.cpp'; then $(CYGPATH_W) 'map/tile.cpp'; else $(CYGPATH_W) '$(srcdir)/map/tile.cpp'; fi`
 
 tileitem.o: map/tileitem.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tileitem.o -MD -MP -MF "$(DEPDIR)/tileitem.Tpo" -c -o tileitem.o `test -f 'map/tileitem.cpp' || echo '$(srcdir)/'`map/tileitem.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/tileitem.Tpo" "$(DEPDIR)/tileitem.Po"; else rm -f "$(DEPDIR)/tileitem.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tileitem.o -MD -MP -MF $(DEPDIR)/tileitem.Tpo -c -o tileitem.o `test -f 'map/tileitem.cpp' || echo '$(srcdir)/'`map/tileitem.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/tileitem.Tpo $(DEPDIR)/tileitem.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/tileitem.cpp' object='tileitem.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tileitem.o `test -f 'map/tileitem.cpp' || echo '$(srcdir)/'`map/tileitem.cpp
 
 tileitem.obj: map/tileitem.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tileitem.obj -MD -MP -MF "$(DEPDIR)/tileitem.Tpo" -c -o tileitem.obj `if test -f 'map/tileitem.cpp'; then $(CYGPATH_W) 'map/tileitem.cpp'; else $(CYGPATH_W) '$(srcdir)/map/tileitem.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/tileitem.Tpo" "$(DEPDIR)/tileitem.Po"; else rm -f "$(DEPDIR)/tileitem.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tileitem.obj -MD -MP -MF $(DEPDIR)/tileitem.Tpo -c -o tileitem.obj `if test -f 'map/tileitem.cpp'; then $(CYGPATH_W) 'map/tileitem.cpp'; else $(CYGPATH_W) '$(srcdir)/map/tileitem.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/tileitem.Tpo $(DEPDIR)/tileitem.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/tileitem.cpp' object='tileitem.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tileitem.obj `if test -f 'map/tileitem.cpp'; then $(CYGPATH_W) 'map/tileitem.cpp'; else $(CYGPATH_W) '$(srcdir)/map/tileitem.cpp'; fi`
 
 water.o: map/water.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT water.o -MD -MP -MF "$(DEPDIR)/water.Tpo" -c -o water.o `test -f 'map/water.cpp' || echo '$(srcdir)/'`map/water.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/water.Tpo" "$(DEPDIR)/water.Po"; else rm -f "$(DEPDIR)/water.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT water.o -MD -MP -MF $(DEPDIR)/water.Tpo -c -o water.o `test -f 'map/water.cpp' || echo '$(srcdir)/'`map/water.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/water.Tpo $(DEPDIR)/water.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/water.cpp' object='water.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o water.o `test -f 'map/water.cpp' || echo '$(srcdir)/'`map/water.cpp
 
 water.obj: map/water.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT water.obj -MD -MP -MF "$(DEPDIR)/water.Tpo" -c -o water.obj `if test -f 'map/water.cpp'; then $(CYGPATH_W) 'map/water.cpp'; else $(CYGPATH_W) '$(srcdir)/map/water.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/water.Tpo" "$(DEPDIR)/water.Po"; else rm -f "$(DEPDIR)/water.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT water.obj -MD -MP -MF $(DEPDIR)/water.Tpo -c -o water.obj `if test -f 'map/water.cpp'; then $(CYGPATH_W) 'map/water.cpp'; else $(CYGPATH_W) '$(srcdir)/map/water.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/water.Tpo $(DEPDIR)/water.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/water.cpp' object='water.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o water.obj `if test -f 'map/water.cpp'; then $(CYGPATH_W) 'map/water.cpp'; else $(CYGPATH_W) '$(srcdir)/map/water.cpp'; fi`
 
 wind.o: map/wind.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wind.o -MD -MP -MF "$(DEPDIR)/wind.Tpo" -c -o wind.o `test -f 'map/wind.cpp' || echo '$(srcdir)/'`map/wind.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/wind.Tpo" "$(DEPDIR)/wind.Po"; else rm -f "$(DEPDIR)/wind.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wind.o -MD -MP -MF $(DEPDIR)/wind.Tpo -c -o wind.o `test -f 'map/wind.cpp' || echo '$(srcdir)/'`map/wind.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/wind.Tpo $(DEPDIR)/wind.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/wind.cpp' object='wind.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wind.o `test -f 'map/wind.cpp' || echo '$(srcdir)/'`map/wind.cpp
 
 wind.obj: map/wind.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wind.obj -MD -MP -MF "$(DEPDIR)/wind.Tpo" -c -o wind.obj `if test -f 'map/wind.cpp'; then $(CYGPATH_W) 'map/wind.cpp'; else $(CYGPATH_W) '$(srcdir)/map/wind.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/wind.Tpo" "$(DEPDIR)/wind.Po"; else rm -f "$(DEPDIR)/wind.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wind.obj -MD -MP -MF $(DEPDIR)/wind.Tpo -c -o wind.obj `if test -f 'map/wind.cpp'; then $(CYGPATH_W) 'map/wind.cpp'; else $(CYGPATH_W) '$(srcdir)/map/wind.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/wind.Tpo $(DEPDIR)/wind.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='map/wind.cpp' object='wind.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wind.obj `if test -f 'map/wind.cpp'; then $(CYGPATH_W) 'map/wind.cpp'; else $(CYGPATH_W) '$(srcdir)/map/wind.cpp'; fi`
 
 credits_menu.o: menu/credits_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT credits_menu.o -MD -MP -MF "$(DEPDIR)/credits_menu.Tpo" -c -o credits_menu.o `test -f 'menu/credits_menu.cpp' || echo '$(srcdir)/'`menu/credits_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/credits_menu.Tpo" "$(DEPDIR)/credits_menu.Po"; else rm -f "$(DEPDIR)/credits_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT credits_menu.o -MD -MP -MF $(DEPDIR)/credits_menu.Tpo -c -o credits_menu.o `test -f 'menu/credits_menu.cpp' || echo '$(srcdir)/'`menu/credits_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/credits_menu.Tpo $(DEPDIR)/credits_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/credits_menu.cpp' object='credits_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o credits_menu.o `test -f 'menu/credits_menu.cpp' || echo '$(srcdir)/'`menu/credits_menu.cpp
 
 credits_menu.obj: menu/credits_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT credits_menu.obj -MD -MP -MF "$(DEPDIR)/credits_menu.Tpo" -c -o credits_menu.obj `if test -f 'menu/credits_menu.cpp'; then $(CYGPATH_W) 'menu/credits_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/credits_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/credits_menu.Tpo" "$(DEPDIR)/credits_menu.Po"; else rm -f "$(DEPDIR)/credits_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT credits_menu.obj -MD -MP -MF $(DEPDIR)/credits_menu.Tpo -c -o credits_menu.obj `if test -f 'menu/credits_menu.cpp'; then $(CYGPATH_W) 'menu/credits_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/credits_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/credits_menu.Tpo $(DEPDIR)/credits_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/credits_menu.cpp' object='credits_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o credits_menu.obj `if test -f 'menu/credits_menu.cpp'; then $(CYGPATH_W) 'menu/credits_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/credits_menu.cpp'; fi`
 
 game_menu.o: menu/game_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_menu.o -MD -MP -MF "$(DEPDIR)/game_menu.Tpo" -c -o game_menu.o `test -f 'menu/game_menu.cpp' || echo '$(srcdir)/'`menu/game_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_menu.Tpo" "$(DEPDIR)/game_menu.Po"; else rm -f "$(DEPDIR)/game_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_menu.o -MD -MP -MF $(DEPDIR)/game_menu.Tpo -c -o game_menu.o `test -f 'menu/game_menu.cpp' || echo '$(srcdir)/'`menu/game_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_menu.Tpo $(DEPDIR)/game_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/game_menu.cpp' object='game_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_menu.o `test -f 'menu/game_menu.cpp' || echo '$(srcdir)/'`menu/game_menu.cpp
 
 game_menu.obj: menu/game_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_menu.obj -MD -MP -MF "$(DEPDIR)/game_menu.Tpo" -c -o game_menu.obj `if test -f 'menu/game_menu.cpp'; then $(CYGPATH_W) 'menu/game_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/game_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_menu.Tpo" "$(DEPDIR)/game_menu.Po"; else rm -f "$(DEPDIR)/game_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_menu.obj -MD -MP -MF $(DEPDIR)/game_menu.Tpo -c -o game_menu.obj `if test -f 'menu/game_menu.cpp'; then $(CYGPATH_W) 'menu/game_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/game_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_menu.Tpo $(DEPDIR)/game_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/game_menu.cpp' object='game_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_menu.obj `if test -f 'menu/game_menu.cpp'; then $(CYGPATH_W) 'menu/game_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/game_menu.cpp'; fi`
 
+game_mode_editor.o: menu/game_mode_editor.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_mode_editor.o -MD -MP -MF $(DEPDIR)/game_mode_editor.Tpo -c -o game_mode_editor.o `test -f 'menu/game_mode_editor.cpp' || echo '$(srcdir)/'`menu/game_mode_editor.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_mode_editor.Tpo $(DEPDIR)/game_mode_editor.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/game_mode_editor.cpp' object='game_mode_editor.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_mode_editor.o `test -f 'menu/game_mode_editor.cpp' || echo '$(srcdir)/'`menu/game_mode_editor.cpp
+
+game_mode_editor.obj: menu/game_mode_editor.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_mode_editor.obj -MD -MP -MF $(DEPDIR)/game_mode_editor.Tpo -c -o game_mode_editor.obj `if test -f 'menu/game_mode_editor.cpp'; then $(CYGPATH_W) 'menu/game_mode_editor.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/game_mode_editor.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/game_mode_editor.Tpo $(DEPDIR)/game_mode_editor.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/game_mode_editor.cpp' object='game_mode_editor.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_mode_editor.obj `if test -f 'menu/game_mode_editor.cpp'; then $(CYGPATH_W) 'menu/game_mode_editor.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/game_mode_editor.cpp'; fi`
+
 help_menu.o: menu/help_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT help_menu.o -MD -MP -MF "$(DEPDIR)/help_menu.Tpo" -c -o help_menu.o `test -f 'menu/help_menu.cpp' || echo '$(srcdir)/'`menu/help_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/help_menu.Tpo" "$(DEPDIR)/help_menu.Po"; else rm -f "$(DEPDIR)/help_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT help_menu.o -MD -MP -MF $(DEPDIR)/help_menu.Tpo -c -o help_menu.o `test -f 'menu/help_menu.cpp' || echo '$(srcdir)/'`menu/help_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/help_menu.Tpo $(DEPDIR)/help_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/help_menu.cpp' object='help_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o help_menu.o `test -f 'menu/help_menu.cpp' || echo '$(srcdir)/'`menu/help_menu.cpp
 
 help_menu.obj: menu/help_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT help_menu.obj -MD -MP -MF "$(DEPDIR)/help_menu.Tpo" -c -o help_menu.obj `if test -f 'menu/help_menu.cpp'; then $(CYGPATH_W) 'menu/help_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/help_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/help_menu.Tpo" "$(DEPDIR)/help_menu.Po"; else rm -f "$(DEPDIR)/help_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT help_menu.obj -MD -MP -MF $(DEPDIR)/help_menu.Tpo -c -o help_menu.obj `if test -f 'menu/help_menu.cpp'; then $(CYGPATH_W) 'menu/help_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/help_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/help_menu.Tpo $(DEPDIR)/help_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/help_menu.cpp' object='help_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o help_menu.obj `if test -f 'menu/help_menu.cpp'; then $(CYGPATH_W) 'menu/help_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/help_menu.cpp'; fi`
 
 main_menu.o: menu/main_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main_menu.o -MD -MP -MF "$(DEPDIR)/main_menu.Tpo" -c -o main_menu.o `test -f 'menu/main_menu.cpp' || echo '$(srcdir)/'`menu/main_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/main_menu.Tpo" "$(DEPDIR)/main_menu.Po"; else rm -f "$(DEPDIR)/main_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main_menu.o -MD -MP -MF $(DEPDIR)/main_menu.Tpo -c -o main_menu.o `test -f 'menu/main_menu.cpp' || echo '$(srcdir)/'`menu/main_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/main_menu.Tpo $(DEPDIR)/main_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/main_menu.cpp' object='main_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main_menu.o `test -f 'menu/main_menu.cpp' || echo '$(srcdir)/'`menu/main_menu.cpp
 
 main_menu.obj: menu/main_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main_menu.obj -MD -MP -MF "$(DEPDIR)/main_menu.Tpo" -c -o main_menu.obj `if test -f 'menu/main_menu.cpp'; then $(CYGPATH_W) 'menu/main_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/main_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/main_menu.Tpo" "$(DEPDIR)/main_menu.Po"; else rm -f "$(DEPDIR)/main_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main_menu.obj -MD -MP -MF $(DEPDIR)/main_menu.Tpo -c -o main_menu.obj `if test -f 'menu/main_menu.cpp'; then $(CYGPATH_W) 'menu/main_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/main_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/main_menu.Tpo $(DEPDIR)/main_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/main_menu.cpp' object='main_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main_menu.obj `if test -f 'menu/main_menu.cpp'; then $(CYGPATH_W) 'menu/main_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/main_menu.cpp'; fi`
 
 map_selection_box.o: menu/map_selection_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map_selection_box.o -MD -MP -MF "$(DEPDIR)/map_selection_box.Tpo" -c -o map_selection_box.o `test -f 'menu/map_selection_box.cpp' || echo '$(srcdir)/'`menu/map_selection_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/map_selection_box.Tpo" "$(DEPDIR)/map_selection_box.Po"; else rm -f "$(DEPDIR)/map_selection_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map_selection_box.o -MD -MP -MF $(DEPDIR)/map_selection_box.Tpo -c -o map_selection_box.o `test -f 'menu/map_selection_box.cpp' || echo '$(srcdir)/'`menu/map_selection_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/map_selection_box.Tpo $(DEPDIR)/map_selection_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/map_selection_box.cpp' object='map_selection_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o map_selection_box.o `test -f 'menu/map_selection_box.cpp' || echo '$(srcdir)/'`menu/map_selection_box.cpp
 
 map_selection_box.obj: menu/map_selection_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map_selection_box.obj -MD -MP -MF "$(DEPDIR)/map_selection_box.Tpo" -c -o map_selection_box.obj `if test -f 'menu/map_selection_box.cpp'; then $(CYGPATH_W) 'menu/map_selection_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/map_selection_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/map_selection_box.Tpo" "$(DEPDIR)/map_selection_box.Po"; else rm -f "$(DEPDIR)/map_selection_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map_selection_box.obj -MD -MP -MF $(DEPDIR)/map_selection_box.Tpo -c -o map_selection_box.obj `if test -f 'menu/map_selection_box.cpp'; then $(CYGPATH_W) 'menu/map_selection_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/map_selection_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/map_selection_box.Tpo $(DEPDIR)/map_selection_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/map_selection_box.cpp' object='map_selection_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o map_selection_box.obj `if test -f 'menu/map_selection_box.cpp'; then $(CYGPATH_W) 'menu/map_selection_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/map_selection_box.cpp'; fi`
 
 menu.o: menu/menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu.o -MD -MP -MF "$(DEPDIR)/menu.Tpo" -c -o menu.o `test -f 'menu/menu.cpp' || echo '$(srcdir)/'`menu/menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/menu.Tpo" "$(DEPDIR)/menu.Po"; else rm -f "$(DEPDIR)/menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu.o -MD -MP -MF $(DEPDIR)/menu.Tpo -c -o menu.o `test -f 'menu/menu.cpp' || echo '$(srcdir)/'`menu/menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/menu.Tpo $(DEPDIR)/menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/menu.cpp' object='menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu.o `test -f 'menu/menu.cpp' || echo '$(srcdir)/'`menu/menu.cpp
 
 menu.obj: menu/menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu.obj -MD -MP -MF "$(DEPDIR)/menu.Tpo" -c -o menu.obj `if test -f 'menu/menu.cpp'; then $(CYGPATH_W) 'menu/menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/menu.Tpo" "$(DEPDIR)/menu.Po"; else rm -f "$(DEPDIR)/menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu.obj -MD -MP -MF $(DEPDIR)/menu.Tpo -c -o menu.obj `if test -f 'menu/menu.cpp'; then $(CYGPATH_W) 'menu/menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/menu.Tpo $(DEPDIR)/menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/menu.cpp' object='menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu.obj `if test -f 'menu/menu.cpp'; then $(CYGPATH_W) 'menu/menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/menu.cpp'; fi`
 
 network_connection_menu.o: menu/network_connection_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_connection_menu.o -MD -MP -MF "$(DEPDIR)/network_connection_menu.Tpo" -c -o network_connection_menu.o `test -f 'menu/network_connection_menu.cpp' || echo '$(srcdir)/'`menu/network_connection_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_connection_menu.Tpo" "$(DEPDIR)/network_connection_menu.Po"; else rm -f "$(DEPDIR)/network_connection_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_connection_menu.o -MD -MP -MF $(DEPDIR)/network_connection_menu.Tpo -c -o network_connection_menu.o `test -f 'menu/network_connection_menu.cpp' || echo '$(srcdir)/'`menu/network_connection_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_connection_menu.Tpo $(DEPDIR)/network_connection_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/network_connection_menu.cpp' object='network_connection_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_connection_menu.o `test -f 'menu/network_connection_menu.cpp' || echo '$(srcdir)/'`menu/network_connection_menu.cpp
 
 network_connection_menu.obj: menu/network_connection_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_connection_menu.obj -MD -MP -MF "$(DEPDIR)/network_connection_menu.Tpo" -c -o network_connection_menu.obj `if test -f 'menu/network_connection_menu.cpp'; then $(CYGPATH_W) 'menu/network_connection_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/network_connection_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_connection_menu.Tpo" "$(DEPDIR)/network_connection_menu.Po"; else rm -f "$(DEPDIR)/network_connection_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_connection_menu.obj -MD -MP -MF $(DEPDIR)/network_connection_menu.Tpo -c -o network_connection_menu.obj `if test -f 'menu/network_connection_menu.cpp'; then $(CYGPATH_W) 'menu/network_connection_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/network_connection_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_connection_menu.Tpo $(DEPDIR)/network_connection_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/network_connection_menu.cpp' object='network_connection_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_connection_menu.obj `if test -f 'menu/network_connection_menu.cpp'; then $(CYGPATH_W) 'menu/network_connection_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/network_connection_menu.cpp'; fi`
 
 network_menu.o: menu/network_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_menu.o -MD -MP -MF "$(DEPDIR)/network_menu.Tpo" -c -o network_menu.o `test -f 'menu/network_menu.cpp' || echo '$(srcdir)/'`menu/network_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_menu.Tpo" "$(DEPDIR)/network_menu.Po"; else rm -f "$(DEPDIR)/network_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_menu.o -MD -MP -MF $(DEPDIR)/network_menu.Tpo -c -o network_menu.o `test -f 'menu/network_menu.cpp' || echo '$(srcdir)/'`menu/network_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_menu.Tpo $(DEPDIR)/network_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/network_menu.cpp' object='network_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_menu.o `test -f 'menu/network_menu.cpp' || echo '$(srcdir)/'`menu/network_menu.cpp
 
 network_menu.obj: menu/network_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_menu.obj -MD -MP -MF "$(DEPDIR)/network_menu.Tpo" -c -o network_menu.obj `if test -f 'menu/network_menu.cpp'; then $(CYGPATH_W) 'menu/network_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/network_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_menu.Tpo" "$(DEPDIR)/network_menu.Po"; else rm -f "$(DEPDIR)/network_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_menu.obj -MD -MP -MF $(DEPDIR)/network_menu.Tpo -c -o network_menu.obj `if test -f 'menu/network_menu.cpp'; then $(CYGPATH_W) 'menu/network_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/network_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_menu.Tpo $(DEPDIR)/network_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/network_menu.cpp' object='network_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_menu.obj `if test -f 'menu/network_menu.cpp'; then $(CYGPATH_W) 'menu/network_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/network_menu.cpp'; fi`
 
 network_teams_selection_box.o: menu/network_teams_selection_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_teams_selection_box.o -MD -MP -MF "$(DEPDIR)/network_teams_selection_box.Tpo" -c -o network_teams_selection_box.o `test -f 'menu/network_teams_selection_box.cpp' || echo '$(srcdir)/'`menu/network_teams_selection_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_teams_selection_box.Tpo" "$(DEPDIR)/network_teams_selection_box.Po"; else rm -f "$(DEPDIR)/network_teams_selection_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_teams_selection_box.o -MD -MP -MF $(DEPDIR)/network_teams_selection_box.Tpo -c -o network_teams_selection_box.o `test -f 'menu/network_teams_selection_box.cpp' || echo '$(srcdir)/'`menu/network_teams_selection_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_teams_selection_box.Tpo $(DEPDIR)/network_teams_selection_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/network_teams_selection_box.cpp' object='network_teams_selection_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_teams_selection_box.o `test -f 'menu/network_teams_selection_box.cpp' || echo '$(srcdir)/'`menu/network_teams_selection_box.cpp
 
 network_teams_selection_box.obj: menu/network_teams_selection_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_teams_selection_box.obj -MD -MP -MF "$(DEPDIR)/network_teams_selection_box.Tpo" -c -o network_teams_selection_box.obj `if test -f 'menu/network_teams_selection_box.cpp'; then $(CYGPATH_W) 'menu/network_teams_selection_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/network_teams_selection_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_teams_selection_box.Tpo" "$(DEPDIR)/network_teams_selection_box.Po"; else rm -f "$(DEPDIR)/network_teams_selection_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_teams_selection_box.obj -MD -MP -MF $(DEPDIR)/network_teams_selection_box.Tpo -c -o network_teams_selection_box.obj `if test -f 'menu/network_teams_selection_box.cpp'; then $(CYGPATH_W) 'menu/network_teams_selection_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/network_teams_selection_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_teams_selection_box.Tpo $(DEPDIR)/network_teams_selection_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/network_teams_selection_box.cpp' object='network_teams_selection_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_teams_selection_box.obj `if test -f 'menu/network_teams_selection_box.cpp'; then $(CYGPATH_W) 'menu/network_teams_selection_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/network_teams_selection_box.cpp'; fi`
 
 options_menu.o: menu/options_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT options_menu.o -MD -MP -MF "$(DEPDIR)/options_menu.Tpo" -c -o options_menu.o `test -f 'menu/options_menu.cpp' || echo '$(srcdir)/'`menu/options_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/options_menu.Tpo" "$(DEPDIR)/options_menu.Po"; else rm -f "$(DEPDIR)/options_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT options_menu.o -MD -MP -MF $(DEPDIR)/options_menu.Tpo -c -o options_menu.o `test -f 'menu/options_menu.cpp' || echo '$(srcdir)/'`menu/options_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/options_menu.Tpo $(DEPDIR)/options_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/options_menu.cpp' object='options_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o options_menu.o `test -f 'menu/options_menu.cpp' || echo '$(srcdir)/'`menu/options_menu.cpp
 
 options_menu.obj: menu/options_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT options_menu.obj -MD -MP -MF "$(DEPDIR)/options_menu.Tpo" -c -o options_menu.obj `if test -f 'menu/options_menu.cpp'; then $(CYGPATH_W) 'menu/options_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/options_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/options_menu.Tpo" "$(DEPDIR)/options_menu.Po"; else rm -f "$(DEPDIR)/options_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT options_menu.obj -MD -MP -MF $(DEPDIR)/options_menu.Tpo -c -o options_menu.obj `if test -f 'menu/options_menu.cpp'; then $(CYGPATH_W) 'menu/options_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/options_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/options_menu.Tpo $(DEPDIR)/options_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/options_menu.cpp' object='options_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o options_menu.obj `if test -f 'menu/options_menu.cpp'; then $(CYGPATH_W) 'menu/options_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/options_menu.cpp'; fi`
 
 pause_menu.o: menu/pause_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pause_menu.o -MD -MP -MF "$(DEPDIR)/pause_menu.Tpo" -c -o pause_menu.o `test -f 'menu/pause_menu.cpp' || echo '$(srcdir)/'`menu/pause_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/pause_menu.Tpo" "$(DEPDIR)/pause_menu.Po"; else rm -f "$(DEPDIR)/pause_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pause_menu.o -MD -MP -MF $(DEPDIR)/pause_menu.Tpo -c -o pause_menu.o `test -f 'menu/pause_menu.cpp' || echo '$(srcdir)/'`menu/pause_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/pause_menu.Tpo $(DEPDIR)/pause_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/pause_menu.cpp' object='pause_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pause_menu.o `test -f 'menu/pause_menu.cpp' || echo '$(srcdir)/'`menu/pause_menu.cpp
 
 pause_menu.obj: menu/pause_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pause_menu.obj -MD -MP -MF "$(DEPDIR)/pause_menu.Tpo" -c -o pause_menu.obj `if test -f 'menu/pause_menu.cpp'; then $(CYGPATH_W) 'menu/pause_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/pause_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/pause_menu.Tpo" "$(DEPDIR)/pause_menu.Po"; else rm -f "$(DEPDIR)/pause_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pause_menu.obj -MD -MP -MF $(DEPDIR)/pause_menu.Tpo -c -o pause_menu.obj `if test -f 'menu/pause_menu.cpp'; then $(CYGPATH_W) 'menu/pause_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/pause_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/pause_menu.Tpo $(DEPDIR)/pause_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/pause_menu.cpp' object='pause_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pause_menu.obj `if test -f 'menu/pause_menu.cpp'; then $(CYGPATH_W) 'menu/pause_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/pause_menu.cpp'; fi`
 
 results_menu.o: menu/results_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT results_menu.o -MD -MP -MF "$(DEPDIR)/results_menu.Tpo" -c -o results_menu.o `test -f 'menu/results_menu.cpp' || echo '$(srcdir)/'`menu/results_menu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/results_menu.Tpo" "$(DEPDIR)/results_menu.Po"; else rm -f "$(DEPDIR)/results_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT results_menu.o -MD -MP -MF $(DEPDIR)/results_menu.Tpo -c -o results_menu.o `test -f 'menu/results_menu.cpp' || echo '$(srcdir)/'`menu/results_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/results_menu.Tpo $(DEPDIR)/results_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/results_menu.cpp' object='results_menu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o results_menu.o `test -f 'menu/results_menu.cpp' || echo '$(srcdir)/'`menu/results_menu.cpp
 
 results_menu.obj: menu/results_menu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT results_menu.obj -MD -MP -MF "$(DEPDIR)/results_menu.Tpo" -c -o results_menu.obj `if test -f 'menu/results_menu.cpp'; then $(CYGPATH_W) 'menu/results_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/results_menu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/results_menu.Tpo" "$(DEPDIR)/results_menu.Po"; else rm -f "$(DEPDIR)/results_menu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT results_menu.obj -MD -MP -MF $(DEPDIR)/results_menu.Tpo -c -o results_menu.obj `if test -f 'menu/results_menu.cpp'; then $(CYGPATH_W) 'menu/results_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/results_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/results_menu.Tpo $(DEPDIR)/results_menu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/results_menu.cpp' object='results_menu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o results_menu.obj `if test -f 'menu/results_menu.cpp'; then $(CYGPATH_W) 'menu/results_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/results_menu.cpp'; fi`
 
+skin_menu.o: menu/skin_menu.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT skin_menu.o -MD -MP -MF $(DEPDIR)/skin_menu.Tpo -c -o skin_menu.o `test -f 'menu/skin_menu.cpp' || echo '$(srcdir)/'`menu/skin_menu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/skin_menu.Tpo $(DEPDIR)/skin_menu.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/skin_menu.cpp' object='skin_menu.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skin_menu.o `test -f 'menu/skin_menu.cpp' || echo '$(srcdir)/'`menu/skin_menu.cpp
+
+skin_menu.obj: menu/skin_menu.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT skin_menu.obj -MD -MP -MF $(DEPDIR)/skin_menu.Tpo -c -o skin_menu.obj `if test -f 'menu/skin_menu.cpp'; then $(CYGPATH_W) 'menu/skin_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/skin_menu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/skin_menu.Tpo $(DEPDIR)/skin_menu.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/skin_menu.cpp' object='skin_menu.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skin_menu.obj `if test -f 'menu/skin_menu.cpp'; then $(CYGPATH_W) 'menu/skin_menu.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/skin_menu.cpp'; fi`
+
 team_box.o: menu/team_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team_box.o -MD -MP -MF "$(DEPDIR)/team_box.Tpo" -c -o team_box.o `test -f 'menu/team_box.cpp' || echo '$(srcdir)/'`menu/team_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/team_box.Tpo" "$(DEPDIR)/team_box.Po"; else rm -f "$(DEPDIR)/team_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team_box.o -MD -MP -MF $(DEPDIR)/team_box.Tpo -c -o team_box.o `test -f 'menu/team_box.cpp' || echo '$(srcdir)/'`menu/team_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/team_box.Tpo $(DEPDIR)/team_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/team_box.cpp' object='team_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o team_box.o `test -f 'menu/team_box.cpp' || echo '$(srcdir)/'`menu/team_box.cpp
 
 team_box.obj: menu/team_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team_box.obj -MD -MP -MF "$(DEPDIR)/team_box.Tpo" -c -o team_box.obj `if test -f 'menu/team_box.cpp'; then $(CYGPATH_W) 'menu/team_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/team_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/team_box.Tpo" "$(DEPDIR)/team_box.Po"; else rm -f "$(DEPDIR)/team_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team_box.obj -MD -MP -MF $(DEPDIR)/team_box.Tpo -c -o team_box.obj `if test -f 'menu/team_box.cpp'; then $(CYGPATH_W) 'menu/team_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/team_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/team_box.Tpo $(DEPDIR)/team_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/team_box.cpp' object='team_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o team_box.obj `if test -f 'menu/team_box.cpp'; then $(CYGPATH_W) 'menu/team_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/team_box.cpp'; fi`
 
 teams_selection_box.o: menu/teams_selection_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teams_selection_box.o -MD -MP -MF "$(DEPDIR)/teams_selection_box.Tpo" -c -o teams_selection_box.o `test -f 'menu/teams_selection_box.cpp' || echo '$(srcdir)/'`menu/teams_selection_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/teams_selection_box.Tpo" "$(DEPDIR)/teams_selection_box.Po"; else rm -f "$(DEPDIR)/teams_selection_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teams_selection_box.o -MD -MP -MF $(DEPDIR)/teams_selection_box.Tpo -c -o teams_selection_box.o `test -f 'menu/teams_selection_box.cpp' || echo '$(srcdir)/'`menu/teams_selection_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/teams_selection_box.Tpo $(DEPDIR)/teams_selection_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/teams_selection_box.cpp' object='teams_selection_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teams_selection_box.o `test -f 'menu/teams_selection_box.cpp' || echo '$(srcdir)/'`menu/teams_selection_box.cpp
 
 teams_selection_box.obj: menu/teams_selection_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teams_selection_box.obj -MD -MP -MF "$(DEPDIR)/teams_selection_box.Tpo" -c -o teams_selection_box.obj `if test -f 'menu/teams_selection_box.cpp'; then $(CYGPATH_W) 'menu/teams_selection_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/teams_selection_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/teams_selection_box.Tpo" "$(DEPDIR)/teams_selection_box.Po"; else rm -f "$(DEPDIR)/teams_selection_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teams_selection_box.obj -MD -MP -MF $(DEPDIR)/teams_selection_box.Tpo -c -o teams_selection_box.obj `if test -f 'menu/teams_selection_box.cpp'; then $(CYGPATH_W) 'menu/teams_selection_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/teams_selection_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/teams_selection_box.Tpo $(DEPDIR)/teams_selection_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='menu/teams_selection_box.cpp' object='teams_selection_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teams_selection_box.obj `if test -f 'menu/teams_selection_box.cpp'; then $(CYGPATH_W) 'menu/teams_selection_box.cpp'; else $(CYGPATH_W) '$(srcdir)/menu/teams_selection_box.cpp'; fi`
 
 admin_commands.o: network/admin_commands.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT admin_commands.o -MD -MP -MF "$(DEPDIR)/admin_commands.Tpo" -c -o admin_commands.o `test -f 'network/admin_commands.cpp' || echo '$(srcdir)/'`network/admin_commands.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/admin_commands.Tpo" "$(DEPDIR)/admin_commands.Po"; else rm -f "$(DEPDIR)/admin_commands.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT admin_commands.o -MD -MP -MF $(DEPDIR)/admin_commands.Tpo -c -o admin_commands.o `test -f 'network/admin_commands.cpp' || echo '$(srcdir)/'`network/admin_commands.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/admin_commands.Tpo $(DEPDIR)/admin_commands.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/admin_commands.cpp' object='admin_commands.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o admin_commands.o `test -f 'network/admin_commands.cpp' || echo '$(srcdir)/'`network/admin_commands.cpp
 
 admin_commands.obj: network/admin_commands.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT admin_commands.obj -MD -MP -MF "$(DEPDIR)/admin_commands.Tpo" -c -o admin_commands.obj `if test -f 'network/admin_commands.cpp'; then $(CYGPATH_W) 'network/admin_commands.cpp'; else $(CYGPATH_W) '$(srcdir)/network/admin_commands.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/admin_commands.Tpo" "$(DEPDIR)/admin_commands.Po"; else rm -f "$(DEPDIR)/admin_commands.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT admin_commands.obj -MD -MP -MF $(DEPDIR)/admin_commands.Tpo -c -o admin_commands.obj `if test -f 'network/admin_commands.cpp'; then $(CYGPATH_W) 'network/admin_commands.cpp'; else $(CYGPATH_W) '$(srcdir)/network/admin_commands.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/admin_commands.Tpo $(DEPDIR)/admin_commands.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/admin_commands.cpp' object='admin_commands.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o admin_commands.obj `if test -f 'network/admin_commands.cpp'; then $(CYGPATH_W) 'network/admin_commands.cpp'; else $(CYGPATH_W) '$(srcdir)/network/admin_commands.cpp'; fi`
 
 chat.o: network/chat.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat.o -MD -MP -MF "$(DEPDIR)/chat.Tpo" -c -o chat.o `test -f 'network/chat.cpp' || echo '$(srcdir)/'`network/chat.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/chat.Tpo" "$(DEPDIR)/chat.Po"; else rm -f "$(DEPDIR)/chat.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat.o -MD -MP -MF $(DEPDIR)/chat.Tpo -c -o chat.o `test -f 'network/chat.cpp' || echo '$(srcdir)/'`network/chat.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/chat.Tpo $(DEPDIR)/chat.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/chat.cpp' object='chat.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chat.o `test -f 'network/chat.cpp' || echo '$(srcdir)/'`network/chat.cpp
 
 chat.obj: network/chat.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat.obj -MD -MP -MF "$(DEPDIR)/chat.Tpo" -c -o chat.obj `if test -f 'network/chat.cpp'; then $(CYGPATH_W) 'network/chat.cpp'; else $(CYGPATH_W) '$(srcdir)/network/chat.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/chat.Tpo" "$(DEPDIR)/chat.Po"; else rm -f "$(DEPDIR)/chat.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat.obj -MD -MP -MF $(DEPDIR)/chat.Tpo -c -o chat.obj `if test -f 'network/chat.cpp'; then $(CYGPATH_W) 'network/chat.cpp'; else $(CYGPATH_W) '$(srcdir)/network/chat.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/chat.Tpo $(DEPDIR)/chat.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/chat.cpp' object='chat.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chat.obj `if test -f 'network/chat.cpp'; then $(CYGPATH_W) 'network/chat.cpp'; else $(CYGPATH_W) '$(srcdir)/network/chat.cpp'; fi`
 
 chatlogger.o: network/chatlogger.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chatlogger.o -MD -MP -MF "$(DEPDIR)/chatlogger.Tpo" -c -o chatlogger.o `test -f 'network/chatlogger.cpp' || echo '$(srcdir)/'`network/chatlogger.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/chatlogger.Tpo" "$(DEPDIR)/chatlogger.Po"; else rm -f "$(DEPDIR)/chatlogger.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chatlogger.o -MD -MP -MF $(DEPDIR)/chatlogger.Tpo -c -o chatlogger.o `test -f 'network/chatlogger.cpp' || echo '$(srcdir)/'`network/chatlogger.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/chatlogger.Tpo $(DEPDIR)/chatlogger.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/chatlogger.cpp' object='chatlogger.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chatlogger.o `test -f 'network/chatlogger.cpp' || echo '$(srcdir)/'`network/chatlogger.cpp
 
 chatlogger.obj: network/chatlogger.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chatlogger.obj -MD -MP -MF "$(DEPDIR)/chatlogger.Tpo" -c -o chatlogger.obj `if test -f 'network/chatlogger.cpp'; then $(CYGPATH_W) 'network/chatlogger.cpp'; else $(CYGPATH_W) '$(srcdir)/network/chatlogger.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/chatlogger.Tpo" "$(DEPDIR)/chatlogger.Po"; else rm -f "$(DEPDIR)/chatlogger.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chatlogger.obj -MD -MP -MF $(DEPDIR)/chatlogger.Tpo -c -o chatlogger.obj `if test -f 'network/chatlogger.cpp'; then $(CYGPATH_W) 'network/chatlogger.cpp'; else $(CYGPATH_W) '$(srcdir)/network/chatlogger.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/chatlogger.Tpo $(DEPDIR)/chatlogger.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/chatlogger.cpp' object='chatlogger.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chatlogger.obj `if test -f 'network/chatlogger.cpp'; then $(CYGPATH_W) 'network/chatlogger.cpp'; else $(CYGPATH_W) '$(srcdir)/network/chatlogger.cpp'; fi`
 
 distant_cpu.o: network/distant_cpu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT distant_cpu.o -MD -MP -MF "$(DEPDIR)/distant_cpu.Tpo" -c -o distant_cpu.o `test -f 'network/distant_cpu.cpp' || echo '$(srcdir)/'`network/distant_cpu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/distant_cpu.Tpo" "$(DEPDIR)/distant_cpu.Po"; else rm -f "$(DEPDIR)/distant_cpu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT distant_cpu.o -MD -MP -MF $(DEPDIR)/distant_cpu.Tpo -c -o distant_cpu.o `test -f 'network/distant_cpu.cpp' || echo '$(srcdir)/'`network/distant_cpu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/distant_cpu.Tpo $(DEPDIR)/distant_cpu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/distant_cpu.cpp' object='distant_cpu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o distant_cpu.o `test -f 'network/distant_cpu.cpp' || echo '$(srcdir)/'`network/distant_cpu.cpp
 
 distant_cpu.obj: network/distant_cpu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT distant_cpu.obj -MD -MP -MF "$(DEPDIR)/distant_cpu.Tpo" -c -o distant_cpu.obj `if test -f 'network/distant_cpu.cpp'; then $(CYGPATH_W) 'network/distant_cpu.cpp'; else $(CYGPATH_W) '$(srcdir)/network/distant_cpu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/distant_cpu.Tpo" "$(DEPDIR)/distant_cpu.Po"; else rm -f "$(DEPDIR)/distant_cpu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT distant_cpu.obj -MD -MP -MF $(DEPDIR)/distant_cpu.Tpo -c -o distant_cpu.obj `if test -f 'network/distant_cpu.cpp'; then $(CYGPATH_W) 'network/distant_cpu.cpp'; else $(CYGPATH_W) '$(srcdir)/network/distant_cpu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/distant_cpu.Tpo $(DEPDIR)/distant_cpu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/distant_cpu.cpp' object='distant_cpu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o distant_cpu.obj `if test -f 'network/distant_cpu.cpp'; then $(CYGPATH_W) 'network/distant_cpu.cpp'; else $(CYGPATH_W) '$(srcdir)/network/distant_cpu.cpp'; fi`
 
 download.o: network/download.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT download.o -MD -MP -MF "$(DEPDIR)/download.Tpo" -c -o download.o `test -f 'network/download.cpp' || echo '$(srcdir)/'`network/download.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/download.Tpo" "$(DEPDIR)/download.Po"; else rm -f "$(DEPDIR)/download.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT download.o -MD -MP -MF $(DEPDIR)/download.Tpo -c -o download.o `test -f 'network/download.cpp' || echo '$(srcdir)/'`network/download.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/download.Tpo $(DEPDIR)/download.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/download.cpp' object='download.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o download.o `test -f 'network/download.cpp' || echo '$(srcdir)/'`network/download.cpp
 
 download.obj: network/download.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT download.obj -MD -MP -MF "$(DEPDIR)/download.Tpo" -c -o download.obj `if test -f 'network/download.cpp'; then $(CYGPATH_W) 'network/download.cpp'; else $(CYGPATH_W) '$(srcdir)/network/download.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/download.Tpo" "$(DEPDIR)/download.Po"; else rm -f "$(DEPDIR)/download.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT download.obj -MD -MP -MF $(DEPDIR)/download.Tpo -c -o download.obj `if test -f 'network/download.cpp'; then $(CYGPATH_W) 'network/download.cpp'; else $(CYGPATH_W) '$(srcdir)/network/download.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/download.Tpo $(DEPDIR)/download.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/download.cpp' object='download.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o download.obj `if test -f 'network/download.cpp'; then $(CYGPATH_W) 'network/download.cpp'; else $(CYGPATH_W) '$(srcdir)/network/download.cpp'; fi`
 
 index_server.o: network/index_server.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT index_server.o -MD -MP -MF "$(DEPDIR)/index_server.Tpo" -c -o index_server.o `test -f 'network/index_server.cpp' || echo '$(srcdir)/'`network/index_server.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/index_server.Tpo" "$(DEPDIR)/index_server.Po"; else rm -f "$(DEPDIR)/index_server.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT index_server.o -MD -MP -MF $(DEPDIR)/index_server.Tpo -c -o index_server.o `test -f 'network/index_server.cpp' || echo '$(srcdir)/'`network/index_server.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/index_server.Tpo $(DEPDIR)/index_server.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/index_server.cpp' object='index_server.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o index_server.o `test -f 'network/index_server.cpp' || echo '$(srcdir)/'`network/index_server.cpp
 
 index_server.obj: network/index_server.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT index_server.obj -MD -MP -MF "$(DEPDIR)/index_server.Tpo" -c -o index_server.obj `if test -f 'network/index_server.cpp'; then $(CYGPATH_W) 'network/index_server.cpp'; else $(CYGPATH_W) '$(srcdir)/network/index_server.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/index_server.Tpo" "$(DEPDIR)/index_server.Po"; else rm -f "$(DEPDIR)/index_server.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT index_server.obj -MD -MP -MF $(DEPDIR)/index_server.Tpo -c -o index_server.obj `if test -f 'network/index_server.cpp'; then $(CYGPATH_W) 'network/index_server.cpp'; else $(CYGPATH_W) '$(srcdir)/network/index_server.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/index_server.Tpo $(DEPDIR)/index_server.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/index_server.cpp' object='index_server.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o index_server.obj `if test -f 'network/index_server.cpp'; then $(CYGPATH_W) 'network/index_server.cpp'; else $(CYGPATH_W) '$(srcdir)/network/index_server.cpp'; fi`
 
 irc.o: network/irc.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT irc.o -MD -MP -MF "$(DEPDIR)/irc.Tpo" -c -o irc.o `test -f 'network/irc.cpp' || echo '$(srcdir)/'`network/irc.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/irc.Tpo" "$(DEPDIR)/irc.Po"; else rm -f "$(DEPDIR)/irc.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT irc.o -MD -MP -MF $(DEPDIR)/irc.Tpo -c -o irc.o `test -f 'network/irc.cpp' || echo '$(srcdir)/'`network/irc.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/irc.Tpo $(DEPDIR)/irc.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/irc.cpp' object='irc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o irc.o `test -f 'network/irc.cpp' || echo '$(srcdir)/'`network/irc.cpp
 
 irc.obj: network/irc.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT irc.obj -MD -MP -MF "$(DEPDIR)/irc.Tpo" -c -o irc.obj `if test -f 'network/irc.cpp'; then $(CYGPATH_W) 'network/irc.cpp'; else $(CYGPATH_W) '$(srcdir)/network/irc.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/irc.Tpo" "$(DEPDIR)/irc.Po"; else rm -f "$(DEPDIR)/irc.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT irc.obj -MD -MP -MF $(DEPDIR)/irc.Tpo -c -o irc.obj `if test -f 'network/irc.cpp'; then $(CYGPATH_W) 'network/irc.cpp'; else $(CYGPATH_W) '$(srcdir)/network/irc.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/irc.Tpo $(DEPDIR)/irc.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/irc.cpp' object='irc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o irc.obj `if test -f 'network/irc.cpp'; then $(CYGPATH_W) 'network/irc.cpp'; else $(CYGPATH_W) '$(srcdir)/network/irc.cpp'; fi`
 
 net_error_msg.o: network/net_error_msg.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT net_error_msg.o -MD -MP -MF "$(DEPDIR)/net_error_msg.Tpo" -c -o net_error_msg.o `test -f 'network/net_error_msg.cpp' || echo '$(srcdir)/'`network/net_error_msg.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/net_error_msg.Tpo" "$(DEPDIR)/net_error_msg.Po"; else rm -f "$(DEPDIR)/net_error_msg.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT net_error_msg.o -MD -MP -MF $(DEPDIR)/net_error_msg.Tpo -c -o net_error_msg.o `test -f 'network/net_error_msg.cpp' || echo '$(srcdir)/'`network/net_error_msg.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/net_error_msg.Tpo $(DEPDIR)/net_error_msg.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/net_error_msg.cpp' object='net_error_msg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o net_error_msg.o `test -f 'network/net_error_msg.cpp' || echo '$(srcdir)/'`network/net_error_msg.cpp
 
 net_error_msg.obj: network/net_error_msg.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT net_error_msg.obj -MD -MP -MF "$(DEPDIR)/net_error_msg.Tpo" -c -o net_error_msg.obj `if test -f 'network/net_error_msg.cpp'; then $(CYGPATH_W) 'network/net_error_msg.cpp'; else $(CYGPATH_W) '$(srcdir)/network/net_error_msg.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/net_error_msg.Tpo" "$(DEPDIR)/net_error_msg.Po"; else rm -f "$(DEPDIR)/net_error_msg.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT net_error_msg.obj -MD -MP -MF $(DEPDIR)/net_error_msg.Tpo -c -o net_error_msg.obj `if test -f 'network/net_error_msg.cpp'; then $(CYGPATH_W) 'network/net_error_msg.cpp'; else $(CYGPATH_W) '$(srcdir)/network/net_error_msg.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/net_error_msg.Tpo $(DEPDIR)/net_error_msg.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/net_error_msg.cpp' object='net_error_msg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o net_error_msg.obj `if test -f 'network/net_error_msg.cpp'; then $(CYGPATH_W) 'network/net_error_msg.cpp'; else $(CYGPATH_W) '$(srcdir)/network/net_error_msg.cpp'; fi`
 
 network_client.o: network/network_client.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_client.o -MD -MP -MF "$(DEPDIR)/network_client.Tpo" -c -o network_client.o `test -f 'network/network_client.cpp' || echo '$(srcdir)/'`network/network_client.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_client.Tpo" "$(DEPDIR)/network_client.Po"; else rm -f "$(DEPDIR)/network_client.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_client.o -MD -MP -MF $(DEPDIR)/network_client.Tpo -c -o network_client.o `test -f 'network/network_client.cpp' || echo '$(srcdir)/'`network/network_client.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_client.Tpo $(DEPDIR)/network_client.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/network_client.cpp' object='network_client.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_client.o `test -f 'network/network_client.cpp' || echo '$(srcdir)/'`network/network_client.cpp
 
 network_client.obj: network/network_client.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_client.obj -MD -MP -MF "$(DEPDIR)/network_client.Tpo" -c -o network_client.obj `if test -f 'network/network_client.cpp'; then $(CYGPATH_W) 'network/network_client.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network_client.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_client.Tpo" "$(DEPDIR)/network_client.Po"; else rm -f "$(DEPDIR)/network_client.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_client.obj -MD -MP -MF $(DEPDIR)/network_client.Tpo -c -o network_client.obj `if test -f 'network/network_client.cpp'; then $(CYGPATH_W) 'network/network_client.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network_client.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_client.Tpo $(DEPDIR)/network_client.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/network_client.cpp' object='network_client.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_client.obj `if test -f 'network/network_client.cpp'; then $(CYGPATH_W) 'network/network_client.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network_client.cpp'; fi`
 
 network.o: network/network.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network.o -MD -MP -MF "$(DEPDIR)/network.Tpo" -c -o network.o `test -f 'network/network.cpp' || echo '$(srcdir)/'`network/network.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network.Tpo" "$(DEPDIR)/network.Po"; else rm -f "$(DEPDIR)/network.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network.o -MD -MP -MF $(DEPDIR)/network.Tpo -c -o network.o `test -f 'network/network.cpp' || echo '$(srcdir)/'`network/network.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network.Tpo $(DEPDIR)/network.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/network.cpp' object='network.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network.o `test -f 'network/network.cpp' || echo '$(srcdir)/'`network/network.cpp
 
 network.obj: network/network.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network.obj -MD -MP -MF "$(DEPDIR)/network.Tpo" -c -o network.obj `if test -f 'network/network.cpp'; then $(CYGPATH_W) 'network/network.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network.Tpo" "$(DEPDIR)/network.Po"; else rm -f "$(DEPDIR)/network.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network.obj -MD -MP -MF $(DEPDIR)/network.Tpo -c -o network.obj `if test -f 'network/network.cpp'; then $(CYGPATH_W) 'network/network.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network.Tpo $(DEPDIR)/network.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/network.cpp' object='network.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network.obj `if test -f 'network/network.cpp'; then $(CYGPATH_W) 'network/network.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network.cpp'; fi`
 
 network_local.o: network/network_local.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_local.o -MD -MP -MF "$(DEPDIR)/network_local.Tpo" -c -o network_local.o `test -f 'network/network_local.cpp' || echo '$(srcdir)/'`network/network_local.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_local.Tpo" "$(DEPDIR)/network_local.Po"; else rm -f "$(DEPDIR)/network_local.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_local.o -MD -MP -MF $(DEPDIR)/network_local.Tpo -c -o network_local.o `test -f 'network/network_local.cpp' || echo '$(srcdir)/'`network/network_local.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_local.Tpo $(DEPDIR)/network_local.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/network_local.cpp' object='network_local.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_local.o `test -f 'network/network_local.cpp' || echo '$(srcdir)/'`network/network_local.cpp
 
 network_local.obj: network/network_local.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_local.obj -MD -MP -MF "$(DEPDIR)/network_local.Tpo" -c -o network_local.obj `if test -f 'network/network_local.cpp'; then $(CYGPATH_W) 'network/network_local.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network_local.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_local.Tpo" "$(DEPDIR)/network_local.Po"; else rm -f "$(DEPDIR)/network_local.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_local.obj -MD -MP -MF $(DEPDIR)/network_local.Tpo -c -o network_local.obj `if test -f 'network/network_local.cpp'; then $(CYGPATH_W) 'network/network_local.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network_local.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_local.Tpo $(DEPDIR)/network_local.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/network_local.cpp' object='network_local.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_local.obj `if test -f 'network/network_local.cpp'; then $(CYGPATH_W) 'network/network_local.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network_local.cpp'; fi`
 
 network_server.o: network/network_server.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_server.o -MD -MP -MF "$(DEPDIR)/network_server.Tpo" -c -o network_server.o `test -f 'network/network_server.cpp' || echo '$(srcdir)/'`network/network_server.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_server.Tpo" "$(DEPDIR)/network_server.Po"; else rm -f "$(DEPDIR)/network_server.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_server.o -MD -MP -MF $(DEPDIR)/network_server.Tpo -c -o network_server.o `test -f 'network/network_server.cpp' || echo '$(srcdir)/'`network/network_server.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_server.Tpo $(DEPDIR)/network_server.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/network_server.cpp' object='network_server.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_server.o `test -f 'network/network_server.cpp' || echo '$(srcdir)/'`network/network_server.cpp
 
 network_server.obj: network/network_server.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_server.obj -MD -MP -MF "$(DEPDIR)/network_server.Tpo" -c -o network_server.obj `if test -f 'network/network_server.cpp'; then $(CYGPATH_W) 'network/network_server.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network_server.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network_server.Tpo" "$(DEPDIR)/network_server.Po"; else rm -f "$(DEPDIR)/network_server.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network_server.obj -MD -MP -MF $(DEPDIR)/network_server.Tpo -c -o network_server.obj `if test -f 'network/network_server.cpp'; then $(CYGPATH_W) 'network/network_server.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network_server.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/network_server.Tpo $(DEPDIR)/network_server.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/network_server.cpp' object='network_server.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network_server.obj `if test -f 'network/network_server.cpp'; then $(CYGPATH_W) 'network/network_server.cpp'; else $(CYGPATH_W) '$(srcdir)/network/network_server.cpp'; fi`
 
 randomsync.o: network/randomsync.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT randomsync.o -MD -MP -MF "$(DEPDIR)/randomsync.Tpo" -c -o randomsync.o `test -f 'network/randomsync.cpp' || echo '$(srcdir)/'`network/randomsync.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/randomsync.Tpo" "$(DEPDIR)/randomsync.Po"; else rm -f "$(DEPDIR)/randomsync.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT randomsync.o -MD -MP -MF $(DEPDIR)/randomsync.Tpo -c -o randomsync.o `test -f 'network/randomsync.cpp' || echo '$(srcdir)/'`network/randomsync.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/randomsync.Tpo $(DEPDIR)/randomsync.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/randomsync.cpp' object='randomsync.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o randomsync.o `test -f 'network/randomsync.cpp' || echo '$(srcdir)/'`network/randomsync.cpp
 
 randomsync.obj: network/randomsync.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT randomsync.obj -MD -MP -MF "$(DEPDIR)/randomsync.Tpo" -c -o randomsync.obj `if test -f 'network/randomsync.cpp'; then $(CYGPATH_W) 'network/randomsync.cpp'; else $(CYGPATH_W) '$(srcdir)/network/randomsync.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/randomsync.Tpo" "$(DEPDIR)/randomsync.Po"; else rm -f "$(DEPDIR)/randomsync.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT randomsync.obj -MD -MP -MF $(DEPDIR)/randomsync.Tpo -c -o randomsync.obj `if test -f 'network/randomsync.cpp'; then $(CYGPATH_W) 'network/randomsync.cpp'; else $(CYGPATH_W) '$(srcdir)/network/randomsync.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/randomsync.Tpo $(DEPDIR)/randomsync.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/randomsync.cpp' object='randomsync.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o randomsync.obj `if test -f 'network/randomsync.cpp'; then $(CYGPATH_W) 'network/randomsync.cpp'; else $(CYGPATH_W) '$(srcdir)/network/randomsync.cpp'; fi`
 
 socket.o: network/socket.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT socket.o -MD -MP -MF "$(DEPDIR)/socket.Tpo" -c -o socket.o `test -f 'network/socket.cpp' || echo '$(srcdir)/'`network/socket.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/socket.Tpo" "$(DEPDIR)/socket.Po"; else rm -f "$(DEPDIR)/socket.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT socket.o -MD -MP -MF $(DEPDIR)/socket.Tpo -c -o socket.o `test -f 'network/socket.cpp' || echo '$(srcdir)/'`network/socket.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/socket.Tpo $(DEPDIR)/socket.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/socket.cpp' object='socket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o socket.o `test -f 'network/socket.cpp' || echo '$(srcdir)/'`network/socket.cpp
 
 socket.obj: network/socket.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT socket.obj -MD -MP -MF "$(DEPDIR)/socket.Tpo" -c -o socket.obj `if test -f 'network/socket.cpp'; then $(CYGPATH_W) 'network/socket.cpp'; else $(CYGPATH_W) '$(srcdir)/network/socket.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/socket.Tpo" "$(DEPDIR)/socket.Po"; else rm -f "$(DEPDIR)/socket.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT socket.obj -MD -MP -MF $(DEPDIR)/socket.Tpo -c -o socket.obj `if test -f 'network/socket.cpp'; then $(CYGPATH_W) 'network/socket.cpp'; else $(CYGPATH_W) '$(srcdir)/network/socket.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/socket.Tpo $(DEPDIR)/socket.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='network/socket.cpp' object='socket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o socket.obj `if test -f 'network/socket.cpp'; then $(CYGPATH_W) 'network/socket.cpp'; else $(CYGPATH_W) '$(srcdir)/network/socket.cpp'; fi`
 
 barrel.o: object/barrel.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT barrel.o -MD -MP -MF "$(DEPDIR)/barrel.Tpo" -c -o barrel.o `test -f 'object/barrel.cpp' || echo '$(srcdir)/'`object/barrel.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/barrel.Tpo" "$(DEPDIR)/barrel.Po"; else rm -f "$(DEPDIR)/barrel.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT barrel.o -MD -MP -MF $(DEPDIR)/barrel.Tpo -c -o barrel.o `test -f 'object/barrel.cpp' || echo '$(srcdir)/'`object/barrel.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/barrel.Tpo $(DEPDIR)/barrel.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/barrel.cpp' object='barrel.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o barrel.o `test -f 'object/barrel.cpp' || echo '$(srcdir)/'`object/barrel.cpp
 
 barrel.obj: object/barrel.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT barrel.obj -MD -MP -MF "$(DEPDIR)/barrel.Tpo" -c -o barrel.obj `if test -f 'object/barrel.cpp'; then $(CYGPATH_W) 'object/barrel.cpp'; else $(CYGPATH_W) '$(srcdir)/object/barrel.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/barrel.Tpo" "$(DEPDIR)/barrel.Po"; else rm -f "$(DEPDIR)/barrel.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT barrel.obj -MD -MP -MF $(DEPDIR)/barrel.Tpo -c -o barrel.obj `if test -f 'object/barrel.cpp'; then $(CYGPATH_W) 'object/barrel.cpp'; else $(CYGPATH_W) '$(srcdir)/object/barrel.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/barrel.Tpo $(DEPDIR)/barrel.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/barrel.cpp' object='barrel.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o barrel.obj `if test -f 'object/barrel.cpp'; then $(CYGPATH_W) 'object/barrel.cpp'; else $(CYGPATH_W) '$(srcdir)/object/barrel.cpp'; fi`
 
 bonus_box.o: object/bonus_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bonus_box.o -MD -MP -MF "$(DEPDIR)/bonus_box.Tpo" -c -o bonus_box.o `test -f 'object/bonus_box.cpp' || echo '$(srcdir)/'`object/bonus_box.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bonus_box.Tpo" "$(DEPDIR)/bonus_box.Po"; else rm -f "$(DEPDIR)/bonus_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bonus_box.o -MD -MP -MF $(DEPDIR)/bonus_box.Tpo -c -o bonus_box.o `test -f 'object/bonus_box.cpp' || echo '$(srcdir)/'`object/bonus_box.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bonus_box.Tpo $(DEPDIR)/bonus_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/bonus_box.cpp' object='bonus_box.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bonus_box.o `test -f 'object/bonus_box.cpp' || echo '$(srcdir)/'`object/bonus_box.cpp
 
 bonus_box.obj: object/bonus_box.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bonus_box.obj -MD -MP -MF "$(DEPDIR)/bonus_box.Tpo" -c -o bonus_box.obj `if test -f 'object/bonus_box.cpp'; then $(CYGPATH_W) 'object/bonus_box.cpp'; else $(CYGPATH_W) '$(srcdir)/object/bonus_box.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bonus_box.Tpo" "$(DEPDIR)/bonus_box.Po"; else rm -f "$(DEPDIR)/bonus_box.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bonus_box.obj -MD -MP -MF $(DEPDIR)/bonus_box.Tpo -c -o bonus_box.obj `if test -f 'object/bonus_box.cpp'; then $(CYGPATH_W) 'object/bonus_box.cpp'; else $(CYGPATH_W) '$(srcdir)/object/bonus_box.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bonus_box.Tpo $(DEPDIR)/bonus_box.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/bonus_box.cpp' object='bonus_box.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bonus_box.obj `if test -f 'object/bonus_box.cpp'; then $(CYGPATH_W) 'object/bonus_box.cpp'; else $(CYGPATH_W) '$(srcdir)/object/bonus_box.cpp'; fi`
 
 medkit.o: object/medkit.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT medkit.o -MD -MP -MF "$(DEPDIR)/medkit.Tpo" -c -o medkit.o `test -f 'object/medkit.cpp' || echo '$(srcdir)/'`object/medkit.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/medkit.Tpo" "$(DEPDIR)/medkit.Po"; else rm -f "$(DEPDIR)/medkit.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT medkit.o -MD -MP -MF $(DEPDIR)/medkit.Tpo -c -o medkit.o `test -f 'object/medkit.cpp' || echo '$(srcdir)/'`object/medkit.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/medkit.Tpo $(DEPDIR)/medkit.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/medkit.cpp' object='medkit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o medkit.o `test -f 'object/medkit.cpp' || echo '$(srcdir)/'`object/medkit.cpp
 
 medkit.obj: object/medkit.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT medkit.obj -MD -MP -MF "$(DEPDIR)/medkit.Tpo" -c -o medkit.obj `if test -f 'object/medkit.cpp'; then $(CYGPATH_W) 'object/medkit.cpp'; else $(CYGPATH_W) '$(srcdir)/object/medkit.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/medkit.Tpo" "$(DEPDIR)/medkit.Po"; else rm -f "$(DEPDIR)/medkit.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT medkit.obj -MD -MP -MF $(DEPDIR)/medkit.Tpo -c -o medkit.obj `if test -f 'object/medkit.cpp'; then $(CYGPATH_W) 'object/medkit.cpp'; else $(CYGPATH_W) '$(srcdir)/object/medkit.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/medkit.Tpo $(DEPDIR)/medkit.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/medkit.cpp' object='medkit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o medkit.obj `if test -f 'object/medkit.cpp'; then $(CYGPATH_W) 'object/medkit.cpp'; else $(CYGPATH_W) '$(srcdir)/object/medkit.cpp'; fi`
 
 objbox.o: object/objbox.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objbox.o -MD -MP -MF "$(DEPDIR)/objbox.Tpo" -c -o objbox.o `test -f 'object/objbox.cpp' || echo '$(srcdir)/'`object/objbox.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/objbox.Tpo" "$(DEPDIR)/objbox.Po"; else rm -f "$(DEPDIR)/objbox.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objbox.o -MD -MP -MF $(DEPDIR)/objbox.Tpo -c -o objbox.o `test -f 'object/objbox.cpp' || echo '$(srcdir)/'`object/objbox.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/objbox.Tpo $(DEPDIR)/objbox.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/objbox.cpp' object='objbox.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objbox.o `test -f 'object/objbox.cpp' || echo '$(srcdir)/'`object/objbox.cpp
 
 objbox.obj: object/objbox.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objbox.obj -MD -MP -MF "$(DEPDIR)/objbox.Tpo" -c -o objbox.obj `if test -f 'object/objbox.cpp'; then $(CYGPATH_W) 'object/objbox.cpp'; else $(CYGPATH_W) '$(srcdir)/object/objbox.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/objbox.Tpo" "$(DEPDIR)/objbox.Po"; else rm -f "$(DEPDIR)/objbox.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objbox.obj -MD -MP -MF $(DEPDIR)/objbox.Tpo -c -o objbox.obj `if test -f 'object/objbox.cpp'; then $(CYGPATH_W) 'object/objbox.cpp'; else $(CYGPATH_W) '$(srcdir)/object/objbox.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/objbox.Tpo $(DEPDIR)/objbox.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/objbox.cpp' object='objbox.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objbox.obj `if test -f 'object/objbox.cpp'; then $(CYGPATH_W) 'object/objbox.cpp'; else $(CYGPATH_W) '$(srcdir)/object/objbox.cpp'; fi`
 
 object_cfg.o: object/object_cfg.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object_cfg.o -MD -MP -MF "$(DEPDIR)/object_cfg.Tpo" -c -o object_cfg.o `test -f 'object/object_cfg.cpp' || echo '$(srcdir)/'`object/object_cfg.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/object_cfg.Tpo" "$(DEPDIR)/object_cfg.Po"; else rm -f "$(DEPDIR)/object_cfg.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object_cfg.o -MD -MP -MF $(DEPDIR)/object_cfg.Tpo -c -o object_cfg.o `test -f 'object/object_cfg.cpp' || echo '$(srcdir)/'`object/object_cfg.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/object_cfg.Tpo $(DEPDIR)/object_cfg.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/object_cfg.cpp' object='object_cfg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object_cfg.o `test -f 'object/object_cfg.cpp' || echo '$(srcdir)/'`object/object_cfg.cpp
 
 object_cfg.obj: object/object_cfg.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object_cfg.obj -MD -MP -MF "$(DEPDIR)/object_cfg.Tpo" -c -o object_cfg.obj `if test -f 'object/object_cfg.cpp'; then $(CYGPATH_W) 'object/object_cfg.cpp'; else $(CYGPATH_W) '$(srcdir)/object/object_cfg.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/object_cfg.Tpo" "$(DEPDIR)/object_cfg.Po"; else rm -f "$(DEPDIR)/object_cfg.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object_cfg.obj -MD -MP -MF $(DEPDIR)/object_cfg.Tpo -c -o object_cfg.obj `if test -f 'object/object_cfg.cpp'; then $(CYGPATH_W) 'object/object_cfg.cpp'; else $(CYGPATH_W) '$(srcdir)/object/object_cfg.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/object_cfg.Tpo $(DEPDIR)/object_cfg.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/object_cfg.cpp' object='object_cfg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object_cfg.obj `if test -f 'object/object_cfg.cpp'; then $(CYGPATH_W) 'object/object_cfg.cpp'; else $(CYGPATH_W) '$(srcdir)/object/object_cfg.cpp'; fi`
 
 objects_list.o: object/objects_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objects_list.o -MD -MP -MF "$(DEPDIR)/objects_list.Tpo" -c -o objects_list.o `test -f 'object/objects_list.cpp' || echo '$(srcdir)/'`object/objects_list.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/objects_list.Tpo" "$(DEPDIR)/objects_list.Po"; else rm -f "$(DEPDIR)/objects_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objects_list.o -MD -MP -MF $(DEPDIR)/objects_list.Tpo -c -o objects_list.o `test -f 'object/objects_list.cpp' || echo '$(srcdir)/'`object/objects_list.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/objects_list.Tpo $(DEPDIR)/objects_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/objects_list.cpp' object='objects_list.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objects_list.o `test -f 'object/objects_list.cpp' || echo '$(srcdir)/'`object/objects_list.cpp
 
 objects_list.obj: object/objects_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objects_list.obj -MD -MP -MF "$(DEPDIR)/objects_list.Tpo" -c -o objects_list.obj `if test -f 'object/objects_list.cpp'; then $(CYGPATH_W) 'object/objects_list.cpp'; else $(CYGPATH_W) '$(srcdir)/object/objects_list.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/objects_list.Tpo" "$(DEPDIR)/objects_list.Po"; else rm -f "$(DEPDIR)/objects_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objects_list.obj -MD -MP -MF $(DEPDIR)/objects_list.Tpo -c -o objects_list.obj `if test -f 'object/objects_list.cpp'; then $(CYGPATH_W) 'object/objects_list.cpp'; else $(CYGPATH_W) '$(srcdir)/object/objects_list.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/objects_list.Tpo $(DEPDIR)/objects_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/objects_list.cpp' object='objects_list.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objects_list.obj `if test -f 'object/objects_list.cpp'; then $(CYGPATH_W) 'object/objects_list.cpp'; else $(CYGPATH_W) '$(srcdir)/object/objects_list.cpp'; fi`
 
 physical_obj.o: object/physical_obj.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_obj.o -MD -MP -MF "$(DEPDIR)/physical_obj.Tpo" -c -o physical_obj.o `test -f 'object/physical_obj.cpp' || echo '$(srcdir)/'`object/physical_obj.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/physical_obj.Tpo" "$(DEPDIR)/physical_obj.Po"; else rm -f "$(DEPDIR)/physical_obj.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_obj.o -MD -MP -MF $(DEPDIR)/physical_obj.Tpo -c -o physical_obj.o `test -f 'object/physical_obj.cpp' || echo '$(srcdir)/'`object/physical_obj.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/physical_obj.Tpo $(DEPDIR)/physical_obj.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/physical_obj.cpp' object='physical_obj.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physical_obj.o `test -f 'object/physical_obj.cpp' || echo '$(srcdir)/'`object/physical_obj.cpp
 
 physical_obj.obj: object/physical_obj.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_obj.obj -MD -MP -MF "$(DEPDIR)/physical_obj.Tpo" -c -o physical_obj.obj `if test -f 'object/physical_obj.cpp'; then $(CYGPATH_W) 'object/physical_obj.cpp'; else $(CYGPATH_W) '$(srcdir)/object/physical_obj.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/physical_obj.Tpo" "$(DEPDIR)/physical_obj.Po"; else rm -f "$(DEPDIR)/physical_obj.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_obj.obj -MD -MP -MF $(DEPDIR)/physical_obj.Tpo -c -o physical_obj.obj `if test -f 'object/physical_obj.cpp'; then $(CYGPATH_W) 'object/physical_obj.cpp'; else $(CYGPATH_W) '$(srcdir)/object/physical_obj.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/physical_obj.Tpo $(DEPDIR)/physical_obj.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/physical_obj.cpp' object='physical_obj.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physical_obj.obj `if test -f 'object/physical_obj.cpp'; then $(CYGPATH_W) 'object/physical_obj.cpp'; else $(CYGPATH_W) '$(srcdir)/object/physical_obj.cpp'; fi`
 
 physics.o: object/physics.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics.o -MD -MP -MF "$(DEPDIR)/physics.Tpo" -c -o physics.o `test -f 'object/physics.cpp' || echo '$(srcdir)/'`object/physics.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/physics.Tpo" "$(DEPDIR)/physics.Po"; else rm -f "$(DEPDIR)/physics.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics.o -MD -MP -MF $(DEPDIR)/physics.Tpo -c -o physics.o `test -f 'object/physics.cpp' || echo '$(srcdir)/'`object/physics.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/physics.Tpo $(DEPDIR)/physics.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/physics.cpp' object='physics.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physics.o `test -f 'object/physics.cpp' || echo '$(srcdir)/'`object/physics.cpp
 
 physics.obj: object/physics.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics.obj -MD -MP -MF "$(DEPDIR)/physics.Tpo" -c -o physics.obj `if test -f 'object/physics.cpp'; then $(CYGPATH_W) 'object/physics.cpp'; else $(CYGPATH_W) '$(srcdir)/object/physics.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/physics.Tpo" "$(DEPDIR)/physics.Po"; else rm -f "$(DEPDIR)/physics.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics.obj -MD -MP -MF $(DEPDIR)/physics.Tpo -c -o physics.obj `if test -f 'object/physics.cpp'; then $(CYGPATH_W) 'object/physics.cpp'; else $(CYGPATH_W) '$(srcdir)/object/physics.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/physics.Tpo $(DEPDIR)/physics.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object/physics.cpp' object='physics.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physics.obj `if test -f 'object/physics.cpp'; then $(CYGPATH_W) 'object/physics.cpp'; else $(CYGPATH_W) '$(srcdir)/object/physics.cpp'; fi`
 
 body_member.o: particles/body_member.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body_member.o -MD -MP -MF "$(DEPDIR)/body_member.Tpo" -c -o body_member.o `test -f 'particles/body_member.cpp' || echo '$(srcdir)/'`particles/body_member.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/body_member.Tpo" "$(DEPDIR)/body_member.Po"; else rm -f "$(DEPDIR)/body_member.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body_member.o -MD -MP -MF $(DEPDIR)/body_member.Tpo -c -o body_member.o `test -f 'particles/body_member.cpp' || echo '$(srcdir)/'`particles/body_member.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/body_member.Tpo $(DEPDIR)/body_member.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/body_member.cpp' object='body_member.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o body_member.o `test -f 'particles/body_member.cpp' || echo '$(srcdir)/'`particles/body_member.cpp
 
 body_member.obj: particles/body_member.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body_member.obj -MD -MP -MF "$(DEPDIR)/body_member.Tpo" -c -o body_member.obj `if test -f 'particles/body_member.cpp'; then $(CYGPATH_W) 'particles/body_member.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/body_member.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/body_member.Tpo" "$(DEPDIR)/body_member.Po"; else rm -f "$(DEPDIR)/body_member.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT body_member.obj -MD -MP -MF $(DEPDIR)/body_member.Tpo -c -o body_member.obj `if test -f 'particles/body_member.cpp'; then $(CYGPATH_W) 'particles/body_member.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/body_member.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/body_member.Tpo $(DEPDIR)/body_member.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/body_member.cpp' object='body_member.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o body_member.obj `if test -f 'particles/body_member.cpp'; then $(CYGPATH_W) 'particles/body_member.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/body_member.cpp'; fi`
 
 bullet.o: particles/bullet.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bullet.o -MD -MP -MF "$(DEPDIR)/bullet.Tpo" -c -o bullet.o `test -f 'particles/bullet.cpp' || echo '$(srcdir)/'`particles/bullet.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bullet.Tpo" "$(DEPDIR)/bullet.Po"; else rm -f "$(DEPDIR)/bullet.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bullet.o -MD -MP -MF $(DEPDIR)/bullet.Tpo -c -o bullet.o `test -f 'particles/bullet.cpp' || echo '$(srcdir)/'`particles/bullet.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bullet.Tpo $(DEPDIR)/bullet.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/bullet.cpp' object='bullet.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bullet.o `test -f 'particles/bullet.cpp' || echo '$(srcdir)/'`particles/bullet.cpp
 
 bullet.obj: particles/bullet.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bullet.obj -MD -MP -MF "$(DEPDIR)/bullet.Tpo" -c -o bullet.obj `if test -f 'particles/bullet.cpp'; then $(CYGPATH_W) 'particles/bullet.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/bullet.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bullet.Tpo" "$(DEPDIR)/bullet.Po"; else rm -f "$(DEPDIR)/bullet.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bullet.obj -MD -MP -MF $(DEPDIR)/bullet.Tpo -c -o bullet.obj `if test -f 'particles/bullet.cpp'; then $(CYGPATH_W) 'particles/bullet.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/bullet.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bullet.Tpo $(DEPDIR)/bullet.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/bullet.cpp' object='bullet.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bullet.obj `if test -f 'particles/bullet.cpp'; then $(CYGPATH_W) 'particles/bullet.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/bullet.cpp'; fi`
 
 dark_smoke.o: particles/dark_smoke.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dark_smoke.o -MD -MP -MF "$(DEPDIR)/dark_smoke.Tpo" -c -o dark_smoke.o `test -f 'particles/dark_smoke.cpp' || echo '$(srcdir)/'`particles/dark_smoke.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/dark_smoke.Tpo" "$(DEPDIR)/dark_smoke.Po"; else rm -f "$(DEPDIR)/dark_smoke.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dark_smoke.o -MD -MP -MF $(DEPDIR)/dark_smoke.Tpo -c -o dark_smoke.o `test -f 'particles/dark_smoke.cpp' || echo '$(srcdir)/'`particles/dark_smoke.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dark_smoke.Tpo $(DEPDIR)/dark_smoke.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/dark_smoke.cpp' object='dark_smoke.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dark_smoke.o `test -f 'particles/dark_smoke.cpp' || echo '$(srcdir)/'`particles/dark_smoke.cpp
 
 dark_smoke.obj: particles/dark_smoke.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dark_smoke.obj -MD -MP -MF "$(DEPDIR)/dark_smoke.Tpo" -c -o dark_smoke.obj `if test -f 'particles/dark_smoke.cpp'; then $(CYGPATH_W) 'particles/dark_smoke.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/dark_smoke.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/dark_smoke.Tpo" "$(DEPDIR)/dark_smoke.Po"; else rm -f "$(DEPDIR)/dark_smoke.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dark_smoke.obj -MD -MP -MF $(DEPDIR)/dark_smoke.Tpo -c -o dark_smoke.obj `if test -f 'particles/dark_smoke.cpp'; then $(CYGPATH_W) 'particles/dark_smoke.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/dark_smoke.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dark_smoke.Tpo $(DEPDIR)/dark_smoke.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/dark_smoke.cpp' object='dark_smoke.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dark_smoke.obj `if test -f 'particles/dark_smoke.cpp'; then $(CYGPATH_W) 'particles/dark_smoke.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/dark_smoke.cpp'; fi`
 
 explosion_smoke.o: particles/explosion_smoke.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT explosion_smoke.o -MD -MP -MF "$(DEPDIR)/explosion_smoke.Tpo" -c -o explosion_smoke.o `test -f 'particles/explosion_smoke.cpp' || echo '$(srcdir)/'`particles/explosion_smoke.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/explosion_smoke.Tpo" "$(DEPDIR)/explosion_smoke.Po"; else rm -f "$(DEPDIR)/explosion_smoke.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT explosion_smoke.o -MD -MP -MF $(DEPDIR)/explosion_smoke.Tpo -c -o explosion_smoke.o `test -f 'particles/explosion_smoke.cpp' || echo '$(srcdir)/'`particles/explosion_smoke.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/explosion_smoke.Tpo $(DEPDIR)/explosion_smoke.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/explosion_smoke.cpp' object='explosion_smoke.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o explosion_smoke.o `test -f 'particles/explosion_smoke.cpp' || echo '$(srcdir)/'`particles/explosion_smoke.cpp
 
 explosion_smoke.obj: particles/explosion_smoke.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT explosion_smoke.obj -MD -MP -MF "$(DEPDIR)/explosion_smoke.Tpo" -c -o explosion_smoke.obj `if test -f 'particles/explosion_smoke.cpp'; then $(CYGPATH_W) 'particles/explosion_smoke.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/explosion_smoke.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/explosion_smoke.Tpo" "$(DEPDIR)/explosion_smoke.Po"; else rm -f "$(DEPDIR)/explosion_smoke.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT explosion_smoke.obj -MD -MP -MF $(DEPDIR)/explosion_smoke.Tpo -c -o explosion_smoke.obj `if test -f 'particles/explosion_smoke.cpp'; then $(CYGPATH_W) 'particles/explosion_smoke.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/explosion_smoke.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/explosion_smoke.Tpo $(DEPDIR)/explosion_smoke.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/explosion_smoke.cpp' object='explosion_smoke.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o explosion_smoke.obj `if test -f 'particles/explosion_smoke.cpp'; then $(CYGPATH_W) 'particles/explosion_smoke.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/explosion_smoke.cpp'; fi`
 
 fading_text.o: particles/fading_text.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fading_text.o -MD -MP -MF "$(DEPDIR)/fading_text.Tpo" -c -o fading_text.o `test -f 'particles/fading_text.cpp' || echo '$(srcdir)/'`particles/fading_text.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fading_text.Tpo" "$(DEPDIR)/fading_text.Po"; else rm -f "$(DEPDIR)/fading_text.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fading_text.o -MD -MP -MF $(DEPDIR)/fading_text.Tpo -c -o fading_text.o `test -f 'particles/fading_text.cpp' || echo '$(srcdir)/'`particles/fading_text.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/fading_text.Tpo $(DEPDIR)/fading_text.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/fading_text.cpp' object='fading_text.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fading_text.o `test -f 'particles/fading_text.cpp' || echo '$(srcdir)/'`particles/fading_text.cpp
 
 fading_text.obj: particles/fading_text.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fading_text.obj -MD -MP -MF "$(DEPDIR)/fading_text.Tpo" -c -o fading_text.obj `if test -f 'particles/fading_text.cpp'; then $(CYGPATH_W) 'particles/fading_text.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/fading_text.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fading_text.Tpo" "$(DEPDIR)/fading_text.Po"; else rm -f "$(DEPDIR)/fading_text.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fading_text.obj -MD -MP -MF $(DEPDIR)/fading_text.Tpo -c -o fading_text.obj `if test -f 'particles/fading_text.cpp'; then $(CYGPATH_W) 'particles/fading_text.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/fading_text.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/fading_text.Tpo $(DEPDIR)/fading_text.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/fading_text.cpp' object='fading_text.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fading_text.obj `if test -f 'particles/fading_text.cpp'; then $(CYGPATH_W) 'particles/fading_text.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/fading_text.cpp'; fi`
 
 fire.o: particles/fire.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fire.o -MD -MP -MF "$(DEPDIR)/fire.Tpo" -c -o fire.o `test -f 'particles/fire.cpp' || echo '$(srcdir)/'`particles/fire.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fire.Tpo" "$(DEPDIR)/fire.Po"; else rm -f "$(DEPDIR)/fire.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fire.o -MD -MP -MF $(DEPDIR)/fire.Tpo -c -o fire.o `test -f 'particles/fire.cpp' || echo '$(srcdir)/'`particles/fire.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/fire.Tpo $(DEPDIR)/fire.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/fire.cpp' object='fire.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fire.o `test -f 'particles/fire.cpp' || echo '$(srcdir)/'`particles/fire.cpp
 
 fire.obj: particles/fire.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fire.obj -MD -MP -MF "$(DEPDIR)/fire.Tpo" -c -o fire.obj `if test -f 'particles/fire.cpp'; then $(CYGPATH_W) 'particles/fire.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/fire.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/fire.Tpo" "$(DEPDIR)/fire.Po"; else rm -f "$(DEPDIR)/fire.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fire.obj -MD -MP -MF $(DEPDIR)/fire.Tpo -c -o fire.obj `if test -f 'particles/fire.cpp'; then $(CYGPATH_W) 'particles/fire.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/fire.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/fire.Tpo $(DEPDIR)/fire.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/fire.cpp' object='fire.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fire.obj `if test -f 'particles/fire.cpp'; then $(CYGPATH_W) 'particles/fire.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/fire.cpp'; fi`
 
 ground_particles.o: particles/ground_particles.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ground_particles.o -MD -MP -MF "$(DEPDIR)/ground_particles.Tpo" -c -o ground_particles.o `test -f 'particles/ground_particles.cpp' || echo '$(srcdir)/'`particles/ground_particles.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ground_particles.Tpo" "$(DEPDIR)/ground_particles.Po"; else rm -f "$(DEPDIR)/ground_particles.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ground_particles.o -MD -MP -MF $(DEPDIR)/ground_particles.Tpo -c -o ground_particles.o `test -f 'particles/ground_particles.cpp' || echo '$(srcdir)/'`particles/ground_particles.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ground_particles.Tpo $(DEPDIR)/ground_particles.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/ground_particles.cpp' object='ground_particles.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ground_particles.o `test -f 'particles/ground_particles.cpp' || echo '$(srcdir)/'`particles/ground_particles.cpp
 
 ground_particles.obj: particles/ground_particles.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ground_particles.obj -MD -MP -MF "$(DEPDIR)/ground_particles.Tpo" -c -o ground_particles.obj `if test -f 'particles/ground_particles.cpp'; then $(CYGPATH_W) 'particles/ground_particles.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/ground_particles.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ground_particles.Tpo" "$(DEPDIR)/ground_particles.Po"; else rm -f "$(DEPDIR)/ground_particles.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ground_particles.obj -MD -MP -MF $(DEPDIR)/ground_particles.Tpo -c -o ground_particles.obj `if test -f 'particles/ground_particles.cpp'; then $(CYGPATH_W) 'particles/ground_particles.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/ground_particles.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ground_particles.Tpo $(DEPDIR)/ground_particles.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/ground_particles.cpp' object='ground_particles.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ground_particles.obj `if test -f 'particles/ground_particles.cpp'; then $(CYGPATH_W) 'particles/ground_particles.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/ground_particles.cpp'; fi`
 
 ill_bubble.o: particles/ill_bubble.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ill_bubble.o -MD -MP -MF "$(DEPDIR)/ill_bubble.Tpo" -c -o ill_bubble.o `test -f 'particles/ill_bubble.cpp' || echo '$(srcdir)/'`particles/ill_bubble.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ill_bubble.Tpo" "$(DEPDIR)/ill_bubble.Po"; else rm -f "$(DEPDIR)/ill_bubble.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ill_bubble.o -MD -MP -MF $(DEPDIR)/ill_bubble.Tpo -c -o ill_bubble.o `test -f 'particles/ill_bubble.cpp' || echo '$(srcdir)/'`particles/ill_bubble.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ill_bubble.Tpo $(DEPDIR)/ill_bubble.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/ill_bubble.cpp' object='ill_bubble.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ill_bubble.o `test -f 'particles/ill_bubble.cpp' || echo '$(srcdir)/'`particles/ill_bubble.cpp
 
 ill_bubble.obj: particles/ill_bubble.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ill_bubble.obj -MD -MP -MF "$(DEPDIR)/ill_bubble.Tpo" -c -o ill_bubble.obj `if test -f 'particles/ill_bubble.cpp'; then $(CYGPATH_W) 'particles/ill_bubble.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/ill_bubble.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ill_bubble.Tpo" "$(DEPDIR)/ill_bubble.Po"; else rm -f "$(DEPDIR)/ill_bubble.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ill_bubble.obj -MD -MP -MF $(DEPDIR)/ill_bubble.Tpo -c -o ill_bubble.obj `if test -f 'particles/ill_bubble.cpp'; then $(CYGPATH_W) 'particles/ill_bubble.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/ill_bubble.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ill_bubble.Tpo $(DEPDIR)/ill_bubble.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/ill_bubble.cpp' object='ill_bubble.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ill_bubble.obj `if test -f 'particles/ill_bubble.cpp'; then $(CYGPATH_W) 'particles/ill_bubble.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/ill_bubble.cpp'; fi`
 
 magic_star.o: particles/magic_star.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT magic_star.o -MD -MP -MF "$(DEPDIR)/magic_star.Tpo" -c -o magic_star.o `test -f 'particles/magic_star.cpp' || echo '$(srcdir)/'`particles/magic_star.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/magic_star.Tpo" "$(DEPDIR)/magic_star.Po"; else rm -f "$(DEPDIR)/magic_star.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT magic_star.o -MD -MP -MF $(DEPDIR)/magic_star.Tpo -c -o magic_star.o `test -f 'particles/magic_star.cpp' || echo '$(srcdir)/'`particles/magic_star.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/magic_star.Tpo $(DEPDIR)/magic_star.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/magic_star.cpp' object='magic_star.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o magic_star.o `test -f 'particles/magic_star.cpp' || echo '$(srcdir)/'`particles/magic_star.cpp
 
 magic_star.obj: particles/magic_star.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT magic_star.obj -MD -MP -MF "$(DEPDIR)/magic_star.Tpo" -c -o magic_star.obj `if test -f 'particles/magic_star.cpp'; then $(CYGPATH_W) 'particles/magic_star.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/magic_star.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/magic_star.Tpo" "$(DEPDIR)/magic_star.Po"; else rm -f "$(DEPDIR)/magic_star.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT magic_star.obj -MD -MP -MF $(DEPDIR)/magic_star.Tpo -c -o magic_star.obj `if test -f 'particles/magic_star.cpp'; then $(CYGPATH_W) 'particles/magic_star.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/magic_star.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/magic_star.Tpo $(DEPDIR)/magic_star.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/magic_star.cpp' object='magic_star.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o magic_star.obj `if test -f 'particles/magic_star.cpp'; then $(CYGPATH_W) 'particles/magic_star.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/magic_star.cpp'; fi`
 
 particle.o: particles/particle.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle.o -MD -MP -MF "$(DEPDIR)/particle.Tpo" -c -o particle.o `test -f 'particles/particle.cpp' || echo '$(srcdir)/'`particles/particle.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particle.Tpo" "$(DEPDIR)/particle.Po"; else rm -f "$(DEPDIR)/particle.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle.o -MD -MP -MF $(DEPDIR)/particle.Tpo -c -o particle.o `test -f 'particles/particle.cpp' || echo '$(srcdir)/'`particles/particle.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/particle.Tpo $(DEPDIR)/particle.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/particle.cpp' object='particle.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle.o `test -f 'particles/particle.cpp' || echo '$(srcdir)/'`particles/particle.cpp
 
 particle.obj: particles/particle.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle.obj -MD -MP -MF "$(DEPDIR)/particle.Tpo" -c -o particle.obj `if test -f 'particles/particle.cpp'; then $(CYGPATH_W) 'particles/particle.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/particle.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particle.Tpo" "$(DEPDIR)/particle.Po"; else rm -f "$(DEPDIR)/particle.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle.obj -MD -MP -MF $(DEPDIR)/particle.Tpo -c -o particle.obj `if test -f 'particles/particle.cpp'; then $(CYGPATH_W) 'particles/particle.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/particle.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/particle.Tpo $(DEPDIR)/particle.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/particle.cpp' object='particle.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle.obj `if test -f 'particles/particle.cpp'; then $(CYGPATH_W) 'particles/particle.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/particle.cpp'; fi`
 
 polecat_fart.o: particles/polecat_fart.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polecat_fart.o -MD -MP -MF "$(DEPDIR)/polecat_fart.Tpo" -c -o polecat_fart.o `test -f 'particles/polecat_fart.cpp' || echo '$(srcdir)/'`particles/polecat_fart.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polecat_fart.Tpo" "$(DEPDIR)/polecat_fart.Po"; else rm -f "$(DEPDIR)/polecat_fart.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polecat_fart.o -MD -MP -MF $(DEPDIR)/polecat_fart.Tpo -c -o polecat_fart.o `test -f 'particles/polecat_fart.cpp' || echo '$(srcdir)/'`particles/polecat_fart.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polecat_fart.Tpo $(DEPDIR)/polecat_fart.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/polecat_fart.cpp' object='polecat_fart.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o polecat_fart.o `test -f 'particles/polecat_fart.cpp' || echo '$(srcdir)/'`particles/polecat_fart.cpp
 
 polecat_fart.obj: particles/polecat_fart.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polecat_fart.obj -MD -MP -MF "$(DEPDIR)/polecat_fart.Tpo" -c -o polecat_fart.obj `if test -f 'particles/polecat_fart.cpp'; then $(CYGPATH_W) 'particles/polecat_fart.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/polecat_fart.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polecat_fart.Tpo" "$(DEPDIR)/polecat_fart.Po"; else rm -f "$(DEPDIR)/polecat_fart.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polecat_fart.obj -MD -MP -MF $(DEPDIR)/polecat_fart.Tpo -c -o polecat_fart.obj `if test -f 'particles/polecat_fart.cpp'; then $(CYGPATH_W) 'particles/polecat_fart.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/polecat_fart.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polecat_fart.Tpo $(DEPDIR)/polecat_fart.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/polecat_fart.cpp' object='polecat_fart.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o polecat_fart.obj `if test -f 'particles/polecat_fart.cpp'; then $(CYGPATH_W) 'particles/polecat_fart.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/polecat_fart.cpp'; fi`
 
 smoke.o: particles/smoke.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT smoke.o -MD -MP -MF "$(DEPDIR)/smoke.Tpo" -c -o smoke.o `test -f 'particles/smoke.cpp' || echo '$(srcdir)/'`particles/smoke.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/smoke.Tpo" "$(DEPDIR)/smoke.Po"; else rm -f "$(DEPDIR)/smoke.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT smoke.o -MD -MP -MF $(DEPDIR)/smoke.Tpo -c -o smoke.o `test -f 'particles/smoke.cpp' || echo '$(srcdir)/'`particles/smoke.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/smoke.Tpo $(DEPDIR)/smoke.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/smoke.cpp' object='smoke.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o smoke.o `test -f 'particles/smoke.cpp' || echo '$(srcdir)/'`particles/smoke.cpp
 
 smoke.obj: particles/smoke.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT smoke.obj -MD -MP -MF "$(DEPDIR)/smoke.Tpo" -c -o smoke.obj `if test -f 'particles/smoke.cpp'; then $(CYGPATH_W) 'particles/smoke.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/smoke.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/smoke.Tpo" "$(DEPDIR)/smoke.Po"; else rm -f "$(DEPDIR)/smoke.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT smoke.obj -MD -MP -MF $(DEPDIR)/smoke.Tpo -c -o smoke.obj `if test -f 'particles/smoke.cpp'; then $(CYGPATH_W) 'particles/smoke.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/smoke.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/smoke.Tpo $(DEPDIR)/smoke.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/smoke.cpp' object='smoke.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o smoke.obj `if test -f 'particles/smoke.cpp'; then $(CYGPATH_W) 'particles/smoke.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/smoke.cpp'; fi`
 
 star.o: particles/star.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT star.o -MD -MP -MF "$(DEPDIR)/star.Tpo" -c -o star.o `test -f 'particles/star.cpp' || echo '$(srcdir)/'`particles/star.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/star.Tpo" "$(DEPDIR)/star.Po"; else rm -f "$(DEPDIR)/star.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT star.o -MD -MP -MF $(DEPDIR)/star.Tpo -c -o star.o `test -f 'particles/star.cpp' || echo '$(srcdir)/'`particles/star.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/star.Tpo $(DEPDIR)/star.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/star.cpp' object='star.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o star.o `test -f 'particles/star.cpp' || echo '$(srcdir)/'`particles/star.cpp
 
 star.obj: particles/star.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT star.obj -MD -MP -MF "$(DEPDIR)/star.Tpo" -c -o star.obj `if test -f 'particles/star.cpp'; then $(CYGPATH_W) 'particles/star.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/star.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/star.Tpo" "$(DEPDIR)/star.Po"; else rm -f "$(DEPDIR)/star.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT star.obj -MD -MP -MF $(DEPDIR)/star.Tpo -c -o star.obj `if test -f 'particles/star.cpp'; then $(CYGPATH_W) 'particles/star.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/star.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/star.Tpo $(DEPDIR)/star.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/star.cpp' object='star.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o star.obj `if test -f 'particles/star.cpp'; then $(CYGPATH_W) 'particles/star.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/star.cpp'; fi`
 
 teleport_member.o: particles/teleport_member.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teleport_member.o -MD -MP -MF "$(DEPDIR)/teleport_member.Tpo" -c -o teleport_member.o `test -f 'particles/teleport_member.cpp' || echo '$(srcdir)/'`particles/teleport_member.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/teleport_member.Tpo" "$(DEPDIR)/teleport_member.Po"; else rm -f "$(DEPDIR)/teleport_member.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teleport_member.o -MD -MP -MF $(DEPDIR)/teleport_member.Tpo -c -o teleport_member.o `test -f 'particles/teleport_member.cpp' || echo '$(srcdir)/'`particles/teleport_member.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/teleport_member.Tpo $(DEPDIR)/teleport_member.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/teleport_member.cpp' object='teleport_member.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teleport_member.o `test -f 'particles/teleport_member.cpp' || echo '$(srcdir)/'`particles/teleport_member.cpp
 
 teleport_member.obj: particles/teleport_member.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teleport_member.obj -MD -MP -MF "$(DEPDIR)/teleport_member.Tpo" -c -o teleport_member.obj `if test -f 'particles/teleport_member.cpp'; then $(CYGPATH_W) 'particles/teleport_member.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/teleport_member.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/teleport_member.Tpo" "$(DEPDIR)/teleport_member.Po"; else rm -f "$(DEPDIR)/teleport_member.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teleport_member.obj -MD -MP -MF $(DEPDIR)/teleport_member.Tpo -c -o teleport_member.obj `if test -f 'particles/teleport_member.cpp'; then $(CYGPATH_W) 'particles/teleport_member.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/teleport_member.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/teleport_member.Tpo $(DEPDIR)/teleport_member.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/teleport_member.cpp' object='teleport_member.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teleport_member.obj `if test -f 'particles/teleport_member.cpp'; then $(CYGPATH_W) 'particles/teleport_member.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/teleport_member.cpp'; fi`
 
 water_drop.o: particles/water_drop.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT water_drop.o -MD -MP -MF "$(DEPDIR)/water_drop.Tpo" -c -o water_drop.o `test -f 'particles/water_drop.cpp' || echo '$(srcdir)/'`particles/water_drop.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/water_drop.Tpo" "$(DEPDIR)/water_drop.Po"; else rm -f "$(DEPDIR)/water_drop.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT water_drop.o -MD -MP -MF $(DEPDIR)/water_drop.Tpo -c -o water_drop.o `test -f 'particles/water_drop.cpp' || echo '$(srcdir)/'`particles/water_drop.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/water_drop.Tpo $(DEPDIR)/water_drop.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/water_drop.cpp' object='water_drop.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o water_drop.o `test -f 'particles/water_drop.cpp' || echo '$(srcdir)/'`particles/water_drop.cpp
 
 water_drop.obj: particles/water_drop.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT water_drop.obj -MD -MP -MF "$(DEPDIR)/water_drop.Tpo" -c -o water_drop.obj `if test -f 'particles/water_drop.cpp'; then $(CYGPATH_W) 'particles/water_drop.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/water_drop.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/water_drop.Tpo" "$(DEPDIR)/water_drop.Po"; else rm -f "$(DEPDIR)/water_drop.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT water_drop.obj -MD -MP -MF $(DEPDIR)/water_drop.Tpo -c -o water_drop.obj `if test -f 'particles/water_drop.cpp'; then $(CYGPATH_W) 'particles/water_drop.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/water_drop.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/water_drop.Tpo $(DEPDIR)/water_drop.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='particles/water_drop.cpp' object='water_drop.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o water_drop.obj `if test -f 'particles/water_drop.cpp'; then $(CYGPATH_W) 'particles/water_drop.cpp'; else $(CYGPATH_W) '$(srcdir)/particles/water_drop.cpp'; fi`
 
 jukebox.o: sound/jukebox.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jukebox.o -MD -MP -MF "$(DEPDIR)/jukebox.Tpo" -c -o jukebox.o `test -f 'sound/jukebox.cpp' || echo '$(srcdir)/'`sound/jukebox.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/jukebox.Tpo" "$(DEPDIR)/jukebox.Po"; else rm -f "$(DEPDIR)/jukebox.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jukebox.o -MD -MP -MF $(DEPDIR)/jukebox.Tpo -c -o jukebox.o `test -f 'sound/jukebox.cpp' || echo '$(srcdir)/'`sound/jukebox.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/jukebox.Tpo $(DEPDIR)/jukebox.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sound/jukebox.cpp' object='jukebox.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jukebox.o `test -f 'sound/jukebox.cpp' || echo '$(srcdir)/'`sound/jukebox.cpp
 
 jukebox.obj: sound/jukebox.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jukebox.obj -MD -MP -MF "$(DEPDIR)/jukebox.Tpo" -c -o jukebox.obj `if test -f 'sound/jukebox.cpp'; then $(CYGPATH_W) 'sound/jukebox.cpp'; else $(CYGPATH_W) '$(srcdir)/sound/jukebox.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/jukebox.Tpo" "$(DEPDIR)/jukebox.Po"; else rm -f "$(DEPDIR)/jukebox.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jukebox.obj -MD -MP -MF $(DEPDIR)/jukebox.Tpo -c -o jukebox.obj `if test -f 'sound/jukebox.cpp'; then $(CYGPATH_W) 'sound/jukebox.cpp'; else $(CYGPATH_W) '$(srcdir)/sound/jukebox.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/jukebox.Tpo $(DEPDIR)/jukebox.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sound/jukebox.cpp' object='jukebox.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jukebox.obj `if test -f 'sound/jukebox.cpp'; then $(CYGPATH_W) 'sound/jukebox.cpp'; else $(CYGPATH_W) '$(srcdir)/sound/jukebox.cpp'; fi`
 
 sound_sample.o: sound/sound_sample.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_sample.o -MD -MP -MF "$(DEPDIR)/sound_sample.Tpo" -c -o sound_sample.o `test -f 'sound/sound_sample.cpp' || echo '$(srcdir)/'`sound/sound_sample.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sound_sample.Tpo" "$(DEPDIR)/sound_sample.Po"; else rm -f "$(DEPDIR)/sound_sample.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_sample.o -MD -MP -MF $(DEPDIR)/sound_sample.Tpo -c -o sound_sample.o `test -f 'sound/sound_sample.cpp' || echo '$(srcdir)/'`sound/sound_sample.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sound_sample.Tpo $(DEPDIR)/sound_sample.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sound/sound_sample.cpp' object='sound_sample.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_sample.o `test -f 'sound/sound_sample.cpp' || echo '$(srcdir)/'`sound/sound_sample.cpp
 
 sound_sample.obj: sound/sound_sample.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_sample.obj -MD -MP -MF "$(DEPDIR)/sound_sample.Tpo" -c -o sound_sample.obj `if test -f 'sound/sound_sample.cpp'; then $(CYGPATH_W) 'sound/sound_sample.cpp'; else $(CYGPATH_W) '$(srcdir)/sound/sound_sample.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sound_sample.Tpo" "$(DEPDIR)/sound_sample.Po"; else rm -f "$(DEPDIR)/sound_sample.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_sample.obj -MD -MP -MF $(DEPDIR)/sound_sample.Tpo -c -o sound_sample.obj `if test -f 'sound/sound_sample.cpp'; then $(CYGPATH_W) 'sound/sound_sample.cpp'; else $(CYGPATH_W) '$(srcdir)/sound/sound_sample.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sound_sample.Tpo $(DEPDIR)/sound_sample.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sound/sound_sample.cpp' object='sound_sample.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_sample.obj `if test -f 'sound/sound_sample.cpp'; then $(CYGPATH_W) 'sound/sound_sample.cpp'; else $(CYGPATH_W) '$(srcdir)/sound/sound_sample.cpp'; fi`
 
 sample_cache.o: sound/sample_cache.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sample_cache.o -MD -MP -MF "$(DEPDIR)/sample_cache.Tpo" -c -o sample_cache.o `test -f 'sound/sample_cache.cpp' || echo '$(srcdir)/'`sound/sample_cache.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sample_cache.Tpo" "$(DEPDIR)/sample_cache.Po"; else rm -f "$(DEPDIR)/sample_cache.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sample_cache.o -MD -MP -MF $(DEPDIR)/sample_cache.Tpo -c -o sample_cache.o `test -f 'sound/sample_cache.cpp' || echo '$(srcdir)/'`sound/sample_cache.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sample_cache.Tpo $(DEPDIR)/sample_cache.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sound/sample_cache.cpp' object='sample_cache.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sample_cache.o `test -f 'sound/sample_cache.cpp' || echo '$(srcdir)/'`sound/sample_cache.cpp
 
 sample_cache.obj: sound/sample_cache.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sample_cache.obj -MD -MP -MF "$(DEPDIR)/sample_cache.Tpo" -c -o sample_cache.obj `if test -f 'sound/sample_cache.cpp'; then $(CYGPATH_W) 'sound/sample_cache.cpp'; else $(CYGPATH_W) '$(srcdir)/sound/sample_cache.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sample_cache.Tpo" "$(DEPDIR)/sample_cache.Po"; else rm -f "$(DEPDIR)/sample_cache.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sample_cache.obj -MD -MP -MF $(DEPDIR)/sample_cache.Tpo -c -o sample_cache.obj `if test -f 'sound/sample_cache.cpp'; then $(CYGPATH_W) 'sound/sample_cache.cpp'; else $(CYGPATH_W) '$(srcdir)/sound/sample_cache.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sample_cache.Tpo $(DEPDIR)/sample_cache.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sound/sample_cache.cpp' object='sample_cache.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sample_cache.obj `if test -f 'sound/sample_cache.cpp'; then $(CYGPATH_W) 'sound/sample_cache.cpp'; else $(CYGPATH_W) '$(srcdir)/sound/sample_cache.cpp'; fi`
 
+custom_team.o: team/custom_team.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT custom_team.o -MD -MP -MF $(DEPDIR)/custom_team.Tpo -c -o custom_team.o `test -f 'team/custom_team.cpp' || echo '$(srcdir)/'`team/custom_team.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/custom_team.Tpo $(DEPDIR)/custom_team.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/custom_team.cpp' object='custom_team.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o custom_team.o `test -f 'team/custom_team.cpp' || echo '$(srcdir)/'`team/custom_team.cpp
+
+custom_team.obj: team/custom_team.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT custom_team.obj -MD -MP -MF $(DEPDIR)/custom_team.Tpo -c -o custom_team.obj `if test -f 'team/custom_team.cpp'; then $(CYGPATH_W) 'team/custom_team.cpp'; else $(CYGPATH_W) '$(srcdir)/team/custom_team.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/custom_team.Tpo $(DEPDIR)/custom_team.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/custom_team.cpp' object='custom_team.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o custom_team.obj `if test -f 'team/custom_team.cpp'; then $(CYGPATH_W) 'team/custom_team.cpp'; else $(CYGPATH_W) '$(srcdir)/team/custom_team.cpp'; fi`
+
+custom_teams_list.o: team/custom_teams_list.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT custom_teams_list.o -MD -MP -MF $(DEPDIR)/custom_teams_list.Tpo -c -o custom_teams_list.o `test -f 'team/custom_teams_list.cpp' || echo '$(srcdir)/'`team/custom_teams_list.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/custom_teams_list.Tpo $(DEPDIR)/custom_teams_list.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/custom_teams_list.cpp' object='custom_teams_list.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o custom_teams_list.o `test -f 'team/custom_teams_list.cpp' || echo '$(srcdir)/'`team/custom_teams_list.cpp
+
+custom_teams_list.obj: team/custom_teams_list.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT custom_teams_list.obj -MD -MP -MF $(DEPDIR)/custom_teams_list.Tpo -c -o custom_teams_list.obj `if test -f 'team/custom_teams_list.cpp'; then $(CYGPATH_W) 'team/custom_teams_list.cpp'; else $(CYGPATH_W) '$(srcdir)/team/custom_teams_list.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/custom_teams_list.Tpo $(DEPDIR)/custom_teams_list.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/custom_teams_list.cpp' object='custom_teams_list.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o custom_teams_list.obj `if test -f 'team/custom_teams_list.cpp'; then $(CYGPATH_W) 'team/custom_teams_list.cpp'; else $(CYGPATH_W) '$(srcdir)/team/custom_teams_list.cpp'; fi`
+
 results.o: team/results.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT results.o -MD -MP -MF "$(DEPDIR)/results.Tpo" -c -o results.o `test -f 'team/results.cpp' || echo '$(srcdir)/'`team/results.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/results.Tpo" "$(DEPDIR)/results.Po"; else rm -f "$(DEPDIR)/results.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT results.o -MD -MP -MF $(DEPDIR)/results.Tpo -c -o results.o `test -f 'team/results.cpp' || echo '$(srcdir)/'`team/results.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/results.Tpo $(DEPDIR)/results.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/results.cpp' object='results.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o results.o `test -f 'team/results.cpp' || echo '$(srcdir)/'`team/results.cpp
 
 results.obj: team/results.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT results.obj -MD -MP -MF "$(DEPDIR)/results.Tpo" -c -o results.obj `if test -f 'team/results.cpp'; then $(CYGPATH_W) 'team/results.cpp'; else $(CYGPATH_W) '$(srcdir)/team/results.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/results.Tpo" "$(DEPDIR)/results.Po"; else rm -f "$(DEPDIR)/results.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT results.obj -MD -MP -MF $(DEPDIR)/results.Tpo -c -o results.obj `if test -f 'team/results.cpp'; then $(CYGPATH_W) 'team/results.cpp'; else $(CYGPATH_W) '$(srcdir)/team/results.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/results.Tpo $(DEPDIR)/results.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/results.cpp' object='results.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o results.obj `if test -f 'team/results.cpp'; then $(CYGPATH_W) 'team/results.cpp'; else $(CYGPATH_W) '$(srcdir)/team/results.cpp'; fi`
 
 team.o: team/team.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team.o -MD -MP -MF "$(DEPDIR)/team.Tpo" -c -o team.o `test -f 'team/team.cpp' || echo '$(srcdir)/'`team/team.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/team.Tpo" "$(DEPDIR)/team.Po"; else rm -f "$(DEPDIR)/team.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team.o -MD -MP -MF $(DEPDIR)/team.Tpo -c -o team.o `test -f 'team/team.cpp' || echo '$(srcdir)/'`team/team.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/team.Tpo $(DEPDIR)/team.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/team.cpp' object='team.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o team.o `test -f 'team/team.cpp' || echo '$(srcdir)/'`team/team.cpp
 
 team.obj: team/team.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team.obj -MD -MP -MF "$(DEPDIR)/team.Tpo" -c -o team.obj `if test -f 'team/team.cpp'; then $(CYGPATH_W) 'team/team.cpp'; else $(CYGPATH_W) '$(srcdir)/team/team.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/team.Tpo" "$(DEPDIR)/team.Po"; else rm -f "$(DEPDIR)/team.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team.obj -MD -MP -MF $(DEPDIR)/team.Tpo -c -o team.obj `if test -f 'team/team.cpp'; then $(CYGPATH_W) 'team/team.cpp'; else $(CYGPATH_W) '$(srcdir)/team/team.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/team.Tpo $(DEPDIR)/team.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/team.cpp' object='team.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o team.obj `if test -f 'team/team.cpp'; then $(CYGPATH_W) 'team/team.cpp'; else $(CYGPATH_W) '$(srcdir)/team/team.cpp'; fi`
 
 team_energy.o: team/team_energy.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team_energy.o -MD -MP -MF "$(DEPDIR)/team_energy.Tpo" -c -o team_energy.o `test -f 'team/team_energy.cpp' || echo '$(srcdir)/'`team/team_energy.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/team_energy.Tpo" "$(DEPDIR)/team_energy.Po"; else rm -f "$(DEPDIR)/team_energy.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team_energy.o -MD -MP -MF $(DEPDIR)/team_energy.Tpo -c -o team_energy.o `test -f 'team/team_energy.cpp' || echo '$(srcdir)/'`team/team_energy.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/team_energy.Tpo $(DEPDIR)/team_energy.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/team_energy.cpp' object='team_energy.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o team_energy.o `test -f 'team/team_energy.cpp' || echo '$(srcdir)/'`team/team_energy.cpp
 
 team_energy.obj: team/team_energy.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team_energy.obj -MD -MP -MF "$(DEPDIR)/team_energy.Tpo" -c -o team_energy.obj `if test -f 'team/team_energy.cpp'; then $(CYGPATH_W) 'team/team_energy.cpp'; else $(CYGPATH_W) '$(srcdir)/team/team_energy.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/team_energy.Tpo" "$(DEPDIR)/team_energy.Po"; else rm -f "$(DEPDIR)/team_energy.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT team_energy.obj -MD -MP -MF $(DEPDIR)/team_energy.Tpo -c -o team_energy.obj `if test -f 'team/team_energy.cpp'; then $(CYGPATH_W) 'team/team_energy.cpp'; else $(CYGPATH_W) '$(srcdir)/team/team_energy.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/team_energy.Tpo $(DEPDIR)/team_energy.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/team_energy.cpp' object='team_energy.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o team_energy.obj `if test -f 'team/team_energy.cpp'; then $(CYGPATH_W) 'team/team_energy.cpp'; else $(CYGPATH_W) '$(srcdir)/team/team_energy.cpp'; fi`
 
 teams_list.o: team/teams_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teams_list.o -MD -MP -MF "$(DEPDIR)/teams_list.Tpo" -c -o teams_list.o `test -f 'team/teams_list.cpp' || echo '$(srcdir)/'`team/teams_list.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/teams_list.Tpo" "$(DEPDIR)/teams_list.Po"; else rm -f "$(DEPDIR)/teams_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teams_list.o -MD -MP -MF $(DEPDIR)/teams_list.Tpo -c -o teams_list.o `test -f 'team/teams_list.cpp' || echo '$(srcdir)/'`team/teams_list.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/teams_list.Tpo $(DEPDIR)/teams_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/teams_list.cpp' object='teams_list.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teams_list.o `test -f 'team/teams_list.cpp' || echo '$(srcdir)/'`team/teams_list.cpp
 
 teams_list.obj: team/teams_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teams_list.obj -MD -MP -MF "$(DEPDIR)/teams_list.Tpo" -c -o teams_list.obj `if test -f 'team/teams_list.cpp'; then $(CYGPATH_W) 'team/teams_list.cpp'; else $(CYGPATH_W) '$(srcdir)/team/teams_list.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/teams_list.Tpo" "$(DEPDIR)/teams_list.Po"; else rm -f "$(DEPDIR)/teams_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teams_list.obj -MD -MP -MF $(DEPDIR)/teams_list.Tpo -c -o teams_list.obj `if test -f 'team/teams_list.cpp'; then $(CYGPATH_W) 'team/teams_list.cpp'; else $(CYGPATH_W) '$(srcdir)/team/teams_list.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/teams_list.Tpo $(DEPDIR)/teams_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='team/teams_list.cpp' object='teams_list.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teams_list.obj `if test -f 'team/teams_list.cpp'; then $(CYGPATH_W) 'team/teams_list.cpp'; else $(CYGPATH_W) '$(srcdir)/team/teams_list.cpp'; fi`
 
 affine_transform.o: tool/affine_transform.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT affine_transform.o -MD -MP -MF "$(DEPDIR)/affine_transform.Tpo" -c -o affine_transform.o `test -f 'tool/affine_transform.cpp' || echo '$(srcdir)/'`tool/affine_transform.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/affine_transform.Tpo" "$(DEPDIR)/affine_transform.Po"; else rm -f "$(DEPDIR)/affine_transform.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT affine_transform.o -MD -MP -MF $(DEPDIR)/affine_transform.Tpo -c -o affine_transform.o `test -f 'tool/affine_transform.cpp' || echo '$(srcdir)/'`tool/affine_transform.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/affine_transform.Tpo $(DEPDIR)/affine_transform.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/affine_transform.cpp' object='affine_transform.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o affine_transform.o `test -f 'tool/affine_transform.cpp' || echo '$(srcdir)/'`tool/affine_transform.cpp
 
 affine_transform.obj: tool/affine_transform.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT affine_transform.obj -MD -MP -MF "$(DEPDIR)/affine_transform.Tpo" -c -o affine_transform.obj `if test -f 'tool/affine_transform.cpp'; then $(CYGPATH_W) 'tool/affine_transform.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/affine_transform.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/affine_transform.Tpo" "$(DEPDIR)/affine_transform.Po"; else rm -f "$(DEPDIR)/affine_transform.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT affine_transform.obj -MD -MP -MF $(DEPDIR)/affine_transform.Tpo -c -o affine_transform.obj `if test -f 'tool/affine_transform.cpp'; then $(CYGPATH_W) 'tool/affine_transform.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/affine_transform.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/affine_transform.Tpo $(DEPDIR)/affine_transform.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/affine_transform.cpp' object='affine_transform.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o affine_transform.obj `if test -f 'tool/affine_transform.cpp'; then $(CYGPATH_W) 'tool/affine_transform.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/affine_transform.cpp'; fi`
 
 copynpaste.o: tool/copynpaste.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT copynpaste.o -MD -MP -MF "$(DEPDIR)/copynpaste.Tpo" -c -o copynpaste.o `test -f 'tool/copynpaste.cpp' || echo '$(srcdir)/'`tool/copynpaste.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/copynpaste.Tpo" "$(DEPDIR)/copynpaste.Po"; else rm -f "$(DEPDIR)/copynpaste.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT copynpaste.o -MD -MP -MF $(DEPDIR)/copynpaste.Tpo -c -o copynpaste.o `test -f 'tool/copynpaste.cpp' || echo '$(srcdir)/'`tool/copynpaste.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/copynpaste.Tpo $(DEPDIR)/copynpaste.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/copynpaste.cpp' object='copynpaste.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o copynpaste.o `test -f 'tool/copynpaste.cpp' || echo '$(srcdir)/'`tool/copynpaste.cpp
 
 copynpaste.obj: tool/copynpaste.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT copynpaste.obj -MD -MP -MF "$(DEPDIR)/copynpaste.Tpo" -c -o copynpaste.obj `if test -f 'tool/copynpaste.cpp'; then $(CYGPATH_W) 'tool/copynpaste.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/copynpaste.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/copynpaste.Tpo" "$(DEPDIR)/copynpaste.Po"; else rm -f "$(DEPDIR)/copynpaste.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT copynpaste.obj -MD -MP -MF $(DEPDIR)/copynpaste.Tpo -c -o copynpaste.obj `if test -f 'tool/copynpaste.cpp'; then $(CYGPATH_W) 'tool/copynpaste.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/copynpaste.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/copynpaste.Tpo $(DEPDIR)/copynpaste.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/copynpaste.cpp' object='copynpaste.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o copynpaste.obj `if test -f 'tool/copynpaste.cpp'; then $(CYGPATH_W) 'tool/copynpaste.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/copynpaste.cpp'; fi`
 
 debug.o: tool/debug.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT debug.o -MD -MP -MF "$(DEPDIR)/debug.Tpo" -c -o debug.o `test -f 'tool/debug.cpp' || echo '$(srcdir)/'`tool/debug.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/debug.Tpo" "$(DEPDIR)/debug.Po"; else rm -f "$(DEPDIR)/debug.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT debug.o -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.o `test -f 'tool/debug.cpp' || echo '$(srcdir)/'`tool/debug.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/debug.cpp' object='debug.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o debug.o `test -f 'tool/debug.cpp' || echo '$(srcdir)/'`tool/debug.cpp
 
 debug.obj: tool/debug.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT debug.obj -MD -MP -MF "$(DEPDIR)/debug.Tpo" -c -o debug.obj `if test -f 'tool/debug.cpp'; then $(CYGPATH_W) 'tool/debug.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/debug.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/debug.Tpo" "$(DEPDIR)/debug.Po"; else rm -f "$(DEPDIR)/debug.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT debug.obj -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.obj `if test -f 'tool/debug.cpp'; then $(CYGPATH_W) 'tool/debug.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/debug.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/debug.cpp' object='debug.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o debug.obj `if test -f 'tool/debug.cpp'; then $(CYGPATH_W) 'tool/debug.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/debug.cpp'; fi`
 
 error.o: tool/error.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT error.o -MD -MP -MF "$(DEPDIR)/error.Tpo" -c -o error.o `test -f 'tool/error.cpp' || echo '$(srcdir)/'`tool/error.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/error.Tpo" "$(DEPDIR)/error.Po"; else rm -f "$(DEPDIR)/error.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT error.o -MD -MP -MF $(DEPDIR)/error.Tpo -c -o error.o `test -f 'tool/error.cpp' || echo '$(srcdir)/'`tool/error.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/error.Tpo $(DEPDIR)/error.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/error.cpp' object='error.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o error.o `test -f 'tool/error.cpp' || echo '$(srcdir)/'`tool/error.cpp
 
 error.obj: tool/error.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT error.obj -MD -MP -MF "$(DEPDIR)/error.Tpo" -c -o error.obj `if test -f 'tool/error.cpp'; then $(CYGPATH_W) 'tool/error.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/error.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/error.Tpo" "$(DEPDIR)/error.Po"; else rm -f "$(DEPDIR)/error.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT error.obj -MD -MP -MF $(DEPDIR)/error.Tpo -c -o error.obj `if test -f 'tool/error.cpp'; then $(CYGPATH_W) 'tool/error.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/error.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/error.Tpo $(DEPDIR)/error.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/error.cpp' object='error.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o error.obj `if test -f 'tool/error.cpp'; then $(CYGPATH_W) 'tool/error.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/error.cpp'; fi`
 
 euler_vector.o: tool/euler_vector.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT euler_vector.o -MD -MP -MF "$(DEPDIR)/euler_vector.Tpo" -c -o euler_vector.o `test -f 'tool/euler_vector.cpp' || echo '$(srcdir)/'`tool/euler_vector.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/euler_vector.Tpo" "$(DEPDIR)/euler_vector.Po"; else rm -f "$(DEPDIR)/euler_vector.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT euler_vector.o -MD -MP -MF $(DEPDIR)/euler_vector.Tpo -c -o euler_vector.o `test -f 'tool/euler_vector.cpp' || echo '$(srcdir)/'`tool/euler_vector.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/euler_vector.Tpo $(DEPDIR)/euler_vector.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/euler_vector.cpp' object='euler_vector.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o euler_vector.o `test -f 'tool/euler_vector.cpp' || echo '$(srcdir)/'`tool/euler_vector.cpp
 
 euler_vector.obj: tool/euler_vector.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT euler_vector.obj -MD -MP -MF "$(DEPDIR)/euler_vector.Tpo" -c -o euler_vector.obj `if test -f 'tool/euler_vector.cpp'; then $(CYGPATH_W) 'tool/euler_vector.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/euler_vector.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/euler_vector.Tpo" "$(DEPDIR)/euler_vector.Po"; else rm -f "$(DEPDIR)/euler_vector.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT euler_vector.obj -MD -MP -MF $(DEPDIR)/euler_vector.Tpo -c -o euler_vector.obj `if test -f 'tool/euler_vector.cpp'; then $(CYGPATH_W) 'tool/euler_vector.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/euler_vector.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/euler_vector.Tpo $(DEPDIR)/euler_vector.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/euler_vector.cpp' object='euler_vector.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o euler_vector.obj `if test -f 'tool/euler_vector.cpp'; then $(CYGPATH_W) 'tool/euler_vector.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/euler_vector.cpp'; fi`
 
 file_tools.o: tool/file_tools.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT file_tools.o -MD -MP -MF "$(DEPDIR)/file_tools.Tpo" -c -o file_tools.o `test -f 'tool/file_tools.cpp' || echo '$(srcdir)/'`tool/file_tools.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/file_tools.Tpo" "$(DEPDIR)/file_tools.Po"; else rm -f "$(DEPDIR)/file_tools.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT file_tools.o -MD -MP -MF $(DEPDIR)/file_tools.Tpo -c -o file_tools.o `test -f 'tool/file_tools.cpp' || echo '$(srcdir)/'`tool/file_tools.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/file_tools.Tpo $(DEPDIR)/file_tools.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/file_tools.cpp' object='file_tools.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o file_tools.o `test -f 'tool/file_tools.cpp' || echo '$(srcdir)/'`tool/file_tools.cpp
 
 file_tools.obj: tool/file_tools.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT file_tools.obj -MD -MP -MF "$(DEPDIR)/file_tools.Tpo" -c -o file_tools.obj `if test -f 'tool/file_tools.cpp'; then $(CYGPATH_W) 'tool/file_tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/file_tools.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/file_tools.Tpo" "$(DEPDIR)/file_tools.Po"; else rm -f "$(DEPDIR)/file_tools.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT file_tools.obj -MD -MP -MF $(DEPDIR)/file_tools.Tpo -c -o file_tools.obj `if test -f 'tool/file_tools.cpp'; then $(CYGPATH_W) 'tool/file_tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/file_tools.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/file_tools.Tpo $(DEPDIR)/file_tools.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/file_tools.cpp' object='file_tools.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o file_tools.obj `if test -f 'tool/file_tools.cpp'; then $(CYGPATH_W) 'tool/file_tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/file_tools.cpp'; fi`
 
 i18n.o: tool/i18n.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT i18n.o -MD -MP -MF "$(DEPDIR)/i18n.Tpo" -c -o i18n.o `test -f 'tool/i18n.cpp' || echo '$(srcdir)/'`tool/i18n.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/i18n.Tpo" "$(DEPDIR)/i18n.Po"; else rm -f "$(DEPDIR)/i18n.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT i18n.o -MD -MP -MF $(DEPDIR)/i18n.Tpo -c -o i18n.o `test -f 'tool/i18n.cpp' || echo '$(srcdir)/'`tool/i18n.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/i18n.Tpo $(DEPDIR)/i18n.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/i18n.cpp' object='i18n.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o i18n.o `test -f 'tool/i18n.cpp' || echo '$(srcdir)/'`tool/i18n.cpp
 
 i18n.obj: tool/i18n.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT i18n.obj -MD -MP -MF "$(DEPDIR)/i18n.Tpo" -c -o i18n.obj `if test -f 'tool/i18n.cpp'; then $(CYGPATH_W) 'tool/i18n.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/i18n.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/i18n.Tpo" "$(DEPDIR)/i18n.Po"; else rm -f "$(DEPDIR)/i18n.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT i18n.obj -MD -MP -MF $(DEPDIR)/i18n.Tpo -c -o i18n.obj `if test -f 'tool/i18n.cpp'; then $(CYGPATH_W) 'tool/i18n.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/i18n.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/i18n.Tpo $(DEPDIR)/i18n.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/i18n.cpp' object='i18n.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o i18n.obj `if test -f 'tool/i18n.cpp'; then $(CYGPATH_W) 'tool/i18n.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/i18n.cpp'; fi`
 
 random.o: tool/random.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT random.o -MD -MP -MF "$(DEPDIR)/random.Tpo" -c -o random.o `test -f 'tool/random.cpp' || echo '$(srcdir)/'`tool/random.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/random.Tpo" "$(DEPDIR)/random.Po"; else rm -f "$(DEPDIR)/random.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT random.o -MD -MP -MF $(DEPDIR)/random.Tpo -c -o random.o `test -f 'tool/random.cpp' || echo '$(srcdir)/'`tool/random.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/random.Tpo $(DEPDIR)/random.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/random.cpp' object='random.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o random.o `test -f 'tool/random.cpp' || echo '$(srcdir)/'`tool/random.cpp
 
 random.obj: tool/random.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT random.obj -MD -MP -MF "$(DEPDIR)/random.Tpo" -c -o random.obj `if test -f 'tool/random.cpp'; then $(CYGPATH_W) 'tool/random.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/random.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/random.Tpo" "$(DEPDIR)/random.Po"; else rm -f "$(DEPDIR)/random.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT random.obj -MD -MP -MF $(DEPDIR)/random.Tpo -c -o random.obj `if test -f 'tool/random.cpp'; then $(CYGPATH_W) 'tool/random.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/random.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/random.Tpo $(DEPDIR)/random.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/random.cpp' object='random.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o random.obj `if test -f 'tool/random.cpp'; then $(CYGPATH_W) 'tool/random.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/random.cpp'; fi`
 
 resource_manager.o: tool/resource_manager.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.o -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.o `test -f 'tool/resource_manager.cpp' || echo '$(srcdir)/'`tool/resource_manager.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.o -MD -MP -MF $(DEPDIR)/resource_manager.Tpo -c -o resource_manager.o `test -f 'tool/resource_manager.cpp' || echo '$(srcdir)/'`tool/resource_manager.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/resource_manager.Tpo $(DEPDIR)/resource_manager.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/resource_manager.cpp' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.o `test -f 'tool/resource_manager.cpp' || echo '$(srcdir)/'`tool/resource_manager.cpp
 
 resource_manager.obj: tool/resource_manager.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.obj -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.obj `if test -f 'tool/resource_manager.cpp'; then $(CYGPATH_W) 'tool/resource_manager.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/resource_manager.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.obj -MD -MP -MF $(DEPDIR)/resource_manager.Tpo -c -o resource_manager.obj `if test -f 'tool/resource_manager.cpp'; then $(CYGPATH_W) 'tool/resource_manager.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/resource_manager.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/resource_manager.Tpo $(DEPDIR)/resource_manager.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/resource_manager.cpp' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f 'tool/resource_manager.cpp'; then $(CYGPATH_W) 'tool/resource_manager.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/resource_manager.cpp'; fi`
 
 stats.o: tool/stats.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stats.o -MD -MP -MF "$(DEPDIR)/stats.Tpo" -c -o stats.o `test -f 'tool/stats.cpp' || echo '$(srcdir)/'`tool/stats.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/stats.Tpo" "$(DEPDIR)/stats.Po"; else rm -f "$(DEPDIR)/stats.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stats.o -MD -MP -MF $(DEPDIR)/stats.Tpo -c -o stats.o `test -f 'tool/stats.cpp' || echo '$(srcdir)/'`tool/stats.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/stats.Tpo $(DEPDIR)/stats.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/stats.cpp' object='stats.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stats.o `test -f 'tool/stats.cpp' || echo '$(srcdir)/'`tool/stats.cpp
 
 stats.obj: tool/stats.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stats.obj -MD -MP -MF "$(DEPDIR)/stats.Tpo" -c -o stats.obj `if test -f 'tool/stats.cpp'; then $(CYGPATH_W) 'tool/stats.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/stats.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/stats.Tpo" "$(DEPDIR)/stats.Po"; else rm -f "$(DEPDIR)/stats.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stats.obj -MD -MP -MF $(DEPDIR)/stats.Tpo -c -o stats.obj `if test -f 'tool/stats.cpp'; then $(CYGPATH_W) 'tool/stats.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/stats.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/stats.Tpo $(DEPDIR)/stats.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/stats.cpp' object='stats.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stats.obj `if test -f 'tool/stats.cpp'; then $(CYGPATH_W) 'tool/stats.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/stats.cpp'; fi`
 
 string_tools.o: tool/string_tools.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT string_tools.o -MD -MP -MF "$(DEPDIR)/string_tools.Tpo" -c -o string_tools.o `test -f 'tool/string_tools.cpp' || echo '$(srcdir)/'`tool/string_tools.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/string_tools.Tpo" "$(DEPDIR)/string_tools.Po"; else rm -f "$(DEPDIR)/string_tools.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT string_tools.o -MD -MP -MF $(DEPDIR)/string_tools.Tpo -c -o string_tools.o `test -f 'tool/string_tools.cpp' || echo '$(srcdir)/'`tool/string_tools.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/string_tools.Tpo $(DEPDIR)/string_tools.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/string_tools.cpp' object='string_tools.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o string_tools.o `test -f 'tool/string_tools.cpp' || echo '$(srcdir)/'`tool/string_tools.cpp
 
 string_tools.obj: tool/string_tools.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT string_tools.obj -MD -MP -MF "$(DEPDIR)/string_tools.Tpo" -c -o string_tools.obj `if test -f 'tool/string_tools.cpp'; then $(CYGPATH_W) 'tool/string_tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/string_tools.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/string_tools.Tpo" "$(DEPDIR)/string_tools.Po"; else rm -f "$(DEPDIR)/string_tools.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT string_tools.obj -MD -MP -MF $(DEPDIR)/string_tools.Tpo -c -o string_tools.obj `if test -f 'tool/string_tools.cpp'; then $(CYGPATH_W) 'tool/string_tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/string_tools.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/string_tools.Tpo $(DEPDIR)/string_tools.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/string_tools.cpp' object='string_tools.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o string_tools.obj `if test -f 'tool/string_tools.cpp'; then $(CYGPATH_W) 'tool/string_tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/string_tools.cpp'; fi`
 
 text_handling.o: tool/text_handling.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_handling.o -MD -MP -MF "$(DEPDIR)/text_handling.Tpo" -c -o text_handling.o `test -f 'tool/text_handling.cpp' || echo '$(srcdir)/'`tool/text_handling.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text_handling.Tpo" "$(DEPDIR)/text_handling.Po"; else rm -f "$(DEPDIR)/text_handling.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_handling.o -MD -MP -MF $(DEPDIR)/text_handling.Tpo -c -o text_handling.o `test -f 'tool/text_handling.cpp' || echo '$(srcdir)/'`tool/text_handling.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/text_handling.Tpo $(DEPDIR)/text_handling.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/text_handling.cpp' object='text_handling.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_handling.o `test -f 'tool/text_handling.cpp' || echo '$(srcdir)/'`tool/text_handling.cpp
 
 text_handling.obj: tool/text_handling.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_handling.obj -MD -MP -MF "$(DEPDIR)/text_handling.Tpo" -c -o text_handling.obj `if test -f 'tool/text_handling.cpp'; then $(CYGPATH_W) 'tool/text_handling.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/text_handling.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text_handling.Tpo" "$(DEPDIR)/text_handling.Po"; else rm -f "$(DEPDIR)/text_handling.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_handling.obj -MD -MP -MF $(DEPDIR)/text_handling.Tpo -c -o text_handling.obj `if test -f 'tool/text_handling.cpp'; then $(CYGPATH_W) 'tool/text_handling.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/text_handling.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/text_handling.Tpo $(DEPDIR)/text_handling.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/text_handling.cpp' object='text_handling.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_handling.obj `if test -f 'tool/text_handling.cpp'; then $(CYGPATH_W) 'tool/text_handling.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/text_handling.cpp'; fi`
 
 xml_document.o: tool/xml_document.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xml_document.o -MD -MP -MF "$(DEPDIR)/xml_document.Tpo" -c -o xml_document.o `test -f 'tool/xml_document.cpp' || echo '$(srcdir)/'`tool/xml_document.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_document.Tpo" "$(DEPDIR)/xml_document.Po"; else rm -f "$(DEPDIR)/xml_document.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xml_document.o -MD -MP -MF $(DEPDIR)/xml_document.Tpo -c -o xml_document.o `test -f 'tool/xml_document.cpp' || echo '$(srcdir)/'`tool/xml_document.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_document.Tpo $(DEPDIR)/xml_document.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/xml_document.cpp' object='xml_document.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xml_document.o `test -f 'tool/xml_document.cpp' || echo '$(srcdir)/'`tool/xml_document.cpp
 
 xml_document.obj: tool/xml_document.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xml_document.obj -MD -MP -MF "$(DEPDIR)/xml_document.Tpo" -c -o xml_document.obj `if test -f 'tool/xml_document.cpp'; then $(CYGPATH_W) 'tool/xml_document.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/xml_document.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_document.Tpo" "$(DEPDIR)/xml_document.Po"; else rm -f "$(DEPDIR)/xml_document.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xml_document.obj -MD -MP -MF $(DEPDIR)/xml_document.Tpo -c -o xml_document.obj `if test -f 'tool/xml_document.cpp'; then $(CYGPATH_W) 'tool/xml_document.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/xml_document.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_document.Tpo $(DEPDIR)/xml_document.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tool/xml_document.cpp' object='xml_document.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xml_document.obj `if test -f 'tool/xml_document.cpp'; then $(CYGPATH_W) 'tool/xml_document.cpp'; else $(CYGPATH_W) '$(srcdir)/tool/xml_document.cpp'; fi`
 
 air_attack.o: weapon/air_attack.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT air_attack.o -MD -MP -MF "$(DEPDIR)/air_attack.Tpo" -c -o air_attack.o `test -f 'weapon/air_attack.cpp' || echo '$(srcdir)/'`weapon/air_attack.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/air_attack.Tpo" "$(DEPDIR)/air_attack.Po"; else rm -f "$(DEPDIR)/air_attack.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT air_attack.o -MD -MP -MF $(DEPDIR)/air_attack.Tpo -c -o air_attack.o `test -f 'weapon/air_attack.cpp' || echo '$(srcdir)/'`weapon/air_attack.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/air_attack.Tpo $(DEPDIR)/air_attack.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/air_attack.cpp' object='air_attack.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o air_attack.o `test -f 'weapon/air_attack.cpp' || echo '$(srcdir)/'`weapon/air_attack.cpp
 
 air_attack.obj: weapon/air_attack.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT air_attack.obj -MD -MP -MF "$(DEPDIR)/air_attack.Tpo" -c -o air_attack.obj `if test -f 'weapon/air_attack.cpp'; then $(CYGPATH_W) 'weapon/air_attack.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/air_attack.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/air_attack.Tpo" "$(DEPDIR)/air_attack.Po"; else rm -f "$(DEPDIR)/air_attack.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT air_attack.obj -MD -MP -MF $(DEPDIR)/air_attack.Tpo -c -o air_attack.obj `if test -f 'weapon/air_attack.cpp'; then $(CYGPATH_W) 'weapon/air_attack.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/air_attack.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/air_attack.Tpo $(DEPDIR)/air_attack.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/air_attack.cpp' object='air_attack.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o air_attack.obj `if test -f 'weapon/air_attack.cpp'; then $(CYGPATH_W) 'weapon/air_attack.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/air_attack.cpp'; fi`
 
 airhammer.o: weapon/airhammer.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT airhammer.o -MD -MP -MF "$(DEPDIR)/airhammer.Tpo" -c -o airhammer.o `test -f 'weapon/airhammer.cpp' || echo '$(srcdir)/'`weapon/airhammer.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/airhammer.Tpo" "$(DEPDIR)/airhammer.Po"; else rm -f "$(DEPDIR)/airhammer.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT airhammer.o -MD -MP -MF $(DEPDIR)/airhammer.Tpo -c -o airhammer.o `test -f 'weapon/airhammer.cpp' || echo '$(srcdir)/'`weapon/airhammer.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/airhammer.Tpo $(DEPDIR)/airhammer.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/airhammer.cpp' object='airhammer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o airhammer.o `test -f 'weapon/airhammer.cpp' || echo '$(srcdir)/'`weapon/airhammer.cpp
 
 airhammer.obj: weapon/airhammer.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT airhammer.obj -MD -MP -MF "$(DEPDIR)/airhammer.Tpo" -c -o airhammer.obj `if test -f 'weapon/airhammer.cpp'; then $(CYGPATH_W) 'weapon/airhammer.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/airhammer.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/airhammer.Tpo" "$(DEPDIR)/airhammer.Po"; else rm -f "$(DEPDIR)/airhammer.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT airhammer.obj -MD -MP -MF $(DEPDIR)/airhammer.Tpo -c -o airhammer.obj `if test -f 'weapon/airhammer.cpp'; then $(CYGPATH_W) 'weapon/airhammer.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/airhammer.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/airhammer.Tpo $(DEPDIR)/airhammer.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/airhammer.cpp' object='airhammer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o airhammer.obj `if test -f 'weapon/airhammer.cpp'; then $(CYGPATH_W) 'weapon/airhammer.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/airhammer.cpp'; fi`
 
 anvil.o: weapon/anvil.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT anvil.o -MD -MP -MF "$(DEPDIR)/anvil.Tpo" -c -o anvil.o `test -f 'weapon/anvil.cpp' || echo '$(srcdir)/'`weapon/anvil.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/anvil.Tpo" "$(DEPDIR)/anvil.Po"; else rm -f "$(DEPDIR)/anvil.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT anvil.o -MD -MP -MF $(DEPDIR)/anvil.Tpo -c -o anvil.o `test -f 'weapon/anvil.cpp' || echo '$(srcdir)/'`weapon/anvil.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/anvil.Tpo $(DEPDIR)/anvil.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/anvil.cpp' object='anvil.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o anvil.o `test -f 'weapon/anvil.cpp' || echo '$(srcdir)/'`weapon/anvil.cpp
 
 anvil.obj: weapon/anvil.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT anvil.obj -MD -MP -MF "$(DEPDIR)/anvil.Tpo" -c -o anvil.obj `if test -f 'weapon/anvil.cpp'; then $(CYGPATH_W) 'weapon/anvil.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/anvil.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/anvil.Tpo" "$(DEPDIR)/anvil.Po"; else rm -f "$(DEPDIR)/anvil.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT anvil.obj -MD -MP -MF $(DEPDIR)/anvil.Tpo -c -o anvil.obj `if test -f 'weapon/anvil.cpp'; then $(CYGPATH_W) 'weapon/anvil.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/anvil.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/anvil.Tpo $(DEPDIR)/anvil.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/anvil.cpp' object='anvil.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o anvil.obj `if test -f 'weapon/anvil.cpp'; then $(CYGPATH_W) 'weapon/anvil.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/anvil.cpp'; fi`
 
 auto_bazooka.o: weapon/auto_bazooka.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT auto_bazooka.o -MD -MP -MF "$(DEPDIR)/auto_bazooka.Tpo" -c -o auto_bazooka.o `test -f 'weapon/auto_bazooka.cpp' || echo '$(srcdir)/'`weapon/auto_bazooka.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/auto_bazooka.Tpo" "$(DEPDIR)/auto_bazooka.Po"; else rm -f "$(DEPDIR)/auto_bazooka.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT auto_bazooka.o -MD -MP -MF $(DEPDIR)/auto_bazooka.Tpo -c -o auto_bazooka.o `test -f 'weapon/auto_bazooka.cpp' || echo '$(srcdir)/'`weapon/auto_bazooka.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/auto_bazooka.Tpo $(DEPDIR)/auto_bazooka.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/auto_bazooka.cpp' object='auto_bazooka.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o auto_bazooka.o `test -f 'weapon/auto_bazooka.cpp' || echo '$(srcdir)/'`weapon/auto_bazooka.cpp
 
 auto_bazooka.obj: weapon/auto_bazooka.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT auto_bazooka.obj -MD -MP -MF "$(DEPDIR)/auto_bazooka.Tpo" -c -o auto_bazooka.obj `if test -f 'weapon/auto_bazooka.cpp'; then $(CYGPATH_W) 'weapon/auto_bazooka.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/auto_bazooka.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/auto_bazooka.Tpo" "$(DEPDIR)/auto_bazooka.Po"; else rm -f "$(DEPDIR)/auto_bazooka.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT auto_bazooka.obj -MD -MP -MF $(DEPDIR)/auto_bazooka.Tpo -c -o auto_bazooka.obj `if test -f 'weapon/auto_bazooka.cpp'; then $(CYGPATH_W) 'weapon/auto_bazooka.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/auto_bazooka.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/auto_bazooka.Tpo $(DEPDIR)/auto_bazooka.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/auto_bazooka.cpp' object='auto_bazooka.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o auto_bazooka.obj `if test -f 'weapon/auto_bazooka.cpp'; then $(CYGPATH_W) 'weapon/auto_bazooka.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/auto_bazooka.cpp'; fi`
 
 baseball.o: weapon/baseball.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT baseball.o -MD -MP -MF "$(DEPDIR)/baseball.Tpo" -c -o baseball.o `test -f 'weapon/baseball.cpp' || echo '$(srcdir)/'`weapon/baseball.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/baseball.Tpo" "$(DEPDIR)/baseball.Po"; else rm -f "$(DEPDIR)/baseball.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT baseball.o -MD -MP -MF $(DEPDIR)/baseball.Tpo -c -o baseball.o `test -f 'weapon/baseball.cpp' || echo '$(srcdir)/'`weapon/baseball.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/baseball.Tpo $(DEPDIR)/baseball.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/baseball.cpp' object='baseball.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o baseball.o `test -f 'weapon/baseball.cpp' || echo '$(srcdir)/'`weapon/baseball.cpp
 
 baseball.obj: weapon/baseball.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT baseball.obj -MD -MP -MF "$(DEPDIR)/baseball.Tpo" -c -o baseball.obj `if test -f 'weapon/baseball.cpp'; then $(CYGPATH_W) 'weapon/baseball.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/baseball.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/baseball.Tpo" "$(DEPDIR)/baseball.Po"; else rm -f "$(DEPDIR)/baseball.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT baseball.obj -MD -MP -MF $(DEPDIR)/baseball.Tpo -c -o baseball.obj `if test -f 'weapon/baseball.cpp'; then $(CYGPATH_W) 'weapon/baseball.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/baseball.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/baseball.Tpo $(DEPDIR)/baseball.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/baseball.cpp' object='baseball.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o baseball.obj `if test -f 'weapon/baseball.cpp'; then $(CYGPATH_W) 'weapon/baseball.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/baseball.cpp'; fi`
 
 bazooka.o: weapon/bazooka.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bazooka.o -MD -MP -MF "$(DEPDIR)/bazooka.Tpo" -c -o bazooka.o `test -f 'weapon/bazooka.cpp' || echo '$(srcdir)/'`weapon/bazooka.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bazooka.Tpo" "$(DEPDIR)/bazooka.Po"; else rm -f "$(DEPDIR)/bazooka.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bazooka.o -MD -MP -MF $(DEPDIR)/bazooka.Tpo -c -o bazooka.o `test -f 'weapon/bazooka.cpp' || echo '$(srcdir)/'`weapon/bazooka.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bazooka.Tpo $(DEPDIR)/bazooka.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/bazooka.cpp' object='bazooka.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bazooka.o `test -f 'weapon/bazooka.cpp' || echo '$(srcdir)/'`weapon/bazooka.cpp
 
 bazooka.obj: weapon/bazooka.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bazooka.obj -MD -MP -MF "$(DEPDIR)/bazooka.Tpo" -c -o bazooka.obj `if test -f 'weapon/bazooka.cpp'; then $(CYGPATH_W) 'weapon/bazooka.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/bazooka.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bazooka.Tpo" "$(DEPDIR)/bazooka.Po"; else rm -f "$(DEPDIR)/bazooka.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bazooka.obj -MD -MP -MF $(DEPDIR)/bazooka.Tpo -c -o bazooka.obj `if test -f 'weapon/bazooka.cpp'; then $(CYGPATH_W) 'weapon/bazooka.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/bazooka.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bazooka.Tpo $(DEPDIR)/bazooka.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/bazooka.cpp' object='bazooka.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bazooka.obj `if test -f 'weapon/bazooka.cpp'; then $(CYGPATH_W) 'weapon/bazooka.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/bazooka.cpp'; fi`
 
 blowtorch.o: weapon/blowtorch.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blowtorch.o -MD -MP -MF "$(DEPDIR)/blowtorch.Tpo" -c -o blowtorch.o `test -f 'weapon/blowtorch.cpp' || echo '$(srcdir)/'`weapon/blowtorch.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/blowtorch.Tpo" "$(DEPDIR)/blowtorch.Po"; else rm -f "$(DEPDIR)/blowtorch.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blowtorch.o -MD -MP -MF $(DEPDIR)/blowtorch.Tpo -c -o blowtorch.o `test -f 'weapon/blowtorch.cpp' || echo '$(srcdir)/'`weapon/blowtorch.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/blowtorch.Tpo $(DEPDIR)/blowtorch.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/blowtorch.cpp' object='blowtorch.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blowtorch.o `test -f 'weapon/blowtorch.cpp' || echo '$(srcdir)/'`weapon/blowtorch.cpp
 
 blowtorch.obj: weapon/blowtorch.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blowtorch.obj -MD -MP -MF "$(DEPDIR)/blowtorch.Tpo" -c -o blowtorch.obj `if test -f 'weapon/blowtorch.cpp'; then $(CYGPATH_W) 'weapon/blowtorch.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/blowtorch.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/blowtorch.Tpo" "$(DEPDIR)/blowtorch.Po"; else rm -f "$(DEPDIR)/blowtorch.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blowtorch.obj -MD -MP -MF $(DEPDIR)/blowtorch.Tpo -c -o blowtorch.obj `if test -f 'weapon/blowtorch.cpp'; then $(CYGPATH_W) 'weapon/blowtorch.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/blowtorch.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/blowtorch.Tpo $(DEPDIR)/blowtorch.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/blowtorch.cpp' object='blowtorch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blowtorch.obj `if test -f 'weapon/blowtorch.cpp'; then $(CYGPATH_W) 'weapon/blowtorch.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/blowtorch.cpp'; fi`
 
 bounce_ball.o: weapon/bounce_ball.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounce_ball.o -MD -MP -MF "$(DEPDIR)/bounce_ball.Tpo" -c -o bounce_ball.o `test -f 'weapon/bounce_ball.cpp' || echo '$(srcdir)/'`weapon/bounce_ball.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bounce_ball.Tpo" "$(DEPDIR)/bounce_ball.Po"; else rm -f "$(DEPDIR)/bounce_ball.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounce_ball.o -MD -MP -MF $(DEPDIR)/bounce_ball.Tpo -c -o bounce_ball.o `test -f 'weapon/bounce_ball.cpp' || echo '$(srcdir)/'`weapon/bounce_ball.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bounce_ball.Tpo $(DEPDIR)/bounce_ball.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/bounce_ball.cpp' object='bounce_ball.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bounce_ball.o `test -f 'weapon/bounce_ball.cpp' || echo '$(srcdir)/'`weapon/bounce_ball.cpp
 
 bounce_ball.obj: weapon/bounce_ball.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounce_ball.obj -MD -MP -MF "$(DEPDIR)/bounce_ball.Tpo" -c -o bounce_ball.obj `if test -f 'weapon/bounce_ball.cpp'; then $(CYGPATH_W) 'weapon/bounce_ball.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/bounce_ball.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bounce_ball.Tpo" "$(DEPDIR)/bounce_ball.Po"; else rm -f "$(DEPDIR)/bounce_ball.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounce_ball.obj -MD -MP -MF $(DEPDIR)/bounce_ball.Tpo -c -o bounce_ball.obj `if test -f 'weapon/bounce_ball.cpp'; then $(CYGPATH_W) 'weapon/bounce_ball.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/bounce_ball.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bounce_ball.Tpo $(DEPDIR)/bounce_ball.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/bounce_ball.cpp' object='bounce_ball.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bounce_ball.obj `if test -f 'weapon/bounce_ball.cpp'; then $(CYGPATH_W) 'weapon/bounce_ball.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/bounce_ball.cpp'; fi`
 
 cluzooka.o: weapon/cluzooka.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cluzooka.o -MD -MP -MF "$(DEPDIR)/cluzooka.Tpo" -c -o cluzooka.o `test -f 'weapon/cluzooka.cpp' || echo '$(srcdir)/'`weapon/cluzooka.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/cluzooka.Tpo" "$(DEPDIR)/cluzooka.Po"; else rm -f "$(DEPDIR)/cluzooka.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cluzooka.o -MD -MP -MF $(DEPDIR)/cluzooka.Tpo -c -o cluzooka.o `test -f 'weapon/cluzooka.cpp' || echo '$(srcdir)/'`weapon/cluzooka.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/cluzooka.Tpo $(DEPDIR)/cluzooka.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/cluzooka.cpp' object='cluzooka.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cluzooka.o `test -f 'weapon/cluzooka.cpp' || echo '$(srcdir)/'`weapon/cluzooka.cpp
 
 cluzooka.obj: weapon/cluzooka.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cluzooka.obj -MD -MP -MF "$(DEPDIR)/cluzooka.Tpo" -c -o cluzooka.obj `if test -f 'weapon/cluzooka.cpp'; then $(CYGPATH_W) 'weapon/cluzooka.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/cluzooka.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/cluzooka.Tpo" "$(DEPDIR)/cluzooka.Po"; else rm -f "$(DEPDIR)/cluzooka.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cluzooka.obj -MD -MP -MF $(DEPDIR)/cluzooka.Tpo -c -o cluzooka.obj `if test -f 'weapon/cluzooka.cpp'; then $(CYGPATH_W) 'weapon/cluzooka.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/cluzooka.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/cluzooka.Tpo $(DEPDIR)/cluzooka.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/cluzooka.cpp' object='cluzooka.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cluzooka.obj `if test -f 'weapon/cluzooka.cpp'; then $(CYGPATH_W) 'weapon/cluzooka.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/cluzooka.cpp'; fi`
 
 cluster_bomb.o: weapon/cluster_bomb.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cluster_bomb.o -MD -MP -MF "$(DEPDIR)/cluster_bomb.Tpo" -c -o cluster_bomb.o `test -f 'weapon/cluster_bomb.cpp' || echo '$(srcdir)/'`weapon/cluster_bomb.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/cluster_bomb.Tpo" "$(DEPDIR)/cluster_bomb.Po"; else rm -f "$(DEPDIR)/cluster_bomb.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cluster_bomb.o -MD -MP -MF $(DEPDIR)/cluster_bomb.Tpo -c -o cluster_bomb.o `test -f 'weapon/cluster_bomb.cpp' || echo '$(srcdir)/'`weapon/cluster_bomb.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/cluster_bomb.Tpo $(DEPDIR)/cluster_bomb.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/cluster_bomb.cpp' object='cluster_bomb.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cluster_bomb.o `test -f 'weapon/cluster_bomb.cpp' || echo '$(srcdir)/'`weapon/cluster_bomb.cpp
 
 cluster_bomb.obj: weapon/cluster_bomb.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cluster_bomb.obj -MD -MP -MF "$(DEPDIR)/cluster_bomb.Tpo" -c -o cluster_bomb.obj `if test -f 'weapon/cluster_bomb.cpp'; then $(CYGPATH_W) 'weapon/cluster_bomb.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/cluster_bomb.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/cluster_bomb.Tpo" "$(DEPDIR)/cluster_bomb.Po"; else rm -f "$(DEPDIR)/cluster_bomb.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cluster_bomb.obj -MD -MP -MF $(DEPDIR)/cluster_bomb.Tpo -c -o cluster_bomb.obj `if test -f 'weapon/cluster_bomb.cpp'; then $(CYGPATH_W) 'weapon/cluster_bomb.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/cluster_bomb.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/cluster_bomb.Tpo $(DEPDIR)/cluster_bomb.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/cluster_bomb.cpp' object='cluster_bomb.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cluster_bomb.obj `if test -f 'weapon/cluster_bomb.cpp'; then $(CYGPATH_W) 'weapon/cluster_bomb.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/cluster_bomb.cpp'; fi`
 
 footbomb.o: weapon/footbomb.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT footbomb.o -MD -MP -MF "$(DEPDIR)/footbomb.Tpo" -c -o footbomb.o `test -f 'weapon/footbomb.cpp' || echo '$(srcdir)/'`weapon/footbomb.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/footbomb.Tpo" "$(DEPDIR)/footbomb.Po"; else rm -f "$(DEPDIR)/footbomb.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT footbomb.o -MD -MP -MF $(DEPDIR)/footbomb.Tpo -c -o footbomb.o `test -f 'weapon/footbomb.cpp' || echo '$(srcdir)/'`weapon/footbomb.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/footbomb.Tpo $(DEPDIR)/footbomb.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/footbomb.cpp' object='footbomb.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o footbomb.o `test -f 'weapon/footbomb.cpp' || echo '$(srcdir)/'`weapon/footbomb.cpp
 
 footbomb.obj: weapon/footbomb.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT footbomb.obj -MD -MP -MF "$(DEPDIR)/footbomb.Tpo" -c -o footbomb.obj `if test -f 'weapon/footbomb.cpp'; then $(CYGPATH_W) 'weapon/footbomb.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/footbomb.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/footbomb.Tpo" "$(DEPDIR)/footbomb.Po"; else rm -f "$(DEPDIR)/footbomb.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT footbomb.obj -MD -MP -MF $(DEPDIR)/footbomb.Tpo -c -o footbomb.obj `if test -f 'weapon/footbomb.cpp'; then $(CYGPATH_W) 'weapon/footbomb.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/footbomb.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/footbomb.Tpo $(DEPDIR)/footbomb.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/footbomb.cpp' object='footbomb.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o footbomb.obj `if test -f 'weapon/footbomb.cpp'; then $(CYGPATH_W) 'weapon/footbomb.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/footbomb.cpp'; fi`
 
 construct.o: weapon/construct.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT construct.o -MD -MP -MF "$(DEPDIR)/construct.Tpo" -c -o construct.o `test -f 'weapon/construct.cpp' || echo '$(srcdir)/'`weapon/construct.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/construct.Tpo" "$(DEPDIR)/construct.Po"; else rm -f "$(DEPDIR)/construct.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT construct.o -MD -MP -MF $(DEPDIR)/construct.Tpo -c -o construct.o `test -f 'weapon/construct.cpp' || echo '$(srcdir)/'`weapon/construct.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/construct.Tpo $(DEPDIR)/construct.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/construct.cpp' object='construct.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o construct.o `test -f 'weapon/construct.cpp' || echo '$(srcdir)/'`weapon/construct.cpp
 
 construct.obj: weapon/construct.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT construct.obj -MD -MP -MF "$(DEPDIR)/construct.Tpo" -c -o construct.obj `if test -f 'weapon/construct.cpp'; then $(CYGPATH_W) 'weapon/construct.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/construct.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/construct.Tpo" "$(DEPDIR)/construct.Po"; else rm -f "$(DEPDIR)/construct.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT construct.obj -MD -MP -MF $(DEPDIR)/construct.Tpo -c -o construct.obj `if test -f 'weapon/construct.cpp'; then $(CYGPATH_W) 'weapon/construct.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/construct.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/construct.Tpo $(DEPDIR)/construct.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/construct.cpp' object='construct.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o construct.obj `if test -f 'weapon/construct.cpp'; then $(CYGPATH_W) 'weapon/construct.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/construct.cpp'; fi`
 
 crosshair.o: weapon/crosshair.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crosshair.o -MD -MP -MF "$(DEPDIR)/crosshair.Tpo" -c -o crosshair.o `test -f 'weapon/crosshair.cpp' || echo '$(srcdir)/'`weapon/crosshair.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/crosshair.Tpo" "$(DEPDIR)/crosshair.Po"; else rm -f "$(DEPDIR)/crosshair.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crosshair.o -MD -MP -MF $(DEPDIR)/crosshair.Tpo -c -o crosshair.o `test -f 'weapon/crosshair.cpp' || echo '$(srcdir)/'`weapon/crosshair.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/crosshair.Tpo $(DEPDIR)/crosshair.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/crosshair.cpp' object='crosshair.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o crosshair.o `test -f 'weapon/crosshair.cpp' || echo '$(srcdir)/'`weapon/crosshair.cpp
 
 crosshair.obj: weapon/crosshair.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crosshair.obj -MD -MP -MF "$(DEPDIR)/crosshair.Tpo" -c -o crosshair.obj `if test -f 'weapon/crosshair.cpp'; then $(CYGPATH_W) 'weapon/crosshair.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/crosshair.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/crosshair.Tpo" "$(DEPDIR)/crosshair.Po"; else rm -f "$(DEPDIR)/crosshair.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crosshair.obj -MD -MP -MF $(DEPDIR)/crosshair.Tpo -c -o crosshair.obj `if test -f 'weapon/crosshair.cpp'; then $(CYGPATH_W) 'weapon/crosshair.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/crosshair.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/crosshair.Tpo $(DEPDIR)/crosshair.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/crosshair.cpp' object='crosshair.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o crosshair.obj `if test -f 'weapon/crosshair.cpp'; then $(CYGPATH_W) 'weapon/crosshair.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/crosshair.cpp'; fi`
 
 disco_grenade.o: weapon/disco_grenade.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT disco_grenade.o -MD -MP -MF "$(DEPDIR)/disco_grenade.Tpo" -c -o disco_grenade.o `test -f 'weapon/disco_grenade.cpp' || echo '$(srcdir)/'`weapon/disco_grenade.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/disco_grenade.Tpo" "$(DEPDIR)/disco_grenade.Po"; else rm -f "$(DEPDIR)/disco_grenade.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT disco_grenade.o -MD -MP -MF $(DEPDIR)/disco_grenade.Tpo -c -o disco_grenade.o `test -f 'weapon/disco_grenade.cpp' || echo '$(srcdir)/'`weapon/disco_grenade.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/disco_grenade.Tpo $(DEPDIR)/disco_grenade.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/disco_grenade.cpp' object='disco_grenade.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o disco_grenade.o `test -f 'weapon/disco_grenade.cpp' || echo '$(srcdir)/'`weapon/disco_grenade.cpp
 
 disco_grenade.obj: weapon/disco_grenade.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT disco_grenade.obj -MD -MP -MF "$(DEPDIR)/disco_grenade.Tpo" -c -o disco_grenade.obj `if test -f 'weapon/disco_grenade.cpp'; then $(CYGPATH_W) 'weapon/disco_grenade.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/disco_grenade.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/disco_grenade.Tpo" "$(DEPDIR)/disco_grenade.Po"; else rm -f "$(DEPDIR)/disco_grenade.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT disco_grenade.obj -MD -MP -MF $(DEPDIR)/disco_grenade.Tpo -c -o disco_grenade.obj `if test -f 'weapon/disco_grenade.cpp'; then $(CYGPATH_W) 'weapon/disco_grenade.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/disco_grenade.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/disco_grenade.Tpo $(DEPDIR)/disco_grenade.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/disco_grenade.cpp' object='disco_grenade.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o disco_grenade.obj `if test -f 'weapon/disco_grenade.cpp'; then $(CYGPATH_W) 'weapon/disco_grenade.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/disco_grenade.cpp'; fi`
 
 dynamite.o: weapon/dynamite.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dynamite.o -MD -MP -MF "$(DEPDIR)/dynamite.Tpo" -c -o dynamite.o `test -f 'weapon/dynamite.cpp' || echo '$(srcdir)/'`weapon/dynamite.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/dynamite.Tpo" "$(DEPDIR)/dynamite.Po"; else rm -f "$(DEPDIR)/dynamite.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dynamite.o -MD -MP -MF $(DEPDIR)/dynamite.Tpo -c -o dynamite.o `test -f 'weapon/dynamite.cpp' || echo '$(srcdir)/'`weapon/dynamite.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dynamite.Tpo $(DEPDIR)/dynamite.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/dynamite.cpp' object='dynamite.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dynamite.o `test -f 'weapon/dynamite.cpp' || echo '$(srcdir)/'`weapon/dynamite.cpp
 
 dynamite.obj: weapon/dynamite.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dynamite.obj -MD -MP -MF "$(DEPDIR)/dynamite.Tpo" -c -o dynamite.obj `if test -f 'weapon/dynamite.cpp'; then $(CYGPATH_W) 'weapon/dynamite.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/dynamite.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/dynamite.Tpo" "$(DEPDIR)/dynamite.Po"; else rm -f "$(DEPDIR)/dynamite.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dynamite.obj -MD -MP -MF $(DEPDIR)/dynamite.Tpo -c -o dynamite.obj `if test -f 'weapon/dynamite.cpp'; then $(CYGPATH_W) 'weapon/dynamite.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/dynamite.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dynamite.Tpo $(DEPDIR)/dynamite.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/dynamite.cpp' object='dynamite.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dynamite.obj `if test -f 'weapon/dynamite.cpp'; then $(CYGPATH_W) 'weapon/dynamite.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/dynamite.cpp'; fi`
 
 explosion.o: weapon/explosion.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT explosion.o -MD -MP -MF "$(DEPDIR)/explosion.Tpo" -c -o explosion.o `test -f 'weapon/explosion.cpp' || echo '$(srcdir)/'`weapon/explosion.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/explosion.Tpo" "$(DEPDIR)/explosion.Po"; else rm -f "$(DEPDIR)/explosion.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT explosion.o -MD -MP -MF $(DEPDIR)/explosion.Tpo -c -o explosion.o `test -f 'weapon/explosion.cpp' || echo '$(srcdir)/'`weapon/explosion.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/explosion.Tpo $(DEPDIR)/explosion.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/explosion.cpp' object='explosion.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o explosion.o `test -f 'weapon/explosion.cpp' || echo '$(srcdir)/'`weapon/explosion.cpp
 
 explosion.obj: weapon/explosion.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT explosion.obj -MD -MP -MF "$(DEPDIR)/explosion.Tpo" -c -o explosion.obj `if test -f 'weapon/explosion.cpp'; then $(CYGPATH_W) 'weapon/explosion.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/explosion.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/explosion.Tpo" "$(DEPDIR)/explosion.Po"; else rm -f "$(DEPDIR)/explosion.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT explosion.obj -MD -MP -MF $(DEPDIR)/explosion.Tpo -c -o explosion.obj `if test -f 'weapon/explosion.cpp'; then $(CYGPATH_W) 'weapon/explosion.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/explosion.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/explosion.Tpo $(DEPDIR)/explosion.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/explosion.cpp' object='explosion.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o explosion.obj `if test -f 'weapon/explosion.cpp'; then $(CYGPATH_W) 'weapon/explosion.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/explosion.cpp'; fi`
 
 flamethrower.o: weapon/flamethrower.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flamethrower.o -MD -MP -MF "$(DEPDIR)/flamethrower.Tpo" -c -o flamethrower.o `test -f 'weapon/flamethrower.cpp' || echo '$(srcdir)/'`weapon/flamethrower.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/flamethrower.Tpo" "$(DEPDIR)/flamethrower.Po"; else rm -f "$(DEPDIR)/flamethrower.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flamethrower.o -MD -MP -MF $(DEPDIR)/flamethrower.Tpo -c -o flamethrower.o `test -f 'weapon/flamethrower.cpp' || echo '$(srcdir)/'`weapon/flamethrower.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/flamethrower.Tpo $(DEPDIR)/flamethrower.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/flamethrower.cpp' object='flamethrower.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flamethrower.o `test -f 'weapon/flamethrower.cpp' || echo '$(srcdir)/'`weapon/flamethrower.cpp
 
 flamethrower.obj: weapon/flamethrower.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flamethrower.obj -MD -MP -MF "$(DEPDIR)/flamethrower.Tpo" -c -o flamethrower.obj `if test -f 'weapon/flamethrower.cpp'; then $(CYGPATH_W) 'weapon/flamethrower.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/flamethrower.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/flamethrower.Tpo" "$(DEPDIR)/flamethrower.Po"; else rm -f "$(DEPDIR)/flamethrower.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flamethrower.obj -MD -MP -MF $(DEPDIR)/flamethrower.Tpo -c -o flamethrower.obj `if test -f 'weapon/flamethrower.cpp'; then $(CYGPATH_W) 'weapon/flamethrower.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/flamethrower.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/flamethrower.Tpo $(DEPDIR)/flamethrower.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/flamethrower.cpp' object='flamethrower.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flamethrower.obj `if test -f 'weapon/flamethrower.cpp'; then $(CYGPATH_W) 'weapon/flamethrower.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/flamethrower.cpp'; fi`
 
 gnu.o: weapon/gnu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu.o -MD -MP -MF "$(DEPDIR)/gnu.Tpo" -c -o gnu.o `test -f 'weapon/gnu.cpp' || echo '$(srcdir)/'`weapon/gnu.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gnu.Tpo" "$(DEPDIR)/gnu.Po"; else rm -f "$(DEPDIR)/gnu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu.o -MD -MP -MF $(DEPDIR)/gnu.Tpo -c -o gnu.o `test -f 'weapon/gnu.cpp' || echo '$(srcdir)/'`weapon/gnu.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gnu.Tpo $(DEPDIR)/gnu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/gnu.cpp' object='gnu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu.o `test -f 'weapon/gnu.cpp' || echo '$(srcdir)/'`weapon/gnu.cpp
 
 gnu.obj: weapon/gnu.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu.obj -MD -MP -MF "$(DEPDIR)/gnu.Tpo" -c -o gnu.obj `if test -f 'weapon/gnu.cpp'; then $(CYGPATH_W) 'weapon/gnu.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/gnu.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gnu.Tpo" "$(DEPDIR)/gnu.Po"; else rm -f "$(DEPDIR)/gnu.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnu.obj -MD -MP -MF $(DEPDIR)/gnu.Tpo -c -o gnu.obj `if test -f 'weapon/gnu.cpp'; then $(CYGPATH_W) 'weapon/gnu.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/gnu.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gnu.Tpo $(DEPDIR)/gnu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/gnu.cpp' object='gnu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu.obj `if test -f 'weapon/gnu.cpp'; then $(CYGPATH_W) 'weapon/gnu.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/gnu.cpp'; fi`
 
 grapple.o: weapon/grapple.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grapple.o -MD -MP -MF "$(DEPDIR)/grapple.Tpo" -c -o grapple.o `test -f 'weapon/grapple.cpp' || echo '$(srcdir)/'`weapon/grapple.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/grapple.Tpo" "$(DEPDIR)/grapple.Po"; else rm -f "$(DEPDIR)/grapple.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grapple.o -MD -MP -MF $(DEPDIR)/grapple.Tpo -c -o grapple.o `test -f 'weapon/grapple.cpp' || echo '$(srcdir)/'`weapon/grapple.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/grapple.Tpo $(DEPDIR)/grapple.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/grapple.cpp' object='grapple.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o grapple.o `test -f 'weapon/grapple.cpp' || echo '$(srcdir)/'`weapon/grapple.cpp
 
 grapple.obj: weapon/grapple.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grapple.obj -MD -MP -MF "$(DEPDIR)/grapple.Tpo" -c -o grapple.obj `if test -f 'weapon/grapple.cpp'; then $(CYGPATH_W) 'weapon/grapple.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/grapple.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/grapple.Tpo" "$(DEPDIR)/grapple.Po"; else rm -f "$(DEPDIR)/grapple.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grapple.obj -MD -MP -MF $(DEPDIR)/grapple.Tpo -c -o grapple.obj `if test -f 'weapon/grapple.cpp'; then $(CYGPATH_W) 'weapon/grapple.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/grapple.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/grapple.Tpo $(DEPDIR)/grapple.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/grapple.cpp' object='grapple.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o grapple.obj `if test -f 'weapon/grapple.cpp'; then $(CYGPATH_W) 'weapon/grapple.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/grapple.cpp'; fi`
 
 grenade.o: weapon/grenade.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grenade.o -MD -MP -MF "$(DEPDIR)/grenade.Tpo" -c -o grenade.o `test -f 'weapon/grenade.cpp' || echo '$(srcdir)/'`weapon/grenade.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/grenade.Tpo" "$(DEPDIR)/grenade.Po"; else rm -f "$(DEPDIR)/grenade.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grenade.o -MD -MP -MF $(DEPDIR)/grenade.Tpo -c -o grenade.o `test -f 'weapon/grenade.cpp' || echo '$(srcdir)/'`weapon/grenade.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/grenade.Tpo $(DEPDIR)/grenade.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/grenade.cpp' object='grenade.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o grenade.o `test -f 'weapon/grenade.cpp' || echo '$(srcdir)/'`weapon/grenade.cpp
 
 grenade.obj: weapon/grenade.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grenade.obj -MD -MP -MF "$(DEPDIR)/grenade.Tpo" -c -o grenade.obj `if test -f 'weapon/grenade.cpp'; then $(CYGPATH_W) 'weapon/grenade.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/grenade.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/grenade.Tpo" "$(DEPDIR)/grenade.Po"; else rm -f "$(DEPDIR)/grenade.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grenade.obj -MD -MP -MF $(DEPDIR)/grenade.Tpo -c -o grenade.obj `if test -f 'weapon/grenade.cpp'; then $(CYGPATH_W) 'weapon/grenade.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/grenade.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/grenade.Tpo $(DEPDIR)/grenade.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/grenade.cpp' object='grenade.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o grenade.obj `if test -f 'weapon/grenade.cpp'; then $(CYGPATH_W) 'weapon/grenade.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/grenade.cpp'; fi`
 
 gun.o: weapon/gun.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gun.o -MD -MP -MF "$(DEPDIR)/gun.Tpo" -c -o gun.o `test -f 'weapon/gun.cpp' || echo '$(srcdir)/'`weapon/gun.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gun.Tpo" "$(DEPDIR)/gun.Po"; else rm -f "$(DEPDIR)/gun.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gun.o -MD -MP -MF $(DEPDIR)/gun.Tpo -c -o gun.o `test -f 'weapon/gun.cpp' || echo '$(srcdir)/'`weapon/gun.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gun.Tpo $(DEPDIR)/gun.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/gun.cpp' object='gun.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gun.o `test -f 'weapon/gun.cpp' || echo '$(srcdir)/'`weapon/gun.cpp
 
 gun.obj: weapon/gun.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gun.obj -MD -MP -MF "$(DEPDIR)/gun.Tpo" -c -o gun.obj `if test -f 'weapon/gun.cpp'; then $(CYGPATH_W) 'weapon/gun.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/gun.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gun.Tpo" "$(DEPDIR)/gun.Po"; else rm -f "$(DEPDIR)/gun.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gun.obj -MD -MP -MF $(DEPDIR)/gun.Tpo -c -o gun.obj `if test -f 'weapon/gun.cpp'; then $(CYGPATH_W) 'weapon/gun.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/gun.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gun.Tpo $(DEPDIR)/gun.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/gun.cpp' object='gun.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gun.obj `if test -f 'weapon/gun.cpp'; then $(CYGPATH_W) 'weapon/gun.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/gun.cpp'; fi`
 
 jetpack.o: weapon/jetpack.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jetpack.o -MD -MP -MF "$(DEPDIR)/jetpack.Tpo" -c -o jetpack.o `test -f 'weapon/jetpack.cpp' || echo '$(srcdir)/'`weapon/jetpack.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/jetpack.Tpo" "$(DEPDIR)/jetpack.Po"; else rm -f "$(DEPDIR)/jetpack.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jetpack.o -MD -MP -MF $(DEPDIR)/jetpack.Tpo -c -o jetpack.o `test -f 'weapon/jetpack.cpp' || echo '$(srcdir)/'`weapon/jetpack.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/jetpack.Tpo $(DEPDIR)/jetpack.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/jetpack.cpp' object='jetpack.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jetpack.o `test -f 'weapon/jetpack.cpp' || echo '$(srcdir)/'`weapon/jetpack.cpp
 
 jetpack.obj: weapon/jetpack.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jetpack.obj -MD -MP -MF "$(DEPDIR)/jetpack.Tpo" -c -o jetpack.obj `if test -f 'weapon/jetpack.cpp'; then $(CYGPATH_W) 'weapon/jetpack.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/jetpack.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/jetpack.Tpo" "$(DEPDIR)/jetpack.Po"; else rm -f "$(DEPDIR)/jetpack.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jetpack.obj -MD -MP -MF $(DEPDIR)/jetpack.Tpo -c -o jetpack.obj `if test -f 'weapon/jetpack.cpp'; then $(CYGPATH_W) 'weapon/jetpack.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/jetpack.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/jetpack.Tpo $(DEPDIR)/jetpack.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/jetpack.cpp' object='jetpack.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jetpack.obj `if test -f 'weapon/jetpack.cpp'; then $(CYGPATH_W) 'weapon/jetpack.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/jetpack.cpp'; fi`
 
 lowgrav.o: weapon/lowgrav.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lowgrav.o -MD -MP -MF "$(DEPDIR)/lowgrav.Tpo" -c -o lowgrav.o `test -f 'weapon/lowgrav.cpp' || echo '$(srcdir)/'`weapon/lowgrav.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/lowgrav.Tpo" "$(DEPDIR)/lowgrav.Po"; else rm -f "$(DEPDIR)/lowgrav.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lowgrav.o -MD -MP -MF $(DEPDIR)/lowgrav.Tpo -c -o lowgrav.o `test -f 'weapon/lowgrav.cpp' || echo '$(srcdir)/'`weapon/lowgrav.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/lowgrav.Tpo $(DEPDIR)/lowgrav.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/lowgrav.cpp' object='lowgrav.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lowgrav.o `test -f 'weapon/lowgrav.cpp' || echo '$(srcdir)/'`weapon/lowgrav.cpp
 
 lowgrav.obj: weapon/lowgrav.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lowgrav.obj -MD -MP -MF "$(DEPDIR)/lowgrav.Tpo" -c -o lowgrav.obj `if test -f 'weapon/lowgrav.cpp'; then $(CYGPATH_W) 'weapon/lowgrav.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/lowgrav.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/lowgrav.Tpo" "$(DEPDIR)/lowgrav.Po"; else rm -f "$(DEPDIR)/lowgrav.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lowgrav.obj -MD -MP -MF $(DEPDIR)/lowgrav.Tpo -c -o lowgrav.obj `if test -f 'weapon/lowgrav.cpp'; then $(CYGPATH_W) 'weapon/lowgrav.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/lowgrav.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/lowgrav.Tpo $(DEPDIR)/lowgrav.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/lowgrav.cpp' object='lowgrav.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lowgrav.obj `if test -f 'weapon/lowgrav.cpp'; then $(CYGPATH_W) 'weapon/lowgrav.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/lowgrav.cpp'; fi`
 
 mine.o: weapon/mine.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mine.o -MD -MP -MF "$(DEPDIR)/mine.Tpo" -c -o mine.o `test -f 'weapon/mine.cpp' || echo '$(srcdir)/'`weapon/mine.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mine.Tpo" "$(DEPDIR)/mine.Po"; else rm -f "$(DEPDIR)/mine.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mine.o -MD -MP -MF $(DEPDIR)/mine.Tpo -c -o mine.o `test -f 'weapon/mine.cpp' || echo '$(srcdir)/'`weapon/mine.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mine.Tpo $(DEPDIR)/mine.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/mine.cpp' object='mine.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mine.o `test -f 'weapon/mine.cpp' || echo '$(srcdir)/'`weapon/mine.cpp
 
 mine.obj: weapon/mine.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mine.obj -MD -MP -MF "$(DEPDIR)/mine.Tpo" -c -o mine.obj `if test -f 'weapon/mine.cpp'; then $(CYGPATH_W) 'weapon/mine.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/mine.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mine.Tpo" "$(DEPDIR)/mine.Po"; else rm -f "$(DEPDIR)/mine.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mine.obj -MD -MP -MF $(DEPDIR)/mine.Tpo -c -o mine.obj `if test -f 'weapon/mine.cpp'; then $(CYGPATH_W) 'weapon/mine.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/mine.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mine.Tpo $(DEPDIR)/mine.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/mine.cpp' object='mine.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mine.obj `if test -f 'weapon/mine.cpp'; then $(CYGPATH_W) 'weapon/mine.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/mine.cpp'; fi`
 
 parachute.o: weapon/parachute.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parachute.o -MD -MP -MF "$(DEPDIR)/parachute.Tpo" -c -o parachute.o `test -f 'weapon/parachute.cpp' || echo '$(srcdir)/'`weapon/parachute.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parachute.Tpo" "$(DEPDIR)/parachute.Po"; else rm -f "$(DEPDIR)/parachute.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parachute.o -MD -MP -MF $(DEPDIR)/parachute.Tpo -c -o parachute.o `test -f 'weapon/parachute.cpp' || echo '$(srcdir)/'`weapon/parachute.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/parachute.Tpo $(DEPDIR)/parachute.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/parachute.cpp' object='parachute.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parachute.o `test -f 'weapon/parachute.cpp' || echo '$(srcdir)/'`weapon/parachute.cpp
 
 parachute.obj: weapon/parachute.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parachute.obj -MD -MP -MF "$(DEPDIR)/parachute.Tpo" -c -o parachute.obj `if test -f 'weapon/parachute.cpp'; then $(CYGPATH_W) 'weapon/parachute.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/parachute.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parachute.Tpo" "$(DEPDIR)/parachute.Po"; else rm -f "$(DEPDIR)/parachute.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parachute.obj -MD -MP -MF $(DEPDIR)/parachute.Tpo -c -o parachute.obj `if test -f 'weapon/parachute.cpp'; then $(CYGPATH_W) 'weapon/parachute.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/parachute.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/parachute.Tpo $(DEPDIR)/parachute.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/parachute.cpp' object='parachute.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parachute.obj `if test -f 'weapon/parachute.cpp'; then $(CYGPATH_W) 'weapon/parachute.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/parachute.cpp'; fi`
 
 polecat.o: weapon/polecat.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polecat.o -MD -MP -MF "$(DEPDIR)/polecat.Tpo" -c -o polecat.o `test -f 'weapon/polecat.cpp' || echo '$(srcdir)/'`weapon/polecat.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polecat.Tpo" "$(DEPDIR)/polecat.Po"; else rm -f "$(DEPDIR)/polecat.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polecat.o -MD -MP -MF $(DEPDIR)/polecat.Tpo -c -o polecat.o `test -f 'weapon/polecat.cpp' || echo '$(srcdir)/'`weapon/polecat.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polecat.Tpo $(DEPDIR)/polecat.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/polecat.cpp' object='polecat.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o polecat.o `test -f 'weapon/polecat.cpp' || echo '$(srcdir)/'`weapon/polecat.cpp
 
 polecat.obj: weapon/polecat.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polecat.obj -MD -MP -MF "$(DEPDIR)/polecat.Tpo" -c -o polecat.obj `if test -f 'weapon/polecat.cpp'; then $(CYGPATH_W) 'weapon/polecat.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/polecat.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polecat.Tpo" "$(DEPDIR)/polecat.Po"; else rm -f "$(DEPDIR)/polecat.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT polecat.obj -MD -MP -MF $(DEPDIR)/polecat.Tpo -c -o polecat.obj `if test -f 'weapon/polecat.cpp'; then $(CYGPATH_W) 'weapon/polecat.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/polecat.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polecat.Tpo $(DEPDIR)/polecat.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/polecat.cpp' object='polecat.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o polecat.obj `if test -f 'weapon/polecat.cpp'; then $(CYGPATH_W) 'weapon/polecat.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/polecat.cpp'; fi`
 
 riot_bomb.o: weapon/riot_bomb.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT riot_bomb.o -MD -MP -MF "$(DEPDIR)/riot_bomb.Tpo" -c -o riot_bomb.o `test -f 'weapon/riot_bomb.cpp' || echo '$(srcdir)/'`weapon/riot_bomb.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/riot_bomb.Tpo" "$(DEPDIR)/riot_bomb.Po"; else rm -f "$(DEPDIR)/riot_bomb.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT riot_bomb.o -MD -MP -MF $(DEPDIR)/riot_bomb.Tpo -c -o riot_bomb.o `test -f 'weapon/riot_bomb.cpp' || echo '$(srcdir)/'`weapon/riot_bomb.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/riot_bomb.Tpo $(DEPDIR)/riot_bomb.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/riot_bomb.cpp' object='riot_bomb.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o riot_bomb.o `test -f 'weapon/riot_bomb.cpp' || echo '$(srcdir)/'`weapon/riot_bomb.cpp
 
 riot_bomb.obj: weapon/riot_bomb.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT riot_bomb.obj -MD -MP -MF "$(DEPDIR)/riot_bomb.Tpo" -c -o riot_bomb.obj `if test -f 'weapon/riot_bomb.cpp'; then $(CYGPATH_W) 'weapon/riot_bomb.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/riot_bomb.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/riot_bomb.Tpo" "$(DEPDIR)/riot_bomb.Po"; else rm -f "$(DEPDIR)/riot_bomb.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT riot_bomb.obj -MD -MP -MF $(DEPDIR)/riot_bomb.Tpo -c -o riot_bomb.obj `if test -f 'weapon/riot_bomb.cpp'; then $(CYGPATH_W) 'weapon/riot_bomb.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/riot_bomb.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/riot_bomb.Tpo $(DEPDIR)/riot_bomb.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/riot_bomb.cpp' object='riot_bomb.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o riot_bomb.obj `if test -f 'weapon/riot_bomb.cpp'; then $(CYGPATH_W) 'weapon/riot_bomb.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/riot_bomb.cpp'; fi`
 
 shotgun.o: weapon/shotgun.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shotgun.o -MD -MP -MF "$(DEPDIR)/shotgun.Tpo" -c -o shotgun.o `test -f 'weapon/shotgun.cpp' || echo '$(srcdir)/'`weapon/shotgun.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shotgun.Tpo" "$(DEPDIR)/shotgun.Po"; else rm -f "$(DEPDIR)/shotgun.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shotgun.o -MD -MP -MF $(DEPDIR)/shotgun.Tpo -c -o shotgun.o `test -f 'weapon/shotgun.cpp' || echo '$(srcdir)/'`weapon/shotgun.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/shotgun.Tpo $(DEPDIR)/shotgun.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/shotgun.cpp' object='shotgun.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o shotgun.o `test -f 'weapon/shotgun.cpp' || echo '$(srcdir)/'`weapon/shotgun.cpp
 
 shotgun.obj: weapon/shotgun.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shotgun.obj -MD -MP -MF "$(DEPDIR)/shotgun.Tpo" -c -o shotgun.obj `if test -f 'weapon/shotgun.cpp'; then $(CYGPATH_W) 'weapon/shotgun.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/shotgun.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shotgun.Tpo" "$(DEPDIR)/shotgun.Po"; else rm -f "$(DEPDIR)/shotgun.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT shotgun.obj -MD -MP -MF $(DEPDIR)/shotgun.Tpo -c -o shotgun.obj `if test -f 'weapon/shotgun.cpp'; then $(CYGPATH_W) 'weapon/shotgun.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/shotgun.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/shotgun.Tpo $(DEPDIR)/shotgun.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/shotgun.cpp' object='shotgun.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o shotgun.obj `if test -f 'weapon/shotgun.cpp'; then $(CYGPATH_W) 'weapon/shotgun.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/shotgun.cpp'; fi`
 
 skip_turn.o: weapon/skip_turn.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT skip_turn.o -MD -MP -MF "$(DEPDIR)/skip_turn.Tpo" -c -o skip_turn.o `test -f 'weapon/skip_turn.cpp' || echo '$(srcdir)/'`weapon/skip_turn.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/skip_turn.Tpo" "$(DEPDIR)/skip_turn.Po"; else rm -f "$(DEPDIR)/skip_turn.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT skip_turn.o -MD -MP -MF $(DEPDIR)/skip_turn.Tpo -c -o skip_turn.o `test -f 'weapon/skip_turn.cpp' || echo '$(srcdir)/'`weapon/skip_turn.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/skip_turn.Tpo $(DEPDIR)/skip_turn.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/skip_turn.cpp' object='skip_turn.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skip_turn.o `test -f 'weapon/skip_turn.cpp' || echo '$(srcdir)/'`weapon/skip_turn.cpp
 
 skip_turn.obj: weapon/skip_turn.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT skip_turn.obj -MD -MP -MF "$(DEPDIR)/skip_turn.Tpo" -c -o skip_turn.obj `if test -f 'weapon/skip_turn.cpp'; then $(CYGPATH_W) 'weapon/skip_turn.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/skip_turn.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/skip_turn.Tpo" "$(DEPDIR)/skip_turn.Po"; else rm -f "$(DEPDIR)/skip_turn.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT skip_turn.obj -MD -MP -MF $(DEPDIR)/skip_turn.Tpo -c -o skip_turn.obj `if test -f 'weapon/skip_turn.cpp'; then $(CYGPATH_W) 'weapon/skip_turn.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/skip_turn.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/skip_turn.Tpo $(DEPDIR)/skip_turn.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/skip_turn.cpp' object='skip_turn.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skip_turn.obj `if test -f 'weapon/skip_turn.cpp'; then $(CYGPATH_W) 'weapon/skip_turn.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/skip_turn.cpp'; fi`
 
+slap.o: weapon/slap.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT slap.o -MD -MP -MF $(DEPDIR)/slap.Tpo -c -o slap.o `test -f 'weapon/slap.cpp' || echo '$(srcdir)/'`weapon/slap.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/slap.Tpo $(DEPDIR)/slap.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/slap.cpp' object='slap.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o slap.o `test -f 'weapon/slap.cpp' || echo '$(srcdir)/'`weapon/slap.cpp
+
+slap.obj: weapon/slap.cpp
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT slap.obj -MD -MP -MF $(DEPDIR)/slap.Tpo -c -o slap.obj `if test -f 'weapon/slap.cpp'; then $(CYGPATH_W) 'weapon/slap.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/slap.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/slap.Tpo $(DEPDIR)/slap.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/slap.cpp' object='slap.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o slap.obj `if test -f 'weapon/slap.cpp'; then $(CYGPATH_W) 'weapon/slap.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/slap.cpp'; fi`
+
 snipe_rifle.o: weapon/snipe_rifle.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT snipe_rifle.o -MD -MP -MF "$(DEPDIR)/snipe_rifle.Tpo" -c -o snipe_rifle.o `test -f 'weapon/snipe_rifle.cpp' || echo '$(srcdir)/'`weapon/snipe_rifle.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/snipe_rifle.Tpo" "$(DEPDIR)/snipe_rifle.Po"; else rm -f "$(DEPDIR)/snipe_rifle.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT snipe_rifle.o -MD -MP -MF $(DEPDIR)/snipe_rifle.Tpo -c -o snipe_rifle.o `test -f 'weapon/snipe_rifle.cpp' || echo '$(srcdir)/'`weapon/snipe_rifle.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/snipe_rifle.Tpo $(DEPDIR)/snipe_rifle.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/snipe_rifle.cpp' object='snipe_rifle.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o snipe_rifle.o `test -f 'weapon/snipe_rifle.cpp' || echo '$(srcdir)/'`weapon/snipe_rifle.cpp
 
 snipe_rifle.obj: weapon/snipe_rifle.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT snipe_rifle.obj -MD -MP -MF "$(DEPDIR)/snipe_rifle.Tpo" -c -o snipe_rifle.obj `if test -f 'weapon/snipe_rifle.cpp'; then $(CYGPATH_W) 'weapon/snipe_rifle.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/snipe_rifle.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/snipe_rifle.Tpo" "$(DEPDIR)/snipe_rifle.Po"; else rm -f "$(DEPDIR)/snipe_rifle.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT snipe_rifle.obj -MD -MP -MF $(DEPDIR)/snipe_rifle.Tpo -c -o snipe_rifle.obj `if test -f 'weapon/snipe_rifle.cpp'; then $(CYGPATH_W) 'weapon/snipe_rifle.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/snipe_rifle.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/snipe_rifle.Tpo $(DEPDIR)/snipe_rifle.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/snipe_rifle.cpp' object='snipe_rifle.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o snipe_rifle.obj `if test -f 'weapon/snipe_rifle.cpp'; then $(CYGPATH_W) 'weapon/snipe_rifle.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/snipe_rifle.cpp'; fi`
 
 submachine_gun.o: weapon/submachine_gun.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT submachine_gun.o -MD -MP -MF "$(DEPDIR)/submachine_gun.Tpo" -c -o submachine_gun.o `test -f 'weapon/submachine_gun.cpp' || echo '$(srcdir)/'`weapon/submachine_gun.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/submachine_gun.Tpo" "$(DEPDIR)/submachine_gun.Po"; else rm -f "$(DEPDIR)/submachine_gun.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT submachine_gun.o -MD -MP -MF $(DEPDIR)/submachine_gun.Tpo -c -o submachine_gun.o `test -f 'weapon/submachine_gun.cpp' || echo '$(srcdir)/'`weapon/submachine_gun.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/submachine_gun.Tpo $(DEPDIR)/submachine_gun.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/submachine_gun.cpp' object='submachine_gun.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o submachine_gun.o `test -f 'weapon/submachine_gun.cpp' || echo '$(srcdir)/'`weapon/submachine_gun.cpp
 
 submachine_gun.obj: weapon/submachine_gun.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT submachine_gun.obj -MD -MP -MF "$(DEPDIR)/submachine_gun.Tpo" -c -o submachine_gun.obj `if test -f 'weapon/submachine_gun.cpp'; then $(CYGPATH_W) 'weapon/submachine_gun.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/submachine_gun.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/submachine_gun.Tpo" "$(DEPDIR)/submachine_gun.Po"; else rm -f "$(DEPDIR)/submachine_gun.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT submachine_gun.obj -MD -MP -MF $(DEPDIR)/submachine_gun.Tpo -c -o submachine_gun.obj `if test -f 'weapon/submachine_gun.cpp'; then $(CYGPATH_W) 'weapon/submachine_gun.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/submachine_gun.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/submachine_gun.Tpo $(DEPDIR)/submachine_gun.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/submachine_gun.cpp' object='submachine_gun.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o submachine_gun.obj `if test -f 'weapon/submachine_gun.cpp'; then $(CYGPATH_W) 'weapon/submachine_gun.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/submachine_gun.cpp'; fi`
 
 suicide.o: weapon/suicide.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT suicide.o -MD -MP -MF "$(DEPDIR)/suicide.Tpo" -c -o suicide.o `test -f 'weapon/suicide.cpp' || echo '$(srcdir)/'`weapon/suicide.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/suicide.Tpo" "$(DEPDIR)/suicide.Po"; else rm -f "$(DEPDIR)/suicide.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT suicide.o -MD -MP -MF $(DEPDIR)/suicide.Tpo -c -o suicide.o `test -f 'weapon/suicide.cpp' || echo '$(srcdir)/'`weapon/suicide.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/suicide.Tpo $(DEPDIR)/suicide.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/suicide.cpp' object='suicide.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o suicide.o `test -f 'weapon/suicide.cpp' || echo '$(srcdir)/'`weapon/suicide.cpp
 
 suicide.obj: weapon/suicide.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT suicide.obj -MD -MP -MF "$(DEPDIR)/suicide.Tpo" -c -o suicide.obj `if test -f 'weapon/suicide.cpp'; then $(CYGPATH_W) 'weapon/suicide.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/suicide.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/suicide.Tpo" "$(DEPDIR)/suicide.Po"; else rm -f "$(DEPDIR)/suicide.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT suicide.obj -MD -MP -MF $(DEPDIR)/suicide.Tpo -c -o suicide.obj `if test -f 'weapon/suicide.cpp'; then $(CYGPATH_W) 'weapon/suicide.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/suicide.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/suicide.Tpo $(DEPDIR)/suicide.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/suicide.cpp' object='suicide.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o suicide.obj `if test -f 'weapon/suicide.cpp'; then $(CYGPATH_W) 'weapon/suicide.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/suicide.cpp'; fi`
 
 supertux.o: weapon/supertux.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT supertux.o -MD -MP -MF "$(DEPDIR)/supertux.Tpo" -c -o supertux.o `test -f 'weapon/supertux.cpp' || echo '$(srcdir)/'`weapon/supertux.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/supertux.Tpo" "$(DEPDIR)/supertux.Po"; else rm -f "$(DEPDIR)/supertux.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT supertux.o -MD -MP -MF $(DEPDIR)/supertux.Tpo -c -o supertux.o `test -f 'weapon/supertux.cpp' || echo '$(srcdir)/'`weapon/supertux.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/supertux.Tpo $(DEPDIR)/supertux.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/supertux.cpp' object='supertux.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o supertux.o `test -f 'weapon/supertux.cpp' || echo '$(srcdir)/'`weapon/supertux.cpp
 
 supertux.obj: weapon/supertux.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT supertux.obj -MD -MP -MF "$(DEPDIR)/supertux.Tpo" -c -o supertux.obj `if test -f 'weapon/supertux.cpp'; then $(CYGPATH_W) 'weapon/supertux.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/supertux.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/supertux.Tpo" "$(DEPDIR)/supertux.Po"; else rm -f "$(DEPDIR)/supertux.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT supertux.obj -MD -MP -MF $(DEPDIR)/supertux.Tpo -c -o supertux.obj `if test -f 'weapon/supertux.cpp'; then $(CYGPATH_W) 'weapon/supertux.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/supertux.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/supertux.Tpo $(DEPDIR)/supertux.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/supertux.cpp' object='supertux.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o supertux.obj `if test -f 'weapon/supertux.cpp'; then $(CYGPATH_W) 'weapon/supertux.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/supertux.cpp'; fi`
 
 syringe.o: weapon/syringe.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT syringe.o -MD -MP -MF "$(DEPDIR)/syringe.Tpo" -c -o syringe.o `test -f 'weapon/syringe.cpp' || echo '$(srcdir)/'`weapon/syringe.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/syringe.Tpo" "$(DEPDIR)/syringe.Po"; else rm -f "$(DEPDIR)/syringe.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT syringe.o -MD -MP -MF $(DEPDIR)/syringe.Tpo -c -o syringe.o `test -f 'weapon/syringe.cpp' || echo '$(srcdir)/'`weapon/syringe.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/syringe.Tpo $(DEPDIR)/syringe.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/syringe.cpp' object='syringe.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o syringe.o `test -f 'weapon/syringe.cpp' || echo '$(srcdir)/'`weapon/syringe.cpp
 
 syringe.obj: weapon/syringe.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT syringe.obj -MD -MP -MF "$(DEPDIR)/syringe.Tpo" -c -o syringe.obj `if test -f 'weapon/syringe.cpp'; then $(CYGPATH_W) 'weapon/syringe.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/syringe.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/syringe.Tpo" "$(DEPDIR)/syringe.Po"; else rm -f "$(DEPDIR)/syringe.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT syringe.obj -MD -MP -MF $(DEPDIR)/syringe.Tpo -c -o syringe.obj `if test -f 'weapon/syringe.cpp'; then $(CYGPATH_W) 'weapon/syringe.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/syringe.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/syringe.Tpo $(DEPDIR)/syringe.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/syringe.cpp' object='syringe.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o syringe.obj `if test -f 'weapon/syringe.cpp'; then $(CYGPATH_W) 'weapon/syringe.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/syringe.cpp'; fi`
 
 teleportation.o: weapon/teleportation.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teleportation.o -MD -MP -MF "$(DEPDIR)/teleportation.Tpo" -c -o teleportation.o `test -f 'weapon/teleportation.cpp' || echo '$(srcdir)/'`weapon/teleportation.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/teleportation.Tpo" "$(DEPDIR)/teleportation.Po"; else rm -f "$(DEPDIR)/teleportation.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teleportation.o -MD -MP -MF $(DEPDIR)/teleportation.Tpo -c -o teleportation.o `test -f 'weapon/teleportation.cpp' || echo '$(srcdir)/'`weapon/teleportation.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/teleportation.Tpo $(DEPDIR)/teleportation.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/teleportation.cpp' object='teleportation.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teleportation.o `test -f 'weapon/teleportation.cpp' || echo '$(srcdir)/'`weapon/teleportation.cpp
 
 teleportation.obj: weapon/teleportation.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teleportation.obj -MD -MP -MF "$(DEPDIR)/teleportation.Tpo" -c -o teleportation.obj `if test -f 'weapon/teleportation.cpp'; then $(CYGPATH_W) 'weapon/teleportation.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/teleportation.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/teleportation.Tpo" "$(DEPDIR)/teleportation.Po"; else rm -f "$(DEPDIR)/teleportation.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teleportation.obj -MD -MP -MF $(DEPDIR)/teleportation.Tpo -c -o teleportation.obj `if test -f 'weapon/teleportation.cpp'; then $(CYGPATH_W) 'weapon/teleportation.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/teleportation.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/teleportation.Tpo $(DEPDIR)/teleportation.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/teleportation.cpp' object='teleportation.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teleportation.obj `if test -f 'weapon/teleportation.cpp'; then $(CYGPATH_W) 'weapon/teleportation.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/teleportation.cpp'; fi`
 
 weapon_cfg.o: weapon/weapon_cfg.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_cfg.o -MD -MP -MF "$(DEPDIR)/weapon_cfg.Tpo" -c -o weapon_cfg.o `test -f 'weapon/weapon_cfg.cpp' || echo '$(srcdir)/'`weapon/weapon_cfg.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapon_cfg.Tpo" "$(DEPDIR)/weapon_cfg.Po"; else rm -f "$(DEPDIR)/weapon_cfg.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_cfg.o -MD -MP -MF $(DEPDIR)/weapon_cfg.Tpo -c -o weapon_cfg.o `test -f 'weapon/weapon_cfg.cpp' || echo '$(srcdir)/'`weapon/weapon_cfg.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapon_cfg.Tpo $(DEPDIR)/weapon_cfg.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/weapon_cfg.cpp' object='weapon_cfg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon_cfg.o `test -f 'weapon/weapon_cfg.cpp' || echo '$(srcdir)/'`weapon/weapon_cfg.cpp
 
 weapon_cfg.obj: weapon/weapon_cfg.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_cfg.obj -MD -MP -MF "$(DEPDIR)/weapon_cfg.Tpo" -c -o weapon_cfg.obj `if test -f 'weapon/weapon_cfg.cpp'; then $(CYGPATH_W) 'weapon/weapon_cfg.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapon_cfg.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapon_cfg.Tpo" "$(DEPDIR)/weapon_cfg.Po"; else rm -f "$(DEPDIR)/weapon_cfg.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_cfg.obj -MD -MP -MF $(DEPDIR)/weapon_cfg.Tpo -c -o weapon_cfg.obj `if test -f 'weapon/weapon_cfg.cpp'; then $(CYGPATH_W) 'weapon/weapon_cfg.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapon_cfg.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapon_cfg.Tpo $(DEPDIR)/weapon_cfg.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/weapon_cfg.cpp' object='weapon_cfg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon_cfg.obj `if test -f 'weapon/weapon_cfg.cpp'; then $(CYGPATH_W) 'weapon/weapon_cfg.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapon_cfg.cpp'; fi`
 
 weapon.o: weapon/weapon.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.o -MD -MP -MF "$(DEPDIR)/weapon.Tpo" -c -o weapon.o `test -f 'weapon/weapon.cpp' || echo '$(srcdir)/'`weapon/weapon.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapon.Tpo" "$(DEPDIR)/weapon.Po"; else rm -f "$(DEPDIR)/weapon.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.o -MD -MP -MF $(DEPDIR)/weapon.Tpo -c -o weapon.o `test -f 'weapon/weapon.cpp' || echo '$(srcdir)/'`weapon/weapon.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapon.Tpo $(DEPDIR)/weapon.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/weapon.cpp' object='weapon.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon.o `test -f 'weapon/weapon.cpp' || echo '$(srcdir)/'`weapon/weapon.cpp
 
 weapon.obj: weapon/weapon.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.obj -MD -MP -MF "$(DEPDIR)/weapon.Tpo" -c -o weapon.obj `if test -f 'weapon/weapon.cpp'; then $(CYGPATH_W) 'weapon/weapon.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapon.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapon.Tpo" "$(DEPDIR)/weapon.Po"; else rm -f "$(DEPDIR)/weapon.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.obj -MD -MP -MF $(DEPDIR)/weapon.Tpo -c -o weapon.obj `if test -f 'weapon/weapon.cpp'; then $(CYGPATH_W) 'weapon/weapon.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapon.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapon.Tpo $(DEPDIR)/weapon.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/weapon.cpp' object='weapon.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon.obj `if test -f 'weapon/weapon.cpp'; then $(CYGPATH_W) 'weapon/weapon.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapon.cpp'; fi`
 
 weapon_launcher.o: weapon/weapon_launcher.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_launcher.o -MD -MP -MF "$(DEPDIR)/weapon_launcher.Tpo" -c -o weapon_launcher.o `test -f 'weapon/weapon_launcher.cpp' || echo '$(srcdir)/'`weapon/weapon_launcher.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapon_launcher.Tpo" "$(DEPDIR)/weapon_launcher.Po"; else rm -f "$(DEPDIR)/weapon_launcher.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_launcher.o -MD -MP -MF $(DEPDIR)/weapon_launcher.Tpo -c -o weapon_launcher.o `test -f 'weapon/weapon_launcher.cpp' || echo '$(srcdir)/'`weapon/weapon_launcher.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapon_launcher.Tpo $(DEPDIR)/weapon_launcher.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/weapon_launcher.cpp' object='weapon_launcher.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon_launcher.o `test -f 'weapon/weapon_launcher.cpp' || echo '$(srcdir)/'`weapon/weapon_launcher.cpp
 
 weapon_launcher.obj: weapon/weapon_launcher.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_launcher.obj -MD -MP -MF "$(DEPDIR)/weapon_launcher.Tpo" -c -o weapon_launcher.obj `if test -f 'weapon/weapon_launcher.cpp'; then $(CYGPATH_W) 'weapon/weapon_launcher.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapon_launcher.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapon_launcher.Tpo" "$(DEPDIR)/weapon_launcher.Po"; else rm -f "$(DEPDIR)/weapon_launcher.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_launcher.obj -MD -MP -MF $(DEPDIR)/weapon_launcher.Tpo -c -o weapon_launcher.obj `if test -f 'weapon/weapon_launcher.cpp'; then $(CYGPATH_W) 'weapon/weapon_launcher.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapon_launcher.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapon_launcher.Tpo $(DEPDIR)/weapon_launcher.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/weapon_launcher.cpp' object='weapon_launcher.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon_launcher.obj `if test -f 'weapon/weapon_launcher.cpp'; then $(CYGPATH_W) 'weapon/weapon_launcher.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapon_launcher.cpp'; fi`
 
 weapons_list.o: weapon/weapons_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapons_list.o -MD -MP -MF "$(DEPDIR)/weapons_list.Tpo" -c -o weapons_list.o `test -f 'weapon/weapons_list.cpp' || echo '$(srcdir)/'`weapon/weapons_list.cpp; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapons_list.Tpo" "$(DEPDIR)/weapons_list.Po"; else rm -f "$(DEPDIR)/weapons_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapons_list.o -MD -MP -MF $(DEPDIR)/weapons_list.Tpo -c -o weapons_list.o `test -f 'weapon/weapons_list.cpp' || echo '$(srcdir)/'`weapon/weapons_list.cpp
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapons_list.Tpo $(DEPDIR)/weapons_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/weapons_list.cpp' object='weapons_list.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapons_list.o `test -f 'weapon/weapons_list.cpp' || echo '$(srcdir)/'`weapon/weapons_list.cpp
 
 weapons_list.obj: weapon/weapons_list.cpp
- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapons_list.obj -MD -MP -MF "$(DEPDIR)/weapons_list.Tpo" -c -o weapons_list.obj `if test -f 'weapon/weapons_list.cpp'; then $(CYGPATH_W) 'weapon/weapons_list.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapons_list.cpp'; fi`; \
- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/weapons_list.Tpo" "$(DEPDIR)/weapons_list.Po"; else rm -f "$(DEPDIR)/weapons_list.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapons_list.obj -MD -MP -MF $(DEPDIR)/weapons_list.Tpo -c -o weapons_list.obj `if test -f 'weapon/weapons_list.cpp'; then $(CYGPATH_W) 'weapon/weapons_list.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapons_list.cpp'; fi`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/weapons_list.Tpo $(DEPDIR)/weapons_list.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weapon/weapons_list.cpp' object='weapons_list.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapons_list.obj `if test -f 'weapon/weapons_list.cpp'; then $(CYGPATH_W) 'weapon/weapons_list.cpp'; else $(CYGPATH_W) '$(srcdir)/weapon/weapons_list.cpp'; fi`
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -3615,8 +3712,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -3660,8 +3756,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -3686,8 +3782,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -3697,13 +3793,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -3717,22 +3812,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -3746,7 +3840,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -3754,6 +3848,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -3764,7 +3860,7 @@ all-am: Makefile $(PROGRAMS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -3812,12 +3908,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -3837,23 +3941,25 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-recursive distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-hdr \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-binPROGRAMS
 
 @WIN32_TRUE at .rc.o:
 @WIN32_TRUE@	@WINDRES@ -o $@ -i $<
diff --git a/src/ai/ai_engine.cpp b/src/ai/ai_engine.cpp
index f885cae..c1b8a7b 100644
--- a/src/ai/ai_engine.cpp
+++ b/src/ai/ai_engine.cpp
@@ -35,7 +35,7 @@ AIengine::AIengine()
 
 void AIengine::Refresh() const
 {
-  // AI does not have right to play
+  // AI is not allowed to play
   if (Game::GetInstance()->ReadState() == Game::END_TURN)
     return;
 
diff --git a/src/ai/ai_engine_stupid.cpp b/src/ai/ai_engine_stupid.cpp
index 99dd670..a01c4ee 100644
--- a/src/ai/ai_engine_stupid.cpp
+++ b/src/ai/ai_engine_stupid.cpp
@@ -77,14 +77,14 @@ void AIStupidEngine::Refresh()
     m_movement.Move(m_current_time);
 
     if (!m_movement.IsProgressing())
-      m_shoot.SetStrategy(AIShootModule::SKIP_TURN);
+	Game::GetInstance()->SetState(Game::END_TURN);
   }
 
 //   switch (m_step)
 //     {
 //     case 0:
 //       if (m_nearest_enemy) {
-//         // we already knows who to shoot
+//         // we already know whom to shoot
 //         m_step = 1;
 //       } else {
 //         m_movement.Move(m_current_time);
diff --git a/src/ai/ai_movement_module.cpp b/src/ai/ai_movement_module.cpp
index b39a6d9..ab3c916 100644
--- a/src/ai/ai_movement_module.cpp
+++ b/src/ai/ai_movement_module.cpp
@@ -97,9 +97,9 @@ bool AIMovementModule::RiskGoingOutOfMap() const
 }
 
 // =================================================
-// A jump is made of many movement :
-// 1) Decect collision and prepare to go back
-// 2) Go back, then when far enought of the obstacle
+// A jump is made of many movements :
+// 1) Detect collision and prepare to go back
+// 2) Go back, then when far enough of the obstacle
 // 3) Jump!
 // 4) Detect when on the ground!
 // =================================================
@@ -125,7 +125,7 @@ void AIMovementModule::GoBackToJump()
   int height;
   bool blocked = !(ObstacleHeight(height));
 
-  if ( abs(last_position.GetX() - ActiveCharacter().GetPosition().GetX()) >= 20
+  if ( fabs(last_position.GetX() - ActiveCharacter().GetPosition().GetX()) >= 20.0
        || time_at_last_position +1 < m_current_time
        || blocked) {
     //it's time to jump!
@@ -153,16 +153,16 @@ void AIMovementModule::EndOfJump()
     // we have not moved since last movement
 
     if (ActiveCharacter().GetDirection() == DIRECTION_RIGHT) {
-      max_reachable_x = ActiveCharacter().GetPosition().GetX();
+      max_reachable_x = (int)ActiveCharacter().GetPosition().GetX();
     } else {
-      min_reachable_x = ActiveCharacter().GetPosition().GetX();
+      min_reachable_x = (int)ActiveCharacter().GetPosition().GetX();
     }
     MSG_DEBUG("ai.move", "We are blocked");
     StopMoving();
 
   } else {
-    // No more blocked !!
-    MSG_DEBUG("ai.move", "We are NO MORE blocked");
+    // No longer blocked !!
+    MSG_DEBUG("ai.move", "We are NO LONGER blocked");
     SetMovement(WALKING);
   }
 }
@@ -246,19 +246,26 @@ void AIMovementModule::StopWalking()
 // =================================================
 void AIMovementModule::InverseDirection(bool completely_blocked)
 {
+  if ((max_reachable_x == ActiveCharacter().GetPosition().GetX())
+      || (min_reachable_x == ActiveCharacter().GetPosition().GetX()))
+    {
+      MSG_DEBUG("ai.move", "In %s : We turn around...\n", __func__);
+      StopMoving();
+      return;
+    }
   MSG_DEBUG("ai.move", "Inverse direction");
 
   if (ActiveCharacter().GetDirection() == DIRECTION_RIGHT) {
 
     ActiveCharacter().SetDirection(DIRECTION_LEFT);
     if (completely_blocked)
-      max_reachable_x = ActiveCharacter().GetPosition().GetX();
+      max_reachable_x = (int)ActiveCharacter().GetPosition().GetX();
 
   } else {
 
     ActiveCharacter().SetDirection(DIRECTION_RIGHT);
     if (completely_blocked)
-      min_reachable_x = ActiveCharacter().GetPosition().GetX();
+      min_reachable_x = (int)ActiveCharacter().GetPosition().GetX();
 
   }
 }
@@ -278,12 +285,12 @@ void AIMovementModule::Move(uint current_time)
   switch (GetCurrentMovement()) {
 
   case NO_MOVEMENT:
-    // Begin to walk
+    // Begin walking
     Walk();
     break;
 
   case WALKING:
-    // Continue to walk
+    // Continue walking
     Walk();
     break;
 
@@ -308,7 +315,7 @@ void AIMovementModule::Move(uint current_time)
 void AIMovementModule::StopMoving()
 {
   //  GameMessages::GetInstance()->Add("stop moving");
-  
+
   StopWalking();
   SetMovement(BLOCKED);
   //m_step++;
@@ -392,13 +399,13 @@ void AIMovementModule::SetDestinationPoint(const Point2i& _destination_point)
 bool AIMovementModule::SeemsToBeReachable(const Character& shooter,
                                           const Character& enemy) const
 {
-  int delta_x = abs(shooter.GetX() - enemy.GetX());
-  int delta_y = abs(shooter.GetY() - enemy.GetY());
+  double delta_x = abs(shooter.GetX() - enemy.GetX());
+  double delta_y = abs(shooter.GetY() - enemy.GetY());
 
-  if (delta_x > 300)
+  if (delta_x > 300.0)
     return false;
 
-  if (delta_y > 100)
+  if (delta_y > 100.0)
     return false;
 
   if (min_reachable_x>enemy.GetX() || enemy.GetX()>max_reachable_x)
diff --git a/src/ai/ai_shoot_module.cpp b/src/ai/ai_shoot_module.cpp
index b349f45..1259bff 100644
--- a/src/ai/ai_shoot_module.cpp
+++ b/src/ai/ai_shoot_module.cpp
@@ -30,7 +30,8 @@
 #include "team/macro.h"
 #include "team/teams_list.h"
 #include "tool/math_tools.h"
-
+#include "include/app.h"
+#include "graphic/video.h"
 #include <iostream>
 
 
@@ -55,51 +56,102 @@ const Character* AIShootModule::FindShootableEnemy(const Character& shooter,
 // =================================================
 // Static method
 // =================================================
+// Returns true if not dangerous as the shooter pulls enemy
+// else returns false.
+// For example if the shooter with a given angle is in front of wall
+// he doesn't need to shoot the enemy (otherwises he shoots itself).
+// =================================================
+//
+//
+bool AIShootModule::IsBazookable(const Character& shooter,
+                                 double& angle)
+{
+  Point2i tmp = ActiveTeam().GetWeapon().GetGunHolePosition();
+  // Set the rotation of "angle" radians
+  Point2i pos = Point2i::FromPolarCoordinates(sqrt(double(tmp.x * tmp.x + tmp.y * tmp.y)), double(tmp.ComputeAngle() + angle));
+
+  Point2i delta = Point2i(1, 0);
+  Point2i shoot_pos = shooter.GetCenter();
+
+  // Affine equation : y = ax + b.
+  double a = tan(angle);
+  double b = pos.y - (a * pos.x);
+  int distance = 0;
+
+  while (distance < 30)
+    {
+      if ( world.IsOutsideWorldX(pos.x) || world.IsOutsideWorldY(pos.y) ) {
+        break;
+      }
+      if (!world.IsInVacuum(pos.x, pos.y))
+        return false;
+      pos += delta;
+      pos.y = int(a * pos.x + b);
+      distance = shoot_pos.Distance(pos);
+    }
+  return true;
+}
+
+// =================================================
+// Static method
+// =================================================
 // Return true if there is a straight line with no
 // collision between the shooter and a
 // potential enemy
 // Update the shoot_angle if it is ok
 // =================================================
-// This method is not perfect
-// It tests from the Center of the shooter
-// and not from the gun hole
-// =================================================
 bool AIShootModule::IsDirectlyShootable(const Character& shooter,
                                         const Character& enemy,
                                         double& shoot_angle)
 {
-  Point2i pos = shooter.GetCenter();
-  Point2i arrival = enemy.GetCenter();
-  Point2i departure = pos;
-  Point2i delta_pos;
+  // We need to use center point, because gunholePosition is location
+  // of last weapon of the ActiveTeam() and not the future gunholePos
+  // which will be select.
+
+  // TODO: Please find an alternative to solve this tempory solution
+  Point2d pos = ActiveCharacter().GetCenter();
+  Point2d arrival = enemy.GetCenter();
 
   double original_angle = pos.ComputeAngle(arrival);
 
+  int delta_x = (pos.x > arrival.x) ? -1 : 1;
+  double a = tan(original_angle);
+  double b = pos.y - (a * pos.x);
+
+
   // compute to see if there any part of ground between the 2 characters
   // While test is not finished
   while (pos != arrival) {
+    // XXX is rounding fine?
+    Point2i posi(int(pos.x+0.5), int(pos.y+0.5));
+
+    // the point is outside the map
+    if ( world.IsOutsideWorld(posi) )
+      {
+        return false;
+      }
 
     // is there a collision on the ground ??
-    if (!world.IsInVacuum(pos.x, pos.y)) {
+    if (!world.IsInVacuum(posi)) {
       return false;
     }
 
-    // the point is outside the map
-    if ( world.IsOutsideWorldX(pos.x) || world.IsOutsideWorldY(pos.y) ) {
-      break;
-    }
-
     // is there a collision with another character ?
     FOR_ALL_CHARACTERS(team, other_character) {
       if ( &(*other_character) != &shooter
            && &(*other_character) != &enemy ) {
 
-        if ( other_character->GetTestRect().Contains(pos) )
+        // Skip only if this character has the same team of shooter
+        // otherwises he's a enemy. (more reachable than the current)
+        if (other_character->GetTestRect().Contains(pos)
+            && (&other_character->GetTeam()) == (&shooter.GetTeam()))
           return false;
-
       }
     }
-
+      pos.x += delta_x;
+      pos.y = a * pos.x + b;
+  }
+    /*
     // next step
     int diff_x = pos.x - arrival.x;
     int diff_y = pos.y - arrival.y;
@@ -122,12 +174,15 @@ bool AIShootModule::IsDirectlyShootable(const Character& shooter,
     pos += delta_pos;
   }
 
+
   // set the angle
   if (departure.x > arrival.x) {
     shoot_angle = InverseAngleRad(original_angle);
   } else {
     shoot_angle = original_angle;
   }
+    */
+  shoot_angle = original_angle;
 
   return true;
 }
@@ -135,7 +190,7 @@ bool AIShootModule::IsDirectlyShootable(const Character& shooter,
 bool AIShootModule::SelectFiringWeapon(double /*shoot_angle*/) const
 {
   // we choose between gun, sniper_rifle, shotgun and submachine gun
-  uint selected = uint(randomSync.GetDouble(0.0, 3.5));
+  uint selected = uint(RandomSync().GetDouble(0.0, 3.5));
   switch (selected) {
   case 0:
     ActiveTeam().SetWeapon(Weapon::WEAPON_SHOTGUN);
@@ -155,7 +210,7 @@ bool AIShootModule::SelectFiringWeapon(double /*shoot_angle*/) const
   double angle = InRange_Double(m_angle, - (ActiveTeam().GetWeapon().GetMaxAngle()),
                              - (ActiveTeam().GetWeapon().GetMinAngle()) );
 
-  if (AbsoluteValue(angle-m_angle) > 0.08726/* 5 degree */) {
+  if (AbsoluteValue(angle-m_angle) > 0.03490/* 2 degrees */) {
     // angle is too wide for the weapon
     return false;
   }
@@ -231,17 +286,28 @@ void AIShootModule::ShootWithBazooka()
     std::cout << "Xs = " << Xs << std::endl;
     std::cout << "Ys = " << Ys << std::endl;
     double angle = atan(wind.GetStrength() * 75.0 /*wind factor */ /(30.0/* g */ *20 /* mass*/) );
-    double Xpe = (Xe - Xs) * cos(angle) - (Ye - Ys) * sin(angle) + Xs;
-    double Ype = (Xe - Xs) * sin(angle) + (Ye - Ys) * cos(angle) + Ys;
-    Xe = Xpe;
-    Ye = Ype;
-    double V0x = (Xe - Xs ) / 80;
-    double V0y = V0x * (Ye - (Ys))/ (Xe - Xs -V0x) - 1/2.0 * sqrt(30*30 /* g² */+ wind.GetStrength() * 75.0 *wind.GetStrength() * 75.0  /20.0 /20.0 /* W²/m²*/ )  / V0x * (Xe - Xs - V0x)/40 /* pixel per metre */;
-
 
-    std::cout << "shooting " << V0x <<" "  <<"   " << V0y << " "<< " " <<  atan(V0y/V0x) << " " <<m_enemy->GetName() << std::endl;
-    ActiveTeam().AccessWeapon().PrepareShoot(sqrt(V0y*V0y + V0x*V0x), /*Xe*/m_enemy->GetCenterX() - Xs > 0 ? atan(V0y/V0x) - angle: -atan(V0y/V0x) + angle);
-    m_last_shoot_time = m_current_time;
+    if (!IsBazookable(ActiveCharacter(), angle))
+      {
+        MSG_DEBUG("ai.shoot", "%s is not bazookable !\n", m_enemy->GetName().c_str());
+        //MSG_DEBUG("ai.shoot", "%s is not bazookable !", m_enemy.GetName());
+        ActiveTeam().SetWeapon(Weapon::WEAPON_SKIP_TURN);
+        Shoot();
+      }
+    else
+      {
+        double Xpe = (Xe - Xs) * cos(angle) - (Ye - Ys) * sin(angle) + Xs;
+        double Ype = (Xe - Xs) * sin(angle) + (Ye - Ys) * cos(angle) + Ys;
+        Xe = Xpe;
+        Ye = Ype;
+        double V0x = (Xe - Xs ) / 80;
+        double V0y = V0x * (Ye - (Ys))/ (Xe - Xs -V0x) - 1/2.0 * sqrt(30*30 /* g */+ wind.GetStrength() * 75.0 *wind.GetStrength() * 75.0  /20.0 /20.0 /* W/m*/ )  / V0x * (Xe - Xs - V0x)/40 /* pixel per metre */;
+
+
+        std::cout << "shooting " << V0x <<" "  <<"   " << V0y << " "<< " " <<  atan(V0y/V0x) << " " <<m_enemy->GetName() << std::endl;
+        ActiveTeam().AccessWeapon().PrepareShoot(sqrt(V0y*V0y + V0x*V0x), /*Xe*/m_enemy->GetCenterX() - Xs > 0 ? atan(V0y/V0x) - angle: -atan(V0y/V0x) + angle);
+        m_last_shoot_time = m_current_time;
+      }
   }
 }
 
@@ -328,12 +394,17 @@ const Character* AIShootModule::FindEnemy()
 void AIShootModule::ChooseDirection() const
 {
   if ( m_enemy ) {
-    // TODO : Replace by a more clever function
+    // TODO : Replace by a cleverer function
     if ( abs(ActiveCharacter().GetCenterX() - m_enemy->GetCenterX()) <= 10 )
       return;
+    if (m_enemy->GetTestRect().Intersect(ActiveCharacter().GetTestRect()))
+      {
+        MSG_DEBUG("ai.shoot","%s is on or next to %s", ActiveCharacter().GetName().c_str(), m_enemy->GetName().c_str());
+        return;
+      }
 
-    MSG_DEBUG("ai", "Character: %d, enemy %d", 
-	      ActiveCharacter().GetCenterX(), m_enemy->GetCenterX());
+    MSG_DEBUG("ai", "Character: %d, enemy %d",
+              ActiveCharacter().GetCenterX(), m_enemy->GetCenterX());
 
     if ( ActiveCharacter().GetCenterX() < m_enemy->GetCenterX())
       ActiveCharacter().SetDirection(DIRECTION_RIGHT);
@@ -350,8 +421,7 @@ bool AIShootModule::Refresh(uint current_time)
   }
 
   m_current_time = current_time;
-
-  FindEnemy();
+  m_enemy = FindEnemy();
   ChooseDirection();
 
   switch (m_current_strategy) {
@@ -366,13 +436,15 @@ bool AIShootModule::Refresh(uint current_time)
     FOR_ALL_LIVING_ENEMIES(ActiveCharacter(), team, character) {
 //      if ( abs((*character).GetX() - ActiveCharacter().GetX()) <= 10 &&
 //                 abs ((*character).GetY() - ActiveCharacter().GetY()) < 60 ) {
-        if ( (*character).GetCenter().Distance( ActiveCharacter().GetCenter()) < 30) {
+        if ( (*character).GetCenter().Distance( ActiveCharacter().GetCenter()) < 40) {
               if (&(*character) != m_enemy) {
                 GameMessages::GetInstance()->Add(ActiveCharacter().GetName()+" changes target : "
                                                  + (*character).GetName());
               }
                m_enemy = &(*character);
                Shoot();
+               // If IA selected ProximityWeapon, he needs to go back, in the opposite direction (otherwises BOOM :-) )
+               ActiveCharacter().SetDirection( (ActiveCharacter().GetDirection()==DIRECTION_RIGHT) ? DIRECTION_LEFT : DIRECTION_RIGHT);
       }
     }
     break;
@@ -407,7 +479,7 @@ void AIShootModule::BeginTurn()
   SetStrategy(NO_STRATEGY);
 
   // Choose random direction for the moment
-  ActiveCharacter().SetDirection( randomSync.GetBool()?DIRECTION_LEFT:DIRECTION_RIGHT );
+  ActiveCharacter().SetDirection( RandomSync().GetBool()?DIRECTION_LEFT:DIRECTION_RIGHT );
 }
 
 AIShootModule::AIShootModule(const AIMovementModule& to_remove) :
@@ -425,8 +497,8 @@ AIShootModule::AIShootModule(const AIMovementModule& to_remove) :
 void AIShootModule::SetStrategy(strategy_t new_strategy)
 {
   if (m_current_strategy != new_strategy) {
-    MSG_DEBUG("ai", "%s changes his strategy: %d -> %d", 
-	      ActiveCharacter().GetName().c_str(), m_current_strategy, new_strategy);
+    MSG_DEBUG("ai", "%s changes his strategy: %d -> %d",
+              ActiveCharacter().GetName().c_str(), m_current_strategy, new_strategy);
     if (IsLOGGING("ai")) {
       std::cout << "SetStrategy: " << new_strategy << std::endl;
     }
diff --git a/src/ai/ai_shoot_module.h b/src/ai/ai_shoot_module.h
index 536fb7e..cbbda48 100644
--- a/src/ai/ai_shoot_module.h
+++ b/src/ai/ai_shoot_module.h
@@ -62,6 +62,9 @@ class AIShootModule
                                   const Character& enemy,
                                   double& shoot_angle);
 
+  static bool IsBazookable(const Character& shooter, 
+			   double& angle);
+
   static const Character* FindShootableEnemy(const Character& shooter,
                                              double& shoot_angle);
 
diff --git a/src/character/body.cpp b/src/character/body.cpp
index 4eb4636..f808310 100644
--- a/src/character/body.cpp
+++ b/src/character/body.cpp
@@ -38,7 +38,7 @@
 #include "tool/resource_manager.h"
 #include "tool/xml_document.h"
 
-Body::Body(xmlNode* xml, const Profile* res):
+Body::Body(const xmlNode* xml, const Profile* res):
   members_lst(),
   clothes_lst(),
   mvt_lst(),
@@ -53,13 +53,13 @@ Body::Body(xmlNode* xml, const Profile* res):
   current_frame(0),
   walk_events(0),
   main_rotation_rad(0),
-  squel_lst(),
+  skel_lst(),
   direction(DIRECTION_RIGHT),
   animation_number(0),
   need_rebuild(false),
   owner(NULL)
 {
-  xmlNodeArray nodes = XmlReader::GetNamedNeighbours(xml, "sprite");
+  xmlNodeArray nodes = XmlReader::GetNamedChildren(xml, "sprite");
   xmlNodeArray::const_iterator it;
 
   // Load members
@@ -74,12 +74,12 @@ Body::Body(xmlNode* xml, const Profile* res):
       std::cerr << "Warning !! The member \""<< name << "\" is defined twice in the xml file" << std::endl;
     else
       members_lst[name] = member;
-  } 
+  }
 
   members_lst["weapon"] = weapon_member;
 
   // Load clothes
-  nodes = XmlReader::GetNamed(xml, "clothe");
+  nodes = XmlReader::GetNamedChildren(xml, "clothe");
   MSG_DEBUG("body", "Found %i clothes\n", nodes.size());
   for (it = nodes.begin(); it != nodes.end(); ++it)
   {
@@ -95,7 +95,7 @@ Body::Body(xmlNode* xml, const Profile* res):
 
   // Load movements alias
   std::map<std::string, std::string> mvt_alias;
-  nodes = XmlReader::GetNamedNeighbours(xml, "alias");
+  nodes = XmlReader::GetNamedChildren(xml, "alias");
   MSG_DEBUG("body", "Found %i aliases\n", nodes.size());
   for (it = nodes.begin(); it != nodes.end(); ++it)
   {
@@ -107,7 +107,7 @@ Body::Body(xmlNode* xml, const Profile* res):
   }
 
   // Load movements
-  nodes = XmlReader::GetNamedNeighbours(xml, "movement");
+  nodes = XmlReader::GetNamedChildren(xml, "movement");
   MSG_DEBUG("body", "Found %i movements\n", nodes.size());
   for (it = nodes.begin(); it != nodes.end(); ++it)
   {
@@ -155,7 +155,7 @@ Body::Body(const Body& _body):
   current_frame(0),
   walk_events(0),
   main_rotation_rad(0),
-  squel_lst(),
+  skel_lst(),
   direction(DIRECTION_RIGHT),
   animation_number(_body.animation_number),
   need_rebuild(true),
@@ -245,10 +245,10 @@ void Body::ApplyMovement(Movement* mvt, uint frame)
 #endif
 
   // Move each member following the movement description
-  // We do it using the order of the squeleton, as the movement of each
-  // member affect the child members as well
-  std::vector<junction>::iterator member = squel_lst.begin();
-  for (;member != squel_lst.end();
+  // We do it using the order of the skeleton, as the movement of each
+  // member affects the child members as well
+  std::vector<junction>::iterator member = skel_lst.begin();
+  for (;member != skel_lst.end();
        member++)
   {
     ASSERT( frame < mvt->frames.size() );
@@ -307,11 +307,10 @@ void Body::ApplyMovement(Movement* mvt, uint frame)
           mb_mvt.SetAngle(mb_mvt.GetAngle() + M_PI);
       }
 
-      member->member->ApplyMovement(mb_mvt, squel_lst);
+      member->member->ApplyMovement(mb_mvt, skel_lst);
 
       // This movement needs to know the position of the member before
-      // being applied so it does a second ApplyMovement afterwards
-      // to be used
+      // being applied so it does a second ApplyMovement after being used
       if(mb_mvt.follow_cursor && Mouse::GetInstance()->GetVisibility() == Mouse::MOUSE_VISIBLE)
       {
 	member_mvt angle_mvt;
@@ -333,7 +332,7 @@ void Body::ApplyMovement(Movement* mvt, uint frame)
 	  angle -= owner->GetDirection() == DIRECTION_RIGHT ? M_PI:0;
 
           angle_mvt.SetAngle(angle);
-          member->member->ApplyMovement(angle_mvt, squel_lst);
+          member->member->ApplyMovement(angle_mvt, skel_lst);
 	}
       }
     }
@@ -342,17 +341,17 @@ void Body::ApplyMovement(Movement* mvt, uint frame)
 
 void Body::ApplySqueleton()
 {
-  // Move each member following the squeleton
-  std::vector<junction>::iterator member = squel_lst.begin();
+  // Move each member following the skeleton
+  std::vector<junction>::iterator member = skel_lst.begin();
   // The first member is the body, we set it to pos:
   member->member->pos = Point2f(0.0, 0.0);
   member->member->SetAngle(0.0);
   member++;
 
-  for(;member != squel_lst.end();
+  for(;member != skel_lst.end();
        member++)
   {
-    // Place the other members depending of the parent member:
+    // Place the other members depending on the parent member:
     member->member->ApplySqueleton(member->parent);
   }
 }
@@ -370,7 +369,7 @@ void Body::Build()
 	  current_frame += (Time::GetInstance()->Read()-last_refresh) / current_mvt->speed;
 	  last_refresh += ((Time::GetInstance()->Read()-last_refresh) / current_mvt->speed) * current_mvt->speed;
 
-	  // Depending on playmode loop if we have exceeded the nbr of frame of this movement
+	  // Depending on playmode loop if we have exceeded the nbr of frames of this movement
 	  if(current_frame >= current_mvt->frames.size())
 	    {
 	      if(current_mvt->play_mode == Movement::LOOP)
@@ -401,8 +400,8 @@ void Body::Build()
   ApplySqueleton();
   ApplyMovement(current_mvt, current_frame);
 
-  // Rotate each sprite, because the next part need to know the height of the sprite
-  // once he is rotated
+  // Rotate each sprite, because the next part need to know the height
+  // of the sprite once it is rotated
   for (int layer=0;layer < (int)current_clothe->layers.size() ;layer++) {
     if (current_clothe->layers[layer]->name != "weapon")
       current_clothe->layers[layer]->RotateSprite();
@@ -422,9 +421,9 @@ void Body::Build()
       }
   }
   body_mvt.pos.y = (float)GetSize().y - y_max + current_mvt->test_bottom;
-  body_mvt.pos.x = GetSize().x / 2.0 - squel_lst.front().member->spr->GetWidth() / 2.0;
+  body_mvt.pos.x = GetSize().x / 2.0 - skel_lst.front().member->spr->GetWidth() / 2.0;
   body_mvt.SetAngle(main_rotation_rad);
-  squel_lst.front().member->ApplyMovement(body_mvt, squel_lst);
+  skel_lst.front().member->ApplyMovement(body_mvt, skel_lst);
 
   need_rebuild = false;
 }
@@ -439,20 +438,45 @@ void Body::UpdateWeaponPosition(const Point2i& _pos)
   weapon_pos += _pos;
 }
 
+void Body::DrawWeaponMember(const Point2i& _pos)
+{
+  UpdateWeaponPosition(_pos);
+
+  weapon_member->Draw(_pos, _pos.x + GetSize().x/2, int(direction));
+}
+
 void Body::Draw(const Point2i& _pos)
 {
   Build();
 
-  UpdateWeaponPosition(_pos);
+  int draw_weapon_member = 0;
 
   // Finally draw each layer one by one
-  for (int layer=0;layer < (int)current_clothe->layers.size() ;layer++)
-    current_clothe->layers[layer]->Draw(_pos, _pos.x + GetSize().x/2, int(direction));
+  for (int layer=0;layer < (int)current_clothe->layers.size() ;layer++) {
+
+    if (current_clothe->layers[layer]->name == "weapon") {
+      // We draw the weapon member only if currently drawing the active character
+      if (owner->IsActiveCharacter()) {
+	ASSERT(draw_weapon_member == 0);
+	ASSERT(current_clothe->layers[layer] == weapon_member);
+	DrawWeaponMember(_pos);
+	draw_weapon_member++;
+      }
+    } else {
+      current_clothe->layers[layer]->Draw(_pos, _pos.x + GetSize().x/2, int(direction));
+    }
+  }
+
+  // if we are drawing the active character but current clothe does not contain a weapon member,
+  // we should draw it else weapon ammos number will be not displayed (see bug #11479)
+  if (owner->IsActiveCharacter() && draw_weapon_member == 0) {
+    DrawWeaponMember(_pos);
+  }
 }
 
 void Body::AddChildMembers(Member* parent)
 {
-  // Add child members of the parent member to the squeleton
+  // Add child members of the parent member to the skeleton
   // and continue recursively with child members
   for(std::map<std::string, v_attached>::iterator child = parent->attached_members.begin();
       child != parent->attached_members.end();
@@ -467,7 +491,7 @@ void Body::AddChildMembers(Member* parent)
         junction body;
         body.member = current_clothe->layers[lay];
         body.parent = parent;
-        squel_lst.push_back(body);
+        skel_lst.push_back(body);
 
         // continue recursively
         AddChildMembers(current_clothe->layers[lay]);
@@ -480,26 +504,26 @@ void Body::BuildSqueleton()
 {
   // Find each member used by the current clothe
   // and set the parent member of each member
-  squel_lst.clear();
+  skel_lst.clear();
 
-  // Find the "body" member as its the top of the squeleton
+  // Find the "body" member as it is the top of the skeleton
   for(uint lay = 0; lay < current_clothe->layers.size(); lay++)
     if(current_clothe->layers[lay]->type == "body")
     {
       junction body;
       body.member = current_clothe->layers[lay];
       body.parent = NULL;
-      squel_lst.push_back(body);
+      skel_lst.push_back(body);
       break;
     }
 
-  if(squel_lst.size() == 0)
+  if(skel_lst.size() == 0)
   {
     std::cerr << "Unable to find the \"body\" member in the current clothe" << std::endl;
     ASSERT(false);
   }
 
-  AddChildMembers(squel_lst.front().member);
+  AddChildMembers(skel_lst.front().member);
 }
 
 void Body::SetClothe(const std::string& name)
@@ -548,7 +572,7 @@ void Body::SetMovement(const std::string& name)
 void Body::PlayAnimation()
 {
   std::ostringstream name;
-  name << "animation" << randomObj.GetLong(0, animation_number - 1);
+  name << "animation" << RandomLocal().GetLong(0, animation_number - 1);
   SetClotheOnce(name.str());
   SetMovementOnce(name.str());
 }
diff --git a/src/character/body.h b/src/character/body.h
index 3137ebd..a423d82 100644
--- a/src/character/body.h
+++ b/src/character/body.h
@@ -64,6 +64,7 @@ class Body
   /**********************************************/
 
   friend class BodyList;
+  friend class SkinMenu;
   std::map<std::string, Member*> members_lst;
   std::map<std::string, Clothe*> clothes_lst;
   std::map<std::string, Movement*> mvt_lst;
@@ -71,7 +72,7 @@ class Body
   const Clothe* current_clothe;
   Movement* current_mvt;
 
-  // When a movement/clothe is played once, those variable saves the previous state;
+  // When a movement/clothe is played once, those variables save the previous state
   Movement* play_once_mvt_sauv;
   const Clothe* play_once_clothe_sauv;
   uint play_once_frame_sauv;
@@ -86,10 +87,10 @@ class Body
 
   double main_rotation_rad;
 
-  std::vector<junction> squel_lst; // Squeleton of the body:
-                                        // Order to use to build the body
-                                        // First element: member to build
-                                        // Secnd element: parent member
+  std::vector<junction> skel_lst; // Body skeleton:
+                                  // Order to use to build the body
+                                  // First element: member to build
+                                  // Secnd element: parent member
   BodyDirection_t direction;
 
   int animation_number;
@@ -103,13 +104,15 @@ class Body
   void AddChildMembers(Member* parent);
   const Character* owner;
 
+  void DrawWeaponMember(const Point2i& _pos);
+
 public:
 
-  Body(xmlNode* xml, const Profile* res);
+  Body(const xmlNode* xml, const Profile* res);
   Body(const Body&);
   ~Body();
 
-  Point2i GetSize() {return Point2i(30,45);};
+  static Point2i GetSize() {return Point2i(30,45);};
 
   void Draw(const Point2i& pos);
   void SetClothe(const std::string& name);
diff --git a/src/character/body_list.cpp b/src/character/body_list.cpp
index 42f484c..b0181ab 100644
--- a/src/character/body_list.cpp
+++ b/src/character/body_list.cpp
@@ -41,8 +41,8 @@ BodyList::BodyList()
 
 void BodyList::FreeMem()
 {
-  // The bodies member variable are freed from here, because the playing bodies only contains
-  // to member/movement/clothes of the bodies in the body_list
+  // The bodies member variable are freed from here, because the playing bodies
+  //  only contains pointers to member/movement/clothes of the bodies in the body_list
 
   std::map<std::string, Body*>::iterator it = list.begin();
   while(it != list.end())
diff --git a/src/character/character.cpp b/src/character/character.cpp
index 8950815..1cde211 100644
--- a/src/character/character.cpp
+++ b/src/character/character.cpp
@@ -40,12 +40,18 @@
 #include "particles/fading_text.h"
 #include "sound/jukebox.h"
 #include "team/team.h"
+#include "team/custom_team.h"
 #include "team/macro.h"
 #include "tool/math_tools.h"
 #include "tool/random.h"
 #include "tool/string_tools.h"
 #include "weapon/explosion.h"
 
+#ifdef DEBUG
+#include "include/app.h"
+#include "graphic/video.h"
+#endif
+
 const uint HAUT_FONT_MIX = 13;
 
 // Space between the name, the skin and the energy bar
@@ -85,8 +91,8 @@ void Character::SetBody(Body* char_body)
   SetClothe("normal");
   SetMovement("breathe");
 
-  SetDirection(randomObj.GetBool() ? DIRECTION_LEFT : DIRECTION_RIGHT);
-  body->SetFrame(randomObj.GetLong(0, body->GetFrameCount() - 1));
+  SetDirection(RandomLocal().GetBool() ? DIRECTION_LEFT : DIRECTION_RIGHT);
+  body->SetFrame(RandomLocal().GetLong(0, body->GetFrameCount() - 1));
   SetSize(body->GetSize());
 }
 
@@ -105,10 +111,10 @@ Character::Character (Team& my_team, const std::string &name, Body *char_body) :
   energy_bar(),
   survivals(0),
   name_text(NULL),
-  pause_bouge_dg(0),
+  rl_motion_pause(0),
   do_nothing_time(0),
   walking_time(0),
-  animation_time(Time::GetInstance()->Read() + randomObj.GetLong(ANIM_PAUSE_MIN,ANIM_PAUSE_MAX)),
+  animation_time(Time::GetInstance()->Read() + RandomLocal().GetLong(ANIM_PAUSE_MIN,ANIM_PAUSE_MAX)),
   lost_energy(0),
   hidden(false),
   channel_step(-1),
@@ -117,6 +123,7 @@ Character::Character (Team& my_team, const std::string &name, Body *char_body) :
   previous_strength(0),
   body(NULL)
 {
+
   m_is_character = true;
   SetCollisionModel(false, true, true);
   /* body stuff */
@@ -132,10 +139,6 @@ Character::Character (Team& my_team, const std::string &name, Body *char_body) :
   else
     name_text = NULL;
 
-#ifdef DEBUG_SKIN
-    name_text = new Text(" ");
-#endif
-
   // Energy
   m_energy = GameMode::GetInstance()->character.init_energy;
   energy_bar.InitVal (GameMode::GetInstance()->character.init_energy,
@@ -164,7 +167,7 @@ Character::Character (const Character& acharacter) :
   energy_bar(acharacter.energy_bar),
   survivals(acharacter.survivals),
   name_text(NULL),
-  pause_bouge_dg(acharacter.pause_bouge_dg),
+  rl_motion_pause(acharacter.rl_motion_pause),
   do_nothing_time(acharacter.do_nothing_time),
   walking_time(acharacter.walking_time),
   animation_time(acharacter.animation_time),
@@ -180,11 +183,6 @@ Character::Character (const Character& acharacter) :
     SetBody(new Body(*acharacter.body));
   if(acharacter.name_text)
     name_text = new Text(*acharacter.name_text);
-
-#ifdef DEBUG_SKIN
-    skin_text = new Text(" ");
-#endif
-
 }
 
 Character::~Character()
@@ -199,9 +197,6 @@ Character::~Character()
   body          = NULL;
   name_text     = NULL;
   particle_engine = NULL;
-#ifdef DEBUG_SKIN
-  delete skin_text;
-#endif
 }
 
 void Character::SignalDrowning()
@@ -358,7 +353,7 @@ void Character::Draw()
   // Gone in another world ?
   if (IsGhost()) return;
 
-  // Character is visible on carema? If not, just leave the function
+  // Character is visible on camera? If not, just leave the function
   // WARNING, this optimization is disabled if it is the active character
   // because there could be some tricks in the drawing of the weapon (cf bug #10242)
   if (!IsActiveCharacter()) {
@@ -380,7 +375,7 @@ void Character::Draw()
       &&  body->GetClothe().substr(0,9) != "animation")
   {
     body->PlayAnimation();
-    animation_time = Time::GetInstance()->Read() + body->GetMovementDuration() + randomObj.GetLong(ANIM_PAUSE_MIN,ANIM_PAUSE_MAX);
+    animation_time = Time::GetInstance()->Read() + body->GetMovementDuration() + RandomLocal().GetLong(ANIM_PAUSE_MIN,ANIM_PAUSE_MAX);
   }
 
   // Stop the animation or the black skin if we are playing
@@ -440,13 +435,6 @@ void Character::Draw()
     dy -= ESPACE;
   }
 
-#ifdef DEBUG_SKIN
-  dy -= HAUT_FONT_MIX;
-  skin_text->Set(body->GetClothe() + " " + body->GetMovement());
-  skin_text->DrawCenterTopOnMap(Point2i(GetX(), GetY() - dy));
-  dy -= ESPACE;
-#endif
-
   // Draw lost energy
   if (draw_loosing_energy)
   {
@@ -458,13 +446,33 @@ void Character::Draw()
         ss.str(), white_color);
   }
 
+#ifdef DEBUG
+
+  if (IsLOGGING("body"))
+  {
+    dy -= HAUT_FONT_MIX;
+    std::string txt = body->GetClothe() + " " + body->GetMovement();
+    Text skin_text(txt);
+    skin_text.DrawCenterTopOnMap(Point2i(GetX(), GetY() - dy));
+  }
+
+  if (IsLOGGING("test_rectangle"))
+  {
+    Rectanglei test_rect(GetTestRect());
+    test_rect.SetPosition(test_rect.GetPosition() - Camera::GetInstance()->GetPosition());
+    GetMainWindow().RectangleColor(test_rect, primary_red_color, 1);
+
+    Rectanglei rect(GetPosition() - Camera::GetInstance()->GetPosition(), GetSize());
+    GetMainWindow().RectangleColor(rect, primary_blue_color, 1);
+  }
+#endif
 }
 
 void Character::Jump(double strength, double angle /*in radian */)
 {
   Camera::GetInstance()->FollowObject(this, true);
 
-  do_nothing_time = Time::GetInstance()->Read();
+  UpdateLastMovingTime();
   walking_time = Time::GetInstance()->Read();
 
   if (!CanJump() && ActiveTeam().IsLocal()) return;
@@ -531,6 +539,11 @@ void Character::DoShoot()
   MSG_DEBUG("weapon.shoot", "<- end");
 }
 
+void Character::UpdateLastMovingTime()
+{
+  do_nothing_time = Time::GetInstance()->Read();
+}
+
 void Character::Refresh()
 {
   if (IsGhost()) return;
@@ -606,13 +619,13 @@ void Character::PrepareTurn()
 {
   damage_stats->HandleMostDamage();
   lost_energy = 0;
-  pause_bouge_dg = Time::GetInstance()->Read();
+  rl_motion_pause = Time::GetInstance()->Read();
 }
 
 bool Character::CanMoveRL() const
 {
   if (!IsImmobile() || IsFalling()) return false;
-  return pause_bouge_dg < Time::GetInstance()->Read();
+  return rl_motion_pause < Time::GetInstance()->Read();
 }
 
 void Character::BeginMovementRL(uint pause, bool slowly)
@@ -620,21 +633,21 @@ void Character::BeginMovementRL(uint pause, bool slowly)
   Camera::GetInstance()->FollowObject(this, true);
 
   walking_time = Time::GetInstance()->Read();
-  do_nothing_time = Time::GetInstance()->Read();
+  UpdateLastMovingTime();
   if (!slowly) {
     SetMovement("walk");
   }
   CharacterCursor::GetInstance()->Hide();
   step_sound_played = true;
-  pause_bouge_dg = Time::GetInstance()->Read()+pause;
+  rl_motion_pause = Time::GetInstance()->Read()+pause;
 }
 
 bool Character::CanStillMoveRL(uint pause)
 {
-  if (pause_bouge_dg + pause < Time::GetInstance()->Read())
+  if (rl_motion_pause + pause < Time::GetInstance()->Read())
   {
     walking_time = Time::GetInstance()->Read();
-    pause_bouge_dg = pause_bouge_dg + pause;
+    rl_motion_pause = rl_motion_pause + pause;
     return true;
   }
   return false;
@@ -646,7 +659,7 @@ void Character::SignalCollision(const Point2d& speed_vector)
   // Do not manage dead characters.
   if (IsDead()) return;
 
-  pause_bouge_dg = Time::GetInstance()->Read();
+  rl_motion_pause = Time::GetInstance()->Read();
 
   GameMode * game_mode = GameMode::GetInstance();
   if (body->GetClothe() != "weapon-" + m_team.GetWeapon().GetID()
@@ -844,8 +857,8 @@ void Character::StoreValue(Action *a)
   PhysicalObj::StoreValue(a);
   a->Push((int)GetDirection());
   a->Push(GetAbsFiringAngle());
-  a->Push((int)GetDiseaseDamage());
-  a->Push((int)GetDiseaseDuration());
+  a->Push((int)disease_damage_per_turn);
+  a->Push((int)disease_duration);
   if (IsActiveCharacter()) { // If active character, store step animation
     a->Push((int)true);
     a->Push(GetBody()->GetClothe());
@@ -861,6 +874,7 @@ void Character::GetValueFromAction(Action *a)
   // those 2 parameters will be retrieved by PhysicalObj::GetValueFromAction
   alive_t prev_live_state = m_alive;
   int prev_energy = m_energy;
+  Point2d prev_position = Physics::GetPos();
 
   PhysicalObj::GetValueFromAction(a);
   SetDirection((BodyDirection_t)(a->PopInt()));
@@ -917,8 +931,8 @@ void Character::GetValueFromAction(Action *a)
     }
   }
 
-  int disease_damage_per_turn = (a->PopInt());
-  int disease_duration = (a->PopInt());
+  uint disease_damage_per_turn = (a->PopInt());
+  uint disease_duration = (a->PopInt());
   SetDiseaseDamage(disease_damage_per_turn, disease_duration);
   if (a->PopInt()) { // If active characters, retrieve stored animation
     if (GetTeam().IsActiveTeam())
@@ -929,8 +943,33 @@ void Character::GetValueFromAction(Action *a)
 
     GetBody()->UpdateWeaponPosition(GetPosition());
   }
+
+  // If the player has moved, the camera should follow it!
+  Point2d current_position = Physics::GetPos();
+  if (IsActiveCharacter() && prev_position != current_position) {
+    Camera::GetInstance()->FollowObject(this, true);
+    HideGameInterface();
+  }
 }
 
+
+const std::string& Character::GetName() const
+{
+    return character_name;
+ }
+
+void Character::SetCustomName(const std::string name)
+{
+  std::cout<<"Character::SetCustomName "<<name<<std::endl;
+
+  if(name.size()>0)
+  {
+    name_text->Set(name);
+    character_name = name;
+  }
+
+
+}
 // ###################################################################
 // ###################################################################
 // ###################################################################
@@ -989,7 +1028,7 @@ void Character::HandleKeyRefreshed_Up(bool shift)
     {
       if (ActiveTeam().crosshair.enable)
         {
-          do_nothing_time = Time::GetInstance()->Read();
+	  UpdateLastMovingTime();
           CharacterCursor::GetInstance()->Hide();
           if (shift) AddFiringAngle(-DELTA_CROSSHAIR/10.0);
           else       AddFiringAngle(-DELTA_CROSSHAIR);
@@ -1006,7 +1045,7 @@ void Character::HandleKeyRefreshed_Down(bool shift)
     {
       if (ActiveTeam().crosshair.enable)
         {
-          do_nothing_time = Time::GetInstance()->Read();
+	  UpdateLastMovingTime();
           CharacterCursor::GetInstance()->Hide();
           if (shift) AddFiringAngle(DELTA_CROSSHAIR/10.0);
           else       AddFiringAngle(DELTA_CROSSHAIR);
@@ -1049,3 +1088,5 @@ void Character::HandleKeyPressed_BackJump(bool)
   }
 }
 
+
+
diff --git a/src/character/character.h b/src/character/character.h
index 43b1656..4f064a4 100644
--- a/src/character/character.h
+++ b/src/character/character.h
@@ -22,6 +22,7 @@
 #ifndef _CHARACTER_H
 #define _CHARACTER_H
 
+#include <limits>
 #include <string>
 #include "gui/energy_bar.h"
 #include "include/base.h"
@@ -46,6 +47,7 @@ private:
   /**********************************************/
 
   std::string character_name;
+
   Team &m_team;
   bool step_sound_played;
   bool prepare_shoot;
@@ -54,7 +56,7 @@ private:
   double firing_angle;
 
   uint disease_damage_per_turn;
-  uint disease_duration;
+  uint disease_duration; // std::numeric_limits<uint>::max() means unlimited
   DamageStatistics *damage_stats;
   EnergyBar energy_bar;
 
@@ -63,12 +65,9 @@ private:
 
   // name
   Text* name_text;
-#ifdef DEBUG_SKIN
-  Text* skin_text;
-#endif
 
   // chrono
-  uint pause_bouge_dg;  // pause pour mouvement droite/gauche
+  uint rl_motion_pause;  // pause for left/right motion
   uint do_nothing_time;
   uint walking_time;
   uint animation_time;
@@ -81,7 +80,7 @@ private:
   // Generates green bubbles when the character is ill
   ParticleEngine *particle_engine;
 
-  // this is needed because of network to know
+  // this is needed because of network needing to know
   // if we have changed of active character
   bool is_playing;
 public:
@@ -120,7 +119,8 @@ public:
   void DisableDeathExplosion() { death_explosion = false; };
   bool IsActiveCharacter() const;
   // Disease handling
-  bool IsDiseased() const { return disease_duration > 0 && !IsDead(); };
+  bool IsDiseased() const { return (disease_duration > 0 && !IsDead()); };
+
   void SetDiseaseDamage(const uint damage_per_turn, const uint duration)
   {
     disease_damage_per_turn = damage_per_turn;
@@ -133,9 +133,10 @@ public:
       return disease_damage_per_turn;
     return GetEnergy() - 1;
   }
-  uint GetDiseaseDuration() const { return disease_duration; };
   void DecDiseaseDuration()
   {
+    if (disease_duration == std::numeric_limits<uint>::max()) return; // infinite disease duration
+
     if (disease_duration > 0) disease_duration--;
     else disease_damage_per_turn = 0;
   }
@@ -163,6 +164,9 @@ public:
   void Show() { hidden = false; };
 
   // ---- Movement  -----
+
+  void UpdateLastMovingTime();
+
   // Can we move (check a timeout)
   bool CanMoveRL() const;
   bool CanJump() const { return CanMoveRL(); };
@@ -188,10 +192,10 @@ public:
   uint GetCharacterIndex() const;
 
   // Access to character info
-  const std::string& GetName() const { return character_name; }
+  const std::string& GetName() const;
   bool IsSameAs(const Character& other) const { return (GetName() == other.GetName()); }
-
-  // Hand position
+  void SetCustomName(const std::string name);
+   // Hand position
   const Point2i & GetHandPosition() const;
 
   // Damage report
diff --git a/src/character/clothe.cpp b/src/character/clothe.cpp
index b1b88aa..728f78e 100644
--- a/src/character/clothe.cpp
+++ b/src/character/clothe.cpp
@@ -25,7 +25,7 @@
 #include <map>
 #include <iostream>
 
-Clothe::Clothe(xmlNode* xml, std::map<std::string, Member*>& members_lst):
+Clothe::Clothe(const xmlNode* xml, std::map<std::string, Member*>& members_lst):
   name(),
   layers()
 {
@@ -55,7 +55,7 @@ Clothe::Clothe(xmlNode* xml, std::map<std::string, Member*>& members_lst):
     }
 
     layers.push_back( member );
-  } 
+  }
 
   std::vector<Member*>::iterator i = layers.begin();
   while( i != layers.end())
diff --git a/src/character/clothe.h b/src/character/clothe.h
index dbf5665..d5fe6f0 100644
--- a/src/character/clothe.h
+++ b/src/character/clothe.h
@@ -33,7 +33,7 @@ public:
   std::vector<Member*> layers;
 
   ~Clothe();
-  Clothe(xmlNode* xml, std::map<std::string, Member*>& members_lst);
+  Clothe(const xmlNode* xml, std::map<std::string, Member*>& members_lst);
   Clothe(Clothe* c, std::map<std::string, Member*>& members_lst);
 };
 
diff --git a/src/character/member.cpp b/src/character/member.cpp
index b980648..56d656a 100644
--- a/src/character/member.cpp
+++ b/src/character/member.cpp
@@ -32,7 +32,7 @@
 #include "tool/string_tools.h"
 #include "tool/xml_document.h"
 
-Member::Member(xmlNode* xml, const Profile* res):
+Member::Member(const xmlNode* xml, const Profile* res):
   parent(NULL),
   angle_rad(0),
   anchor(0,0),
@@ -60,8 +60,8 @@ Member::Member(xmlNode* xml, const Profile* res):
   XmlReader::ReadStringAttr(xml, "type", type);
   ASSERT(type!="");
 
-  xmlNode* el = XmlReader::GetMarker(xml, "anchor");
-  if(el != 0)
+  const xmlNode* el = XmlReader::GetMarker(xml, "anchor");
+  if (el != NULL)
   {
     int dx = 0, dy = 0;
     XmlReader::ReadIntAttr(el, "dx", dx);
@@ -117,7 +117,7 @@ Member::Member(xmlNode* xml, const Profile* res):
       }
       (attached_members.find(att_type)->second)[frame] = d;
     }
-  } 
+  }
 
   ResetMovement();
 }
@@ -192,7 +192,7 @@ void Member::Draw(const Point2i & _pos, int flip_center, int direction)
 
 void Member::ApplySqueleton(Member* parent_member)
 {
-  // Place the member to shape the squeleton
+  // Place the member to shape the skeleton
   if(parent_member == NULL)
   {
     std::cerr << "Member " << name << " have no parent member!" << std::endl;
@@ -210,7 +210,7 @@ void Member::ApplySqueleton(Member* parent_member)
     pos = pos + parent->attached_members.find(type)->second[parent->spr->GetCurrentFrame()];
 }
 
-void Member::ApplyMovement(const member_mvt &mvt, std::vector<junction>& squel_lst)
+void Member::ApplyMovement(const member_mvt &mvt, std::vector<junction>& skel_lst)
 {
   // Apply the movment to the member,
   // And apply the movement accordingly to the child members
@@ -226,9 +226,9 @@ void Member::ApplyMovement(const member_mvt &mvt, std::vector<junction>& squel_l
       child != attached_members.end();
       child++ )
   {
-    // Find this member in the squeleton:
-    for(std::vector<junction>::iterator member = squel_lst.begin();
-        member != squel_lst.end();
+    // Find this member in the skeleton:
+    for(std::vector<junction>::iterator member = skel_lst.begin();
+        member != skel_lst.end();
         member++)
     {
       if(member->member->type == child->first)
@@ -261,8 +261,8 @@ void Member::ApplyMovement(const member_mvt &mvt, std::vector<junction>& squel_l
           child_mvt.pos.x += radius * (cos(angle_init + angle_rad + mvt.GetAngle()) - cos(angle_init + angle_rad));
           child_mvt.pos.y += radius * (sin(angle_init + angle_rad + mvt.GetAngle()) - sin(angle_init + angle_rad));
         }
-        // Apply recursively to childrens:
-        member->member->ApplyMovement(child_mvt, squel_lst);
+        // Apply recursively to children:
+        member->member->ApplyMovement(child_mvt, skel_lst);
       }
     }
   }
@@ -289,8 +289,8 @@ WeaponMember::~WeaponMember()
 void WeaponMember::Draw(const Point2i & /*_pos*/, int /*flip_center*/, int /*direction*/)
 {
   if (!ActiveCharacter().IsDead() && Game::GetInstance()->ReadState() != Game::END_TURN)
-  {
-        ActiveTeam().crosshair.Draw();
-        ActiveTeam().AccessWeapon().Draw();
-  }
+    {
+      ActiveTeam().crosshair.Draw();
+      ActiveTeam().AccessWeapon().Draw();
+    }
 }
diff --git a/src/character/member.h b/src/character/member.h
index 5f6492e..f6dd0c9 100644
--- a/src/character/member.h
+++ b/src/character/member.h
@@ -57,7 +57,7 @@ public:
   bool go_through_ground;
 
   virtual ~Member();
-  Member(xmlNode* xml, const Profile* res);
+  Member(const xmlNode* xml, const Profile* res);
   Member(const Member& m);
   virtual void Draw(const Point2i & _pos, int flip_x, int direction);
   void RotateSprite();
@@ -71,7 +71,7 @@ public:
     scale.y = 1.0;
   }
   void ApplySqueleton(Member* parent_member);
-  void ApplyMovement(const member_mvt& mvt, std::vector<class c_junction>& squel_lst);
+  void ApplyMovement(const member_mvt& mvt, std::vector<class c_junction>& skel_lst);
   const Point2i GetPos() { return Point2i((int)pos.x, (int)pos.y); };
   const Point2i GetAnchorPos() { return Point2i((int)anchor.x, (int)anchor.y); };
   void SetAngle(const double &angle) { angle_rad = angle; };
diff --git a/src/character/move.cpp b/src/character/move.cpp
index f0f5b80..d2fd982 100644
--- a/src/character/move.cpp
+++ b/src/character/move.cpp
@@ -63,9 +63,9 @@ bool ComputeHeightMovement(Character &character, int &height,
         return true;
       }
     }
-    //We can go down, but the step is to big -> the character will fall.
+    //We can go down, but the step is too big -> the character will fall
     if (falling) {
-      character.SetX (character.GetX() +character.GetDirection());
+      character.SetX (character.GetXdouble() +character.GetDirection());
       character.UpdatePosition();
       character.SetMovement("fall");
     }
@@ -87,10 +87,10 @@ void MoveCharacter(Character &character, bool slowly)
   int height;
   bool ghost;
   uint walking_pause = GameMode::GetInstance()->character.walking_pause;
-  
+
   if (slowly)
     walking_pause *= 10;
-  else 
+  else
     ActiveCharacter().SetMovement("walk"); // avoid sliding effect when not right or left key is released while releasing shift
 
   // If character moves out of the world, no need to go further: it is dead
diff --git a/src/character/movement.cpp b/src/character/movement.cpp
index 80355d9..3aaac5c 100644
--- a/src/character/movement.cpp
+++ b/src/character/movement.cpp
@@ -24,7 +24,7 @@
 #include "tool/xml_document.h"
 #include "tool/debug.h"
 
-Movement::Movement(xmlNode* xml)
+Movement::Movement(const xmlNode* xml)
 {
   frames.clear();
   play_mode = LOOP;
@@ -35,7 +35,9 @@ Movement::Movement(xmlNode* xml)
   MSG_DEBUG("body.movement", "  Loading movement %s\n", type.c_str());
 
   speed = 15;
+  repeat = 1;
   XmlReader::ReadIntAttr(xml, "speed", speed);
+  XmlReader::ReadIntAttr(xml, "repeat", repeat);
 
   std::string pm;
   if (XmlReader::ReadStringAttr(xml, "play_mode", pm))
@@ -44,7 +46,7 @@ Movement::Movement(xmlNode* xml)
 
    // Load the test rectangle
   test_left = test_right = test_top = test_bottom = 0;
-  xmlNode* collision_rect = XmlReader::GetMarker(xml, "collision_rect");
+  const xmlNode* collision_rect = XmlReader::GetMarker(xml, "collision_rect");
   if (collision_rect == NULL)
   {
     fprintf(stderr, "No collision rect for %s\n", type.c_str());
@@ -56,57 +58,61 @@ Movement::Movement(xmlNode* xml)
   XmlReader::ReadUintAttr(collision_rect, "bottom", test_bottom);
   MSG_DEBUG("body.movement", "Collision rect set to (%u,%u) -> (%u,%u)\n",
             test_left, test_top, test_left, test_bottom);
-  
+
   xmlNodeArray nodes = XmlReader::GetNamedChildren(xml, "frame");
   xmlNodeArray::const_iterator it = nodes.begin(), end = nodes.end();
   MSG_DEBUG("body.movement", "  Found %i movement frames\n", nodes.size());
+    MSG_DEBUG("body.movement", "  Repeat %i times\n", repeat);
 
   /* We know the number of member frame that are being read so we can resize
    * thr array to be able to get all of them. */
-  frames.resize(nodes.size());
-
-  for (int frame_number=0; it != end; ++it, frame_number++)
+  frames.resize(nodes.size()*repeat);
+  for(int repeat_number =0; repeat_number < repeat; repeat_number++)
   {
-    xmlNodeArray members = XmlReader::GetNamedChildren(*it, "member");
-    xmlNodeArray::const_iterator it2;
-    MSG_DEBUG("body.movement", "    Found %i frame members\n", members.size());
-
-    for (it2 = members.begin(); it2 != members.end(); ++it2)
+    it = nodes.begin();
+    for (int frame_number=0; it != end; ++it, frame_number++)
     {
-      xmlNode *child = *it2;
-      std::string member_type;
-      XmlReader::ReadStringAttr(child, "type", member_type);
+      xmlNodeArray members = XmlReader::GetNamedChildren(*it, "member");
+      xmlNodeArray::const_iterator it2;
+      MSG_DEBUG("body.movement", "    Found %i frame members\n", members.size());
+
+      for (it2 = members.begin(); it2 != members.end(); ++it2)
+      {
+        const xmlNode *child = *it2;
+        std::string member_type;
+        XmlReader::ReadStringAttr(child, "type", member_type);
 
-      member_mvt mvt;
-      int dx = 0, dy = 0, angle_deg = 0;
-      double scale_x = 1.0, scale_y = 1.0, tmp_alpha = 1.0;
+        member_mvt mvt;
+        int dx = 0, dy = 0, angle_deg = 0;
+        double scale_x = 1.0, scale_y = 1.0, tmp_alpha = 1.0;
 
-      XmlReader::ReadIntAttr(child, "dx", dx);
-      XmlReader::ReadIntAttr(child, "dy", dy);
-      XmlReader::ReadDoubleAttr(child, "scale_x", scale_x);
-      XmlReader::ReadDoubleAttr(child, "scale_y", scale_y);
-      XmlReader::ReadDoubleAttr(child, "alpha", tmp_alpha);
-      XmlReader::ReadIntAttr(child, "angle", angle_deg);
-      XmlReader::ReadBoolAttr(child, "follow_crosshair", mvt.follow_crosshair);
-      XmlReader::ReadBoolAttr(child, "follow_half_crosshair", mvt.follow_half_crosshair);
-      XmlReader::ReadBoolAttr(child, "follow_speed", mvt.follow_speed);
-      XmlReader::ReadBoolAttr(child, "follow_direction", mvt.follow_direction);
-      if( XmlReader::ReadBoolAttr(child, "follow_cursor", mvt.follow_cursor)
-          && !XmlReader::ReadIntAttr(child, "follow_cursor_limit", mvt.follow_cursor_limit))
-        printf("Warning ! \"follow_cursor\" flag used while \"follow_cursor_limit\" isn't defined, this won't do anything!\n");
-      if(tmp_alpha < 0.0 || tmp_alpha > 1.0) tmp_alpha = 1.0;
-      mvt.SetAngle(angle_deg * M_PI / 180);
-      mvt.pos.x = dx;
-      mvt.pos.y = dy;
-      mvt.alpha = tmp_alpha;
-      mvt.scale = Point2f(scale_x, scale_y);
+        XmlReader::ReadIntAttr(child, "dx", dx);
+        XmlReader::ReadIntAttr(child, "dy", dy);
+        XmlReader::ReadDoubleAttr(child, "scale_x", scale_x);
+        XmlReader::ReadDoubleAttr(child, "scale_y", scale_y);
+        XmlReader::ReadDoubleAttr(child, "alpha", tmp_alpha);
+        XmlReader::ReadIntAttr(child, "angle", angle_deg);
+        XmlReader::ReadBoolAttr(child, "follow_crosshair", mvt.follow_crosshair);
+        XmlReader::ReadBoolAttr(child, "follow_half_crosshair", mvt.follow_half_crosshair);
+        XmlReader::ReadBoolAttr(child, "follow_speed", mvt.follow_speed);
+        XmlReader::ReadBoolAttr(child, "follow_direction", mvt.follow_direction);
+        if( XmlReader::ReadBoolAttr(child, "follow_cursor", mvt.follow_cursor)
+            && !XmlReader::ReadIntAttr(child, "follow_cursor_limit", mvt.follow_cursor_limit))
+          printf("Warning ! \"follow_cursor\" flag used while \"follow_cursor_limit\" isn't defined, this won't do anything!\n");
+        if(tmp_alpha < 0.0 || tmp_alpha > 1.0) tmp_alpha = 1.0;
+        mvt.SetAngle(angle_deg * M_PI / 180);
+        mvt.pos.x = dx;
+        mvt.pos.y = dy;
+        mvt.alpha = tmp_alpha;
+        mvt.scale = Point2f(scale_x, scale_y);
 
-      always_moving |= mvt.follow_cursor;
-      always_moving |= mvt.follow_crosshair;
-      always_moving |= mvt.follow_half_crosshair;
-      always_moving |= mvt.follow_speed;
-      always_moving |= mvt.follow_direction;
-      frames[frame_number][member_type] = mvt;
+        always_moving |= mvt.follow_cursor;
+        always_moving |= mvt.follow_crosshair;
+        always_moving |= mvt.follow_half_crosshair;
+        always_moving |= mvt.follow_speed;
+        always_moving |= mvt.follow_direction;
+        frames[frame_number+repeat_number*nodes.size()][member_type] = mvt;
+      }
     }
   }
 }
diff --git a/src/character/movement.h b/src/character/movement.h
index ee4a2ce..53426a5 100644
--- a/src/character/movement.h
+++ b/src/character/movement.h
@@ -66,6 +66,7 @@ public:
   std::vector<member_def> frames;
   bool always_moving;
   int speed;
+  int repeat;
   uint test_left, test_right, test_top, test_bottom;
   enum
   {
@@ -76,7 +77,7 @@ public:
   std::string type;
 
   ~Movement();
-  Movement(xmlNode* xml);
+  Movement(const xmlNode* xml);
 };
 
 #endif //MEMBER_H
diff --git a/src/config.h.in b/src/config.h.in
index a12e977..2ec839f 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -23,7 +23,7 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define if you have the iconv() function. */
+/* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the <inttypes.h> header file. */
diff --git a/src/game/config.cpp b/src/game/config.cpp
index 93944f2..87d2443 100644
--- a/src/game/config.cpp
+++ b/src/game/config.cpp
@@ -27,7 +27,6 @@
 #include <sstream>
 #include <string>
 #include <iostream>
-#include <sys/stat.h>
 #include <errno.h>
 #include <libxml/tree.h>
 #ifdef WIN32
@@ -56,12 +55,6 @@
 #  include "include/binreloc.h"
 #endif
 
-#ifndef WIN32
-#define MKDIR_P(dir) (mkdir(dir, 0750))
-#else
-#define MKDIR_P(dir) (_mkdir(dir))
-#endif
-
 #ifdef _WIN32
 #include <windows.h>
 
@@ -94,8 +87,6 @@ const std::string FILENAME="config.xml";
 Config::Config():
   default_language(""),
   m_game_mode("classic"),
-  m_network_host("localhost"),
-  m_network_port(WORMUX_NETWORK_PORT),
   m_filename(),
   data_dir(),
   locale_dir(),
@@ -113,15 +104,20 @@ Config::Config():
   video_width(800),
   video_height(600),
   video_fullscreen(false),
-  max_fps(0),
+  max_fps(50),
   bling_bling_interface(false),
   scroll_on_border(true),
   scroll_border_size(50),
   sound_music(true),
   sound_effects(true),
   sound_frequency(44100),
-  enable_network(true),
+  warn_on_new_player(true),
   check_updates(false),
+  m_network_client_host("localhost"),
+  m_network_client_port(WORMUX_NETWORK_PORT),
+  m_network_server_game_name("Wormux party"),
+  m_network_server_port(WORMUX_NETWORK_PORT),
+  m_network_server_public(true),
   ttf_filename(),
   transparency(ALPHA),
   config_set()
@@ -207,8 +203,9 @@ Config::Config():
 
   personal_config_dir += "/wormux/";
 
-  if (c_data_dir == NULL)
+  if (c_data_dir == NULL) {
     personal_data_dir = GetHome() + "/.local/share";
+  }
   else
     personal_data_dir = c_data_dir;
 
@@ -248,31 +245,38 @@ Config::Config():
   resource_manager.AddDataPath(dir + PATH_SEPARATOR);
 }
 
-bool Config::MkdirChatLogDir()
+bool Config::MkdirChatLogDir() const
 {
-  // Create the directory if it doesn't exist
-  if (MKDIR_P(chat_log_dir.c_str()) == 0 || errno == EEXIST)
-    return true;
-
-  return false;
+  return CreateFolder(chat_log_dir);
 }
 
-bool Config::MkdirPersonalConfigDir()
+bool Config::MkdirPersonalConfigDir() const
 {
-  // Create the directory if it doesn't exist
-  if (MKDIR_P(personal_config_dir.c_str()) == 0 || errno == EEXIST)
-    return true;
+  return CreateFolder(personal_config_dir);
+}
 
-  return false;
+bool Config::MkdirPersonalDataDir() const
+{
+  return CreateFolder(personal_data_dir);
 }
 
-bool Config::MkdirPersonalDataDir()
+bool Config::RemovePersonalConfigFile() const
 {
-  // Create the directory if it doesn't exist
-  if ( MKDIR_P(personal_data_dir.c_str()) == 0 || errno == EEXIST)
-      return true;
+  std::string personal_config_file = personal_config_dir + FILENAME;
+
+  int r = unlink(personal_config_file.c_str());
+  if (r) {
+    if (errno == -ENOENT) {
+      r = 0;
+    } else {
+      perror((Format("Fail to remove personal config file %s", personal_config_file.c_str())).c_str());
+    }
+  }
 
-  return false;
+  if (r)
+    return false;
+
+  return true;
 }
 
 void Config::SetLanguage(const std::string language)
@@ -333,7 +337,6 @@ bool Config::DoLoading(void)
     return false;
 
   LoadXml(doc.GetRoot());
-
   return true;
 }
 
@@ -358,7 +361,7 @@ void Config::LoadDefaultValue()
   }
 
   //=== Default fonts value ===
-  xmlNode *node = resource_manager.GetElement(res, "section", "default_language_fonts");
+  const xmlNode *node = resource_manager.GetElement(res, "section", "default_language_fonts");
   if (node) {
     xmlNodeArray list = XmlReader::GetNamedChildren(node, "language");
     for (xmlNodeArray::iterator it = list.begin(); it != list.end(); ++it) {
@@ -372,7 +375,6 @@ void Config::LoadDefaultValue()
       }
     }
   }
-  else printf("Bleh...\n");
 
 #if 0 //== Team Color
   int number_of_team_color = resource_manager.LoadInt(res, "team_colors/number_of_team_color");
@@ -389,8 +391,10 @@ void Config::LoadDefaultValue()
 }
 
 // Read personal config file
-void Config::LoadXml(xmlNode *xml)
+void Config::LoadXml(const xmlNode *xml)
 {
+  const xmlNode *elem;
+
   std::cout << "o " << _("Reading personal config file") << std::endl;
 
   //=== Map ===
@@ -401,22 +405,24 @@ void Config::LoadXml(xmlNode *xml)
   SetLanguage(default_language);
 
   //=== Teams ===
-  xmlNode *elem = XmlReader::GetMarker(xml, "teams");
-  int i = 0;
+  if ((elem = XmlReader::GetMarker(xml, "teams")) != NULL)
+  {
+    int i = 0;
 
-  xmlNode *team;
+    const xmlNode *team;
 
-  while ((team = XmlReader::GetMarker(elem, "team_" + ulong2str(i))) != NULL)
-  {
-    ConfigTeam one_team;
-    XmlReader::ReadString(team, "id", one_team.id);
-    XmlReader::ReadString(team, "player_name", one_team.player_name);
-    XmlReader::ReadUint(team, "nb_characters", one_team.nb_characters);
+    while ((team = XmlReader::GetMarker(elem, "team_" + ulong2str(i))) != NULL)
+      {
+	ConfigTeam one_team;
+	XmlReader::ReadString(team, "id", one_team.id);
+	XmlReader::ReadString(team, "player_name", one_team.player_name);
+	XmlReader::ReadUint(team, "nb_characters", one_team.nb_characters);
 
-    teams.push_back(one_team);
+	teams.push_back(one_team);
 
-    // get next team
-    i++;
+	// get next team
+	i++;
+      }
   }
 
   //=== Video ===
@@ -450,9 +456,38 @@ void Config::LoadXml(xmlNode *xml)
   //=== network ===
   if ((elem = XmlReader::GetMarker(xml, "network")) != NULL)
   {
-    //XmlReader::ReadBool(elem, "enable_network", enable_network);
-    XmlReader::ReadString(elem, "host", m_network_host);
-    XmlReader::ReadString(elem, "port", m_network_port);
+    const xmlNode *sub_elem;
+    if ((sub_elem = XmlReader::GetMarker(elem, "as_client")) != NULL)
+    {
+      XmlReader::ReadString(sub_elem, "host", m_network_client_host);
+      XmlReader::ReadString(sub_elem, "port", m_network_client_port);
+    }
+    if ((sub_elem = XmlReader::GetMarker(elem, "as_server")) != NULL)
+    {
+      XmlReader::ReadString(sub_elem, "game_name", m_network_server_game_name);
+      XmlReader::ReadString(sub_elem, "port", m_network_server_port);
+      XmlReader::ReadBool(sub_elem, "public", m_network_server_public);
+    }
+
+    //=== personal teams used in last network game ===
+    if ((sub_elem = XmlReader::GetMarker(elem, "local_teams")) != NULL)
+    {
+      int i = 0;
+      const xmlNode *team;
+
+      while ((team = XmlReader::GetMarker(sub_elem, "team_" + ulong2str(i))) != NULL)
+	{
+	  ConfigTeam one_team;
+	  XmlReader::ReadString(team, "id", one_team.id);
+	  XmlReader::ReadString(team, "player_name", one_team.player_name);
+	  XmlReader::ReadUint(team, "nb_characters", one_team.nb_characters);
+
+	  network_local_teams.push_back(one_team);
+
+	  // get next team
+	  i++;
+	}
+    }
   }
 
   //=== misc ===
@@ -573,8 +608,33 @@ bool Config::SaveXml(bool save_current_teams)
 
   //=== Network ===
   xmlNode *net_node = xmlAddChild(root, xmlNewNode(NULL /* empty prefix */, (const xmlChar*)"network"));
-  doc.WriteElement(net_node, "host", m_network_host);
-  doc.WriteElement(net_node, "port", m_network_port);
+
+  // Network as client parameters
+  xmlNode *net_as_client_node = xmlAddChild(net_node, xmlNewNode(NULL /* empty prefix */, (const xmlChar*)"as_client"));
+  doc.WriteElement(net_as_client_node, "host", m_network_client_host);
+  doc.WriteElement(net_as_client_node, "port", m_network_client_port);
+
+  // Network as server parameters
+  xmlNode *net_as_server_node = xmlAddChild(net_node, xmlNewNode(NULL /* empty prefix */, (const xmlChar*)"as_server"));
+  doc.WriteElement(net_as_server_node, "game_name", m_network_server_game_name);
+  doc.WriteElement(net_as_server_node, "port", m_network_server_port);
+  doc.WriteElement(net_as_server_node, "public", ulong2str(m_network_server_public));
+
+  // personal teams used durint last network game
+  xmlNode *net_teams = xmlAddChild(net_node, xmlNewNode(NULL /* empty prefix */, (const xmlChar*)"local_teams"));
+  std::list<ConfigTeam>::iterator
+    it = network_local_teams.begin(),
+    end = network_local_teams.end();
+
+  for (int i=0; it != end; ++it, i++)
+    {
+       std::string name = "team_"+ulong2str(i);
+       xmlNode* a_team = xmlAddChild(net_teams,
+                                     xmlNewNode(NULL /* empty prefix */, (const xmlChar*)name.c_str()));
+       doc.WriteElement(a_team, "id", (*it).id);
+       doc.WriteElement(a_team, "player_name", (*it).player_name);
+       doc.WriteElement(a_team, "nb_characters", ulong2str((*it).nb_characters));
+    }
 
   //=== Misc ===
   xmlNode *misc_node = xmlAddChild(root, xmlNewNode(NULL /* empty prefix */, (const xmlChar*)"misc"));
@@ -608,6 +668,31 @@ uint Config::GetMaxVolume()
 
 const std::string& Config::GetTtfFilename()
 {
-  if (fonts.find(default_language) == fonts.end()) return ttf_filename;
-  else                                             return fonts[default_language];
+  if (fonts.find(default_language) == fonts.end())
+    return ttf_filename;
+  else
+    return fonts[default_language];
+}
+
+void Config::SetNetworkLocalTeams()
+{
+  // personal teams used durint last network game
+  network_local_teams.clear();
+
+  TeamsList::iterator
+    it = GetTeamsList().playing_list.begin(),
+    end = GetTeamsList().playing_list.end();
+
+  for (int i=0; it != end; ++it, i++)
+    {
+      if ((**it).IsLocal())
+	{
+	  ConfigTeam config;
+	  config.id = (**it).GetId();
+	  config.player_name = (**it).GetPlayerName();
+	  config.nb_characters = (**it).GetNbCharacters();
+
+	  network_local_teams.push_back(config);
+	}
+    }
 }
diff --git a/src/game/config.h b/src/game/config.h
index 89d16c0..44d8ca4 100644
--- a/src/game/config.h
+++ b/src/game/config.h
@@ -114,6 +114,8 @@ public:
   uint GetVolumeEffects() const { return volume_effects; }
   void SetVolumeEffects(uint vol) { volume_effects = vol; }
   static uint GetMaxVolume();
+  bool GetWarnOnNewPlayer() const { return warn_on_new_player; }
+  void SetWarnOnNewPlayer(bool w) { warn_on_new_player = w; }
 
   bool GetCheckUpdates() const { return check_updates; }
   void SetCheckUpdates(const bool check) { check_updates = check; }
@@ -129,16 +131,34 @@ public:
   std::string GetDataDir() const { return data_dir; };
   std::string GetLocaleDir() const { return locale_dir; };
   std::string GetPersonalDataDir() const { return personal_data_dir; };
+  std::string GetPersonalConfigDir() const { return personal_config_dir; };
   std::string GetChatLogDir() const { return chat_log_dir; };
 
   bool Save(bool save_current_teams = false);
   const std::string &GetGameMode() const { return m_game_mode; }
   void SetGameMode(std::string s) { m_game_mode = s; }
 
-  const std::string &GetNetworkHost() const { return m_network_host; }
-  void SetNetworkHost(std::string s) { m_network_host = s; }
-  const std::string &GetNetworkPort() const { return m_network_port; }
-  void SetNetworkPort(std::string s) { m_network_port = s; }
+  const std::string &GetNetworkClientHost() const { return m_network_client_host; }
+  void SetNetworkClientHost(std::string s) { m_network_client_host = s; }
+  const std::string &GetNetworkClientPort() const { return m_network_client_port; }
+  void SetNetworkClientPort(std::string s) { m_network_client_port = s; }
+
+  const std::string &GetNetworkServerPort() const { return m_network_server_port; }
+  void SetNetworkServerPort(std::string s) { m_network_server_port = s; }
+  const std::string &GetNetworkServerGameName() const { return m_network_server_game_name; }
+  void SetNetworkServerGameName(std::string s) { m_network_server_game_name = s; }
+  bool GetNetworkServerPublic() const { return m_network_server_public; }
+  void SetNetworkServerPublic(bool b) { m_network_server_public = b; }
+
+  void SetNetworkLocalTeams();
+  const std::list<ConfigTeam>& AccessNetworkTeamsList() const { return network_local_teams; };
+
+  // return true if the directory is created
+  bool MkdirPersonalConfigDir() const;
+  bool MkdirPersonalDataDir() const;
+  bool MkdirChatLogDir() const;
+
+  bool RemovePersonalConfigFile() const;
 
 protected:
   bool SaveXml(bool save_current_teams);
@@ -146,8 +166,6 @@ protected:
 
   std::string default_language;
   std::string m_game_mode;
-  std::string m_network_host;
-  std::string m_network_port;
   std::string m_filename;
 
   // Code setting it must make sure it ends with the path separator
@@ -182,11 +200,23 @@ protected:
   uint sound_frequency;
   uint volume_music;
   uint volume_effects;
+  bool warn_on_new_player;
 
   // network
-  bool enable_network;
   bool check_updates;
 
+  // network previous connection as client
+  std::string m_network_client_host;
+  std::string m_network_client_port;
+
+  // network previous connection as server
+  std::string m_network_server_game_name;
+  std::string m_network_server_port;
+  bool m_network_server_public;
+
+  // personal teams used durint last network game
+  std::list<ConfigTeam> network_local_teams;
+
   // Font setting
   std::map<std::string, std::string>  fonts;
   std::string font_dir;
@@ -201,12 +231,7 @@ protected:
 private:
   bool DoLoading(void);
   void LoadDefaultValue();
-  void LoadXml(xmlNode* xml);
-
-  // return true if the directory is created
-  bool MkdirPersonalConfigDir();
-  bool MkdirPersonalDataDir();
-  bool MkdirChatLogDir();
+  void LoadXml(const xmlNode* xml);
 
   /* this is mutable in order to be able to load config on fly when calling
    * GetObjectConfig() witch is not supposed to modify the object itself */
diff --git a/src/game/game.cpp b/src/game/game.cpp
index 30f4151..a010670 100644
--- a/src/game/game.cpp
+++ b/src/game/game.cpp
@@ -66,27 +66,46 @@
 //#define USE_VALGRIND
 #endif
 
-
-Game::game_mode_t Game::mode = CLASSIC;
+std::string Game::current_mode_name = "none";
 
 Game * Game::GetInstance()
 {
-  if (singleton == NULL) {
-    switch (mode) {
-    case CLASSIC:
+  if (singleton == NULL)
+  {
+    if (current_mode_name == "none")
+      current_mode_name = Config::GetInstance()->GetGameMode();
+
+    if (current_mode_name == "classic" || current_mode_name == "unlimited")
       singleton = new GameClassic();
-      break;
-    case BLITZ:
+    else if (current_mode_name == "blitz")
+    {
+      //printf(">>>> Starting in blitz!\n");
       singleton = new GameBlitz();
-      break;
-    default:
-      fprintf(stderr, "Non-classic game not implemented\n");
+    }
+    else
+    {
+      fprintf(stderr, "%s game mode not implemented\n", current_mode_name.c_str());
       exit(1);
     }
   }
   return singleton;
 }
 
+Game * Game::UpdateGameMode()
+{
+  const std::string& config_mode_name = Config::GetInstance()->GetGameMode();
+  printf("Current mode: %s\n", config_mode_name.c_str());
+  if (singleton != NULL && current_mode_name != config_mode_name)
+  {
+    printf("Mode change! -> %s %s\n", config_mode_name.c_str(), current_mode_name.c_str());
+    delete singleton;
+  }
+
+  current_mode_name = config_mode_name;
+  return GetInstance();
+}
+
+
 void Game::MessageLoading() const
 {
   GameInit loading_sreen; /* displays the loading screen stuff */
@@ -106,16 +125,12 @@ void Game::Start()
   {
     JukeBox::GetInstance()->PlayMusic(ActiveMap()->ReadMusicPlaylist());
 
-    isGameLaunched = true;
-
-    Run();
-
-    isGameLaunched = false;
+    bool game_finished = Run();
 
     MSG_DEBUG( "game", "End of game_loop.Run()" );
     JukeBox::GetInstance()->StopAll();
 
-    UnloadDatas();
+    UnloadDatas(game_finished);
 
     Mouse::GetInstance()->SetPointer(Mouse::POINTER_STANDARD);
     JukeBox::GetInstance()->PlayMusic("menu");
@@ -135,12 +150,39 @@ void Game::Start()
 
 }
 
-void Game::UnloadDatas() const
+void Game::UnloadDatas(bool game_finished) const
 {
   world.FreeMem();
+  ActiveMap()->FreeData();
   lst_objects.FreeMem();
   ParticleEngine::Stop();
+
+  if (!Network::IsConnected() || !game_finished) {
+    // Fix bug #10613: ensure all teams are reseted as local teams
+    FOR_EACH_TEAM(team)
+      (**team).SetDefaultPlayingConfig();
+  }
+
+  if (Network::IsConnected()) {
+    if (!game_finished) {
+      // the user has asked for the end of game
+      // if it's a network game, it's time to disconnect!!
+      Network::Disconnect();
+
+      // Fix bug #10613: ensure all teams are reseted as local teams
+      FOR_EACH_TEAM(team)
+	(**team).SetDefaultPlayingConfig();
+    }
+    // else: we will start a new round!
+  } else {
+
+    // Fix bug #10613: ensure all teams are reseted as local teams
+    FOR_EACH_TEAM(team)
+      (**team).SetDefaultPlayingConfig();
+  }
+
   GetTeamsList().UnloadGamingData();
+
   JukeBox::GetInstance()->StopAll();
 }
 
@@ -338,7 +380,7 @@ void Game::Draw ()
 
   StatStop("GameDraw:other");
 
-  // Draw the interface (current team's information, weapon's ammo)
+  // Draw the interface (current team information, weapon ammo)
   StatStart("GameDraw:interface");
   Interface::GetInstance()->Draw ();
   StatStop("GameDraw:interface");
@@ -376,8 +418,11 @@ void Game::PingClient() const
 // ####################################################################
 // ####################################################################
 
-void Game::Run()
+bool Game::Run()
 {
+  bool game_finished = false;
+  isGameLaunched = true;
+
   // Time to wait between 2 loops
   delay = 0;
   // Time to display the next frame
@@ -396,34 +441,35 @@ void Game::Run()
 
   } while(!IsGameFinished());
 
-  // the game is finished but we won't go at the results screen to fast!
+  // the game is finished but we won't go at the results screen too fast!
   if (IsGameFinished()) {
     EndOfGame();
+    game_finished = true;
   }
+
+  isGameLaunched = false;
+
   // * When debug is disabled : only show the result menu if game
-  // have 'regularly' finished (only one survivor or timeout reached)
+  //   have 'regularly' finished (only one survivor or timeout reached)
   // * When debug is disabled : still show the result menu everytime the game
-  // is quit during local games (so we can still the result menu often).
-  // For network game only show the result if the game is regularly finished
-  // (elsewise when someone if someone quit the game before the end, it appears
-  // as disconnected only when if finnishes viewing the f*cking result menu)
+  //   is quit during local games (so we can still the result menu often).
+  // For network game only, show the result if the game is regularly finished
+  // (elsewise when someone quits the game before the end, it appears
+  // as disconnected only when if finishes viewing the result menu)
 #ifndef DEBUG
-  if (IsGameFinished())
+  if (game_finished)
 #else
-  if (IsGameFinished() || Network::GetInstance()->IsLocal())
+  if (game_finished || Network::GetInstance()->IsLocal())
 #endif
     MessageEndOfGame();
 
-  // Fix bug #10613: ensure all teams are reseted as local teams
-  FOR_EACH_TEAM(team)
-    (**team).SetLocal();
+  return game_finished;
 }
 
 bool Game::HasBeenNetworkDisconnected() const
 {
   const Network* net          = Network::GetInstance();
-  bool           disconnected = !net->IsLocal() && net->cpu.empty();
-  return disconnected;
+  return !net->IsLocal() && net->cpu.empty();
 }
 
 void Game::MessageEndOfGame() const
@@ -499,7 +545,7 @@ bool Game::NewBox()
   // if started with "-d box", get one box per turn
   if (!IsLOGGING("box")) {
     // .7 is a magic number to get the probability of boxes falling once every round close to .333
-    double randValue = Random::GetDouble();
+    double randValue = RandomLocal().GetDouble();
     if(randValue > (1 - pow(.5, 1.0 / nbr_teams))) {
       return false;
     }
@@ -508,14 +554,14 @@ bool Game::NewBox()
   // Type of box : 1 = MedKit, 2 = Bonus Box.
   ObjBox * box;
   int type;
-  if(Random::GetBool()) {
+  if(RandomLocal().GetBool()) {
     box = new Medkit();
     type = 1;
   } else {
     box = new BonusBox();
     type = 2;
   }
-  // Randomize contain
+  // Randomize container
   box->Randomize();
   // Storing value of bonus box and send it over network.
   Action * a = new Action(Action::ACTION_NEW_BONUS_BOX);
@@ -553,12 +599,12 @@ void Game::Really_SetState(game_loop_state_t new_state)
 
   switch (state)
   {
-  // Begining of a new turn:
+  // Beginning of a new turn:
   case PLAYING:
     __SetState_PLAYING();
     break;
 
-  // The character have shooted, but can still move
+  // The character has shot, but can still move
   case HAS_PLAYED:
     __SetState_HAS_PLAYED();
     break;
@@ -592,7 +638,7 @@ void Game::SetState(game_loop_state_t new_state, bool begin_game) const
   MSG_DEBUG("game", "Ask for state %d", new_state);
 
   Action *a = new Action(Action::ACTION_GAMELOOP_SET_STATE);
-  int seed = randomSync.GetRand();
+  int seed = RandomSync().GetRand();
   a->Push(seed);
   a->Push(new_state);
   ActionHandler::GetInstance()->NewAction(a);
@@ -610,7 +656,7 @@ PhysicalObj* Game::GetMovingObject() const
   {
     if (!character->IsImmobile() && !character->IsGhost())
     {
-      MSG_DEBUG("game.endofturn", "%s is not ready", character->GetName().c_str());
+      MSG_DEBUG("game.endofturn", "Character (%s) is not ready", character->GetName().c_str());
       return &(*character);
     }
   }
@@ -619,12 +665,18 @@ PhysicalObj* Game::GetMovingObject() const
   {
     if (!(*object)->IsImmobile())
     {
-      MSG_DEBUG("game.endofturn", "%s is moving", (*object)->GetName().c_str());
+      MSG_DEBUG("game.endofturn", "Object (%s) is moving", (*object)->GetName().c_str());
       return (*object);
     }
   }
 
-  return ParticleEngine::IsSomethingMoving();
+  PhysicalObj *obj = ParticleEngine::IsSomethingMoving();
+  if (obj != NULL)
+    {
+      MSG_DEBUG("game.endofturn", "ParticleEngine (%s) is moving", obj->GetName().c_str());
+      return obj;
+    }
+  return NULL;
 }
 
 bool Game::IsAnythingMoving() const
@@ -638,7 +690,6 @@ bool Game::IsAnythingMoving() const
 
   if (GetMovingObject() != NULL)
     return true;
-
   return false;
 }
 
@@ -648,39 +699,58 @@ void Game::SignalCharacterDeath (const Character *character) const
   std::string txt;
 
   ASSERT(IsGameLaunched());
+  if (character->IsGhost()) {
+    txt = Format(_("%s from %s team has fallen off the map!"),
+                 character->GetName().c_str(),
+                 character->GetTeam().GetName().c_str());
+    JukeBox::GetInstance()->Play(ActiveTeam().GetSoundProfile(), "out");
 
-  if (character -> IsDrowned()) {
-    txt = Format(_("%s has fallen in water."), character -> GetName().c_str());
+  } else if (character->IsDrowned() ) {
+    txt = Format(_("%s from %s team has fallen into the water!"),
+                 character->GetName().c_str(),
+                 character->GetTeam().GetName().c_str());
 
   } else if (&ActiveCharacter() == character) { // Active Character is dead
     CharacterCursor::GetInstance()->Hide();
 
     // Is this a suicide ?
     if (ActiveTeam().GetWeaponType() == Weapon::WEAPON_SUICIDE) {
-      txt = Format(_("%s commits suicide !"), character -> GetName().c_str());
+      txt = Format(_("%s from %s team commited suicide!"),
+                   character->GetName().c_str(),
+                   character->GetTeam().GetName().c_str());
 
-      // Dead in moving ?
+      // Dead while moving ?
     } else if (state == PLAYING) {
-      txt = Format(_("%s has fallen off the map!"),
-                   character -> GetName().c_str());
+      txt = Format(_("%s from %s team has hit the ground too hard!"),
+                   character->GetName().c_str(),
+                   character->GetTeam().GetName().c_str());
        JukeBox::GetInstance()->Play(ActiveTeam().GetSoundProfile(), "out");
 
-      // The playing character killed hisself
+      // The playing character killed himself
+    } else {
+      txt = Format(_("%s from %s team is dead because he is clumsy!"),
+                   character->GetName().c_str(),
+                   character->GetTeam().GetName().c_str());
+    }
+  }
+  // Did the active player kill someone of his own team ?
+  else if ( character->GetTeam().IsSameAs(ActiveTeam()) ) {
+    if (ActiveCharacter().IsDead()) {
+      txt = Format(_("%s took a member of the %s team to the grave with him!"),
+                   ActiveCharacter().GetName().c_str(),
+                   character->GetTeam().GetName().c_str());
     } else {
-      txt = Format(_("%s is dead because he is clumsy!"),
-                   character -> GetName().c_str());
+      txt = Format(_("%s is a psychopath, he has killed a member of the %s team!"),
+                   ActiveCharacter().GetName().c_str(),
+                   character->GetTeam().GetName().c_str());
     }
-  } else if (!ActiveCharacter().IsDead()
-             && character->GetTeam().IsSameAs(ActiveTeam()) ) {
-    txt = Format(_("%s is a psychopath, he has killed a member of the %s team!"),
-                 ActiveCharacter().GetName().c_str(), character->GetTeam().GetName().c_str());
   } else if (ActiveTeam().GetWeaponType() == Weapon::WEAPON_GUN) {
     txt = Format(_("What a shame for %s - he was killed by a simple gun!"),
-                 character -> GetName().c_str());
+                 character->GetName().c_str());
   } else {
-    txt = Format(_("%s (%s) has died."),
-                 character -> GetName().c_str(),
-                 character -> GetTeam().GetName().c_str());
+    txt = Format(_("%s from %s team has died."),
+                 character->GetName().c_str(),
+                 character->GetTeam().GetName().c_str());
   }
 
   GameMessages::GetInstance()->Add (txt);
diff --git a/src/game/game.h b/src/game/game.h
index e5d57b5..2cdd3fa 100644
--- a/src/game/game.h
+++ b/src/game/game.h
@@ -42,13 +42,8 @@ public:
     END_TURN = 2
   } game_loop_state_t;
 
-  typedef enum {
-    CLASSIC = 0,
-    BLITZ   = 1
-  } game_mode_t;
-
 protected:
-  virtual void Run();         // Main loop
+  virtual bool Run();         // Main loop
 
   bool IsAnythingMoving() const;
   void MainLoop();
@@ -65,12 +60,11 @@ protected:
   virtual ~Game();
 
 private:
-  static game_mode_t  mode;
-
+  static std::string  current_mode_name;
 
   bool                isGameLaunched;
   ObjBox              *current_ObjBox;
-  // Set the user requested a pause/end of the game
+  // Set that the user requested a pause/end of the game
   bool                ask_for_menu;
 
   FramePerSecond      *fps;
@@ -86,7 +80,7 @@ private:
 
   void Draw();        // Draw to screen
   void MessageLoading() const;
-  void UnloadDatas() const;
+  void UnloadDatas(bool game_finished) const;
 
   // Input management (keyboard/mouse)
   void RefreshInput();
@@ -113,13 +107,15 @@ private:
 
 public:
   static Game * GetInstance();
-  static void SetMode(game_mode_t m) { CleanUp(); mode = m; };
   static std::string GetUniqueId();
   static void ResetUniqueIds();
 
   bool                character_already_chosen;
   Chat                chatsession;
 
+  // Set mode
+  static Game * UpdateGameMode();
+
   void Start();
   void Init();
 
diff --git a/src/game/game_blitz.cpp b/src/game/game_blitz.cpp
index 2277128..27f8915 100644
--- a/src/game/game_blitz.cpp
+++ b/src/game/game_blitz.cpp
@@ -73,7 +73,7 @@ GameBlitz::time_iterator GameBlitz::KillTeam(GameBlitz::time_iterator cur)
   return times.end();
 }
 
-void GameBlitz::Run()
+bool GameBlitz::Run()
 {
   // Make sure map is empty
   times.clear();
@@ -83,7 +83,7 @@ void GameBlitz::Run()
   }
 
   counter = 0;;
-  Game::Run();
+  return Game::Run();
 }
 
 void GameBlitz::RefreshClock()
@@ -99,6 +99,7 @@ void GameBlitz::RefreshClock()
       counter--;
     } else {
       time_iterator cur = GetCurrentTeam();
+
       uint duration = cur->second;
 
       switch (state) {
@@ -147,7 +148,8 @@ void GameBlitz::RefreshClock()
         }
       } // switch
 
-      cur->second = duration;
+      if (cur != times.end())
+        cur->second = duration;
     }// if !counter
   }
 }
@@ -157,7 +159,7 @@ uint GameBlitz::GetRemainingTime() const
   return times.find(&ActiveTeam())->second;
 }
 
-// Begining of a new turn
+// Beginning of a new turn
 void GameBlitz::__SetState_PLAYING()
 {
   MSG_DEBUG("game.statechange", "Playing" );
@@ -178,8 +180,7 @@ void GameBlitz::__SetState_PLAYING()
     {
       GetTeamsList().NextTeam();
 
-      if ( GameMode::GetInstance()->allow_character_selection==GameMode::CHANGE_ON_END_TURN
-           || GameMode::GetInstance()->allow_character_selection==GameMode::BEFORE_FIRST_ACTION_AND_END_TURN)
+      if ( GameMode::GetInstance()->auto_change_character )
         {
           ActiveTeam().NextCharacter();
         }
@@ -188,10 +189,10 @@ void GameBlitz::__SetState_PLAYING()
 
       if ( Network::GetInstance()->IsTurnMaster() )
         {
-          // Tell to clients which character in the team is now playing
+          // Tell clients which character in the team is now playing
           Action playing_char(Action::ACTION_GAMELOOP_CHANGE_CHARACTER);
           playing_char.StoreActiveCharacter();
-          Network::GetInstance()->SendAction(&playing_char);
+          Network::GetInstance()->SendAction(playing_char);
 
           printf("Action_ChangeCharacter:\n");
           printf("char_index = %i\n",ActiveCharacter().GetCharacterIndex());
@@ -212,7 +213,7 @@ void GameBlitz::__SetState_PLAYING()
   Interface::GetInstance()->EnableDisplayTimer(true);
   pause_seconde = Time::GetInstance()->Read();
 
-  give_objbox = true; //hack make it so no more than one objbox per turn
+  give_objbox = true; //hack: make it so that no more than one objbox per turn
 }
 
 void GameBlitz::__SetState_HAS_PLAYED()
@@ -239,12 +240,10 @@ bool GameBlitz::IsGameFinished() const
   uint num = 0;
 
   for (std::map<Team*, uint>::const_iterator it = times.begin(); it != times.end(); ++it) {
-    if (it->second != 0)
+    if (it->second != 0 && it->first->NbAliveCharacter())
       num++;
-
-    // If more than one team with time left > 0, not finished
-    if (num>1)
-      return false;
   }
-  return true;
+
+  // If more than one team with time left > 0 and alive character, game not finished
+  return (num < 2);
 }
diff --git a/src/game/game_blitz.h b/src/game/game_blitz.h
index 5e278ba..ef54d3f 100644
--- a/src/game/game_blitz.h
+++ b/src/game/game_blitz.h
@@ -34,9 +34,9 @@ public:
   uint    counter;
 
   GameBlitz();
-  
+
   // Overload it to retrieve teams.
-  void Run();
+  bool Run();
 
   // Get remaining time to play
   uint GetRemainingTime() const;
diff --git a/src/game/game_classic.cpp b/src/game/game_classic.cpp
index 62b09c9..dc602da 100644
--- a/src/game/game_classic.cpp
+++ b/src/game/game_classic.cpp
@@ -78,9 +78,13 @@ void GameClassic::RefreshClock()
 	  SetState(END_TURN);
         } else {
           duration--;
-          Interface::GetInstance()->UpdateTimer(duration);
-	  if (duration <= 5) {
-	    JukeBox::GetInstance()->Play("share", "time/bip");
+	  if (duration == 12) {
+	    countdown_sample.Play("share", "countdown-end_turn");
+	  }
+	  if (duration > 10) {
+	    Interface::GetInstance()->UpdateTimer(duration, black_color);
+	  } else {
+	    Interface::GetInstance()->UpdateTimer(duration, primary_red_color);
 	  }
         }
         break;
@@ -99,7 +103,7 @@ void GameClassic::RefreshClock()
 
           if (IsAnythingMoving()) {
             duration = 1;
-            // Hack to be sure that nothing is moving since enough time
+            // Hack to be sure that nothing is moving since long enough
             // it avoids giving hand to another team during the end of an explosion for example
             break;
           }
@@ -131,7 +135,7 @@ uint GameClassic::GetRemainingTime() const
   return duration;
 }
 
-// Begining of a new turn
+// Beginning of a new turn
 void GameClassic::__SetState_PLAYING()
 {
   MSG_DEBUG("game.statechange", "Playing" );
@@ -158,8 +162,7 @@ void GameClassic::__SetState_PLAYING()
     {
       GetTeamsList().NextTeam();
 
-      if ( GameMode::GetInstance()->allow_character_selection==GameMode::CHANGE_ON_END_TURN
-           || GameMode::GetInstance()->allow_character_selection==GameMode::BEFORE_FIRST_ACTION_AND_END_TURN)
+      if ( GameMode::GetInstance()->auto_change_character)
         {
           ActiveTeam().NextCharacter();
         }
@@ -168,10 +171,10 @@ void GameClassic::__SetState_PLAYING()
 
       if ( Network::GetInstance()->IsTurnMaster() )
         {
-          // Tell to clients which character in the team is now playing
+          // Tell clients which character in the team is now playing
           Action playing_char(Action::ACTION_GAMELOOP_CHANGE_CHARACTER);
           playing_char.StoreActiveCharacter();
-          Network::GetInstance()->SendAction(&playing_char);
+          Network::GetInstance()->SendAction(playing_char);
 
           printf("Action_ChangeCharacter:\n");
           printf("char_index = %i\n",ActiveCharacter().GetCharacterIndex());
@@ -187,7 +190,7 @@ void GameClassic::__SetState_PLAYING()
         Network::GetInstance()->SetTurnMaster(false);
     }
 
-  give_objbox = true; //hack make it so no more than one objbox per turn
+  give_objbox = true; //hack: make it so that there is no more than one objbox per turn
 }
 
 void GameClassic::__SetState_HAS_PLAYED()
@@ -202,6 +205,7 @@ void GameClassic::__SetState_HAS_PLAYED()
 void GameClassic::__SetState_END_TURN()
 {
   MSG_DEBUG("game.statechange", "End of turn");
+  countdown_sample.Stop();
   ActiveTeam().AccessWeapon().SignalTurnEnd();
   ActiveTeam().AccessWeapon().Deselect();
   CharacterCursor::GetInstance()->Hide();
diff --git a/src/game/game_classic.h b/src/game/game_classic.h
index fc815ac..0a35b0b 100644
--- a/src/game/game_classic.h
+++ b/src/game/game_classic.h
@@ -23,10 +23,14 @@
 #define GAME_CLASSIC_H
 
 #include "game/game.h"
+#include "sound/sound_sample.h"
 
 class GameClassic : public Game
 {
   uint duration;
+
+  SoundSample countdown_sample;
+
   /* If you need this, implement it (correctly)*/
   GameClassic(const GameClassic&);
   GameClassic operator=(const GameClassic&);
diff --git a/src/game/game_init.cpp b/src/game/game_init.cpp
index 0fea6c7..0e487a2 100644
--- a/src/game/game_init.cpp
+++ b/src/game/game_init.cpp
@@ -50,7 +50,7 @@ void GameInit::InitGameData_NetServer()
 {
   Network::GetInstanceServer()->RejectIncoming();
 
-  randomSync.Init();
+  RandomSync().InitRandom();
 
   GameMode::GetInstance()->Load();
   SendGameMode();
@@ -71,7 +71,7 @@ void GameInit::EndInitGameData_NetServer()
 
   // Before playing we should check that init phase happens correctly on all clients
   Action a(Action::ACTION_NETWORK_CHECK_PHASE1);
-  Network::GetInstance()->SendAction(&a);
+  Network::GetInstance()->SendAction(a);
 
   while (Network::IsConnected()
          && Network::GetInstanceServer()->GetNbCheckedPlayers() + 1  != Network::GetInstanceServer()->GetNbConnectedPlayers())
@@ -108,8 +108,6 @@ void GameInit::InitMap()
   Camera::GetInstance()->ResetShake();
   loading_sreen.StartLoading(1, "map_icon", _("Maps"));
   world.Reset();
-  MapsList::GetInstance()->ActiveMap()->FreeData();
-
   lst_objects.PlaceBarrels();
 }
 
@@ -159,7 +157,7 @@ void GameInit::InitData()
   if (Network::GetInstance()->IsServer())
     InitGameData_NetServer();
   else if (Network::GetInstance()->IsLocal())
-    randomSync.Init();
+    RandomSync().InitRandom();
 
   // GameMode::GetInstance()->Load(); : done in the game menu to adjust some parameters for local games
   // done in action_handler for clients
diff --git a/src/game/game_mode.cpp b/src/game/game_mode.cpp
index bb61616..650a09c 100644
--- a/src/game/game_mode.cpp
+++ b/src/game/game_mode.cpp
@@ -46,7 +46,8 @@ GameMode::GameMode():
   barrel_explosion_cfg(),
   bonus_box_explosion_cfg(),
   character(),
-  allow_character_selection(BEFORE_FIRST_ACTION_AND_END_TURN),
+  auto_change_character(true),
+  allow_character_selection(BEFORE_FIRST_ACTION),
   m_current("classic"),
   doc_objects(new XmlReader)
 {
@@ -74,8 +75,10 @@ const std::string& GameMode::GetName() const
 }
 
 // Load data options from the selected game_mode
-bool GameMode::LoadXml(xmlNode* xml)
+bool GameMode::LoadXml(const xmlNode* xml)
 {
+  XmlReader::ReadBool(xml, "auto_change_character", auto_change_character);
+
   std::string txt;
   if (XmlReader::ReadString(xml, "allow_character_selection", txt))
   {
@@ -83,12 +86,10 @@ bool GameMode::LoadXml(xmlNode* xml)
       allow_character_selection = ALWAYS;
     else if (txt == "never")
       allow_character_selection = NEVER;
-    else if (txt == "change_on_end_turn")
-      allow_character_selection = CHANGE_ON_END_TURN;
-    else if (txt == "before_first_action_and_end_turn")
-      allow_character_selection = BEFORE_FIRST_ACTION_AND_END_TURN;
     else if (txt == "before_first_action")
       allow_character_selection = BEFORE_FIRST_ACTION;
+    else
+      fprintf(stderr, "%s is not a valid option for \"allow_character_selection\"\n", txt.c_str());
   }
 
   XmlReader::ReadUint(xml, "duration_turn", duration_turn);
@@ -103,10 +104,10 @@ bool GameMode::LoadXml(xmlNode* xml)
   XmlReader::ReadDouble(xml, "damage_per_fall_unit", damage_per_fall_unit);
 
   // Character options
-  xmlNode* character_xml = XmlReader::GetMarker(xml, "character");
+  const xmlNode* character_xml = XmlReader::GetMarker(xml, "character");
   if (character_xml != NULL)
   {
-    xmlNode* item = XmlReader::GetMarker(character_xml, "energy");
+    const xmlNode* item = XmlReader::GetMarker(character_xml, "energy");
     if (item != NULL) {
       XmlReader::ReadUintAttr(item, "initial", character.init_energy);
       XmlReader::ReadUintAttr(item, "maximum", character.max_energy);
@@ -138,21 +139,21 @@ bool GameMode::LoadXml(xmlNode* xml)
       character.back_jump_angle = static_cast<double>(angle_deg) * M_PI / 180;
     }
     XmlReader::ReadUint(character_xml, "walking_pause", character.walking_pause);
-    xmlNode* explosion = XmlReader::GetMarker(character_xml, "death_explosion");
+    const xmlNode* explosion = XmlReader::GetMarker(character_xml, "death_explosion");
     if (explosion != NULL)
       death_explosion_cfg.LoadXml(explosion);
   }
 
   // Barrel explosion
-  xmlNode* barrel_xml = XmlReader::GetMarker(xml, "barrel");
+  const xmlNode* barrel_xml = XmlReader::GetMarker(xml, "barrel");
   if(barrel_xml != NULL) {
-    xmlNode* barrel_explosion = XmlReader::GetMarker(barrel_xml, "explosion");
+    const xmlNode* barrel_explosion = XmlReader::GetMarker(barrel_xml, "explosion");
     if (barrel_explosion != NULL)
       barrel_explosion_cfg.LoadXml(barrel_explosion);
   }
 
   //=== Weapons ===
-  xmlNode* weapons_xml = XmlReader::GetMarker(xml, "weapons");
+  const xmlNode* weapons_xml = XmlReader::GetMarker(xml, "weapons");
   if (weapons_xml != NULL)
   {
     std::list<Weapon*> l_weapons_list = WeaponsList::GetInstance()->GetList() ;
@@ -165,17 +166,17 @@ bool GameMode::LoadXml(xmlNode* xml)
   }
 
   // Bonus box explosion - must be loaded after the weapons.
-  xmlNode* bonus_box_xml = XmlReader::GetMarker(xml, "bonus_box");
+  const xmlNode* bonus_box_xml = XmlReader::GetMarker(xml, "bonus_box");
   if(bonus_box_xml != NULL) {
     BonusBox::LoadXml(bonus_box_xml);
 
-    xmlNode* bonus_box_explosion = XmlReader::GetMarker(bonus_box_xml, "explosion");
+    const xmlNode* bonus_box_explosion = XmlReader::GetMarker(bonus_box_xml, "explosion");
     if (bonus_box_explosion != NULL)
       bonus_box_explosion_cfg.LoadXml(bonus_box_explosion);
   }
 
   // Medkit - reuses the bonus_box explosion.
-  xmlNode* medkit_xml = XmlReader::GetMarker(xml, "medkit");
+  const xmlNode* medkit_xml = XmlReader::GetMarker(xml, "medkit");
   if(medkit_xml != NULL) {
     Medkit::LoadXml(medkit_xml);
   }
@@ -188,7 +189,7 @@ bool GameMode::Load(void)
   std::string fullname;
   Config * config = Config::GetInstance();
   m_current = config->GetGameMode();
-  
+
   // Game mode objects configuration file
   fullname = config->GetPersonalDataDir() + GetObjectsFilename();
 
@@ -196,7 +197,7 @@ bool GameMode::Load(void)
     fullname = config->GetDataDir() + GetObjectsFilename();
 
   if(!DoesFileExist(fullname)) {
-    Error(Format("Can not find file %s\n", fullname.c_str()));
+    Error(Format("Can not find file %s", fullname.c_str()));
     return false;
   }
 
@@ -212,7 +213,7 @@ bool GameMode::Load(void)
     fullname = config->GetDataDir() + GetFilename();
 
   if(!DoesFileExist(fullname)) {
-    Error(Format("Can not find file %s\n", fullname.c_str()));
+    Error(Format("Can not find file %s", fullname.c_str()));
     return false;
   }
 
@@ -288,15 +289,14 @@ bool GameMode::AllowCharacterSelection() const
 {
   switch (allow_character_selection)
   {
-  case GameMode::ALWAYS: break;
+  case GameMode::ALWAYS:
+    break;
 
   case GameMode::BEFORE_FIRST_ACTION:
-  case GameMode::BEFORE_FIRST_ACTION_AND_END_TURN:
-          return (Game::GetInstance()->ReadState() == Game::PLAYING) && !Game::GetInstance()->character_already_chosen;
+    return (Game::GetInstance()->ReadState() == Game::PLAYING) && !Game::GetInstance()->character_already_chosen;
 
-  case GameMode::CHANGE_ON_END_TURN:
   case GameMode::NEVER:
-          return false;
+    return false;
   }
 
   return true;
diff --git a/src/game/game_mode.h b/src/game/game_mode.h
index 6c28696..9df6d8b 100644
--- a/src/game/game_mode.h
+++ b/src/game/game_mode.h
@@ -63,21 +63,22 @@ public:
     uint walking_pause;
   } character;
 
-  int allow_character_selection;
+  bool auto_change_character;
 
-  enum {
+  typedef enum {
     ALWAYS = 0,
     BEFORE_FIRST_ACTION,
-    BEFORE_FIRST_ACTION_AND_END_TURN,
-    CHANGE_ON_END_TURN,
     NEVER
-  };
+  } manual_change_character_t;
+
+  manual_change_character_t allow_character_selection;
+
 private:
   std::string m_current;
 
   XmlReader* doc_objects;
 
-  bool LoadXml (xmlNode* xml);
+  bool LoadXml (const xmlNode* xml);
   bool ExportFileToString(const std::string& filename, std::string& contents) const;
 
   std::string GetFilename() const;
diff --git a/src/graphic/color.cpp b/src/graphic/color.cpp
index 51cc6ac..1d1a497 100644
--- a/src/graphic/color.cpp
+++ b/src/graphic/color.cpp
@@ -22,40 +22,11 @@
 #include "graphic/color.h"
 #include <SDL.h>
 
-Color::Color(){
-        SetColor(200, 50, 50, 130);
-}
-
-Color::Color(Uint8 r, Uint8 g, Uint8 b, Uint8 a){
-        SetColor(r, g, b, a);
-}
-
-bool Color::operator==(const Color &color) const{
-        return red == color.red
-               && green == color.green
-               && blue == color.blue
-               && alpha == color.alpha;
-}
-
-bool Color::operator!=(const Color & color) const{
-        return red != color.red
-	  || green != color.green
-	  || blue != color.blue
-	  || alpha != color.alpha;
-}
-
 Color Color::operator*(const Color &fact) const{
-        return Color((Uint8) ((Uint32)red * fact.red / 255),
-                     (Uint8) ((Uint32)green * fact.green / 255),
-                     (Uint8) ((Uint32)blue * fact.blue / 255),
-                     (Uint8) ((Uint32)alpha * fact.alpha / 255));
-}
-
-void Color::SetColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a){
-        red = r;
-        green = g;
-        blue = b;
-        alpha = a;
+  return Color((Uint8) ((Uint32)red * fact.red / 255),
+               (Uint8) ((Uint32)green * fact.green / 255),
+               (Uint8) ((Uint32)blue * fact.blue / 255),
+               (Uint8) ((Uint32)alpha * fact.alpha / 255));
 }
 
 SDL_Color Color::GetSDLColor() const{
diff --git a/src/graphic/color.h b/src/graphic/color.h
index e5b4cac..e830283 100644
--- a/src/graphic/color.h
+++ b/src/graphic/color.h
@@ -34,19 +34,27 @@ class Color
     Uint8 alpha;
 
   public:
-    Color();
-    Color(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+    Color(Uint8 r = 200, Uint8 g = 50, Uint8 b = 50, Uint8 a = 130)
+      { SetColor(r, g, b, a); }
 
-    bool operator==(const Color &color) const;
-    bool operator!=(const Color &color) const;
+    bool operator==(const Color &c) const
+      { return red==c.red && green==c.green && blue==c.blue && alpha==c.alpha; }
+    bool operator!=(const Color &c) const
+      { return red!=c.red || green!=c.green || blue!=c.blue || alpha!=c.alpha; }
     Color operator*(const Color &fact) const;
 
-    void SetColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-    Uint8 GetRed() const { return red; };
-    Uint8 GetGreen() const { return green; };
-    Uint8 GetBlue() const { return blue; };
-    Uint8 GetAlpha() const { return alpha; };
+    void SetColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+    {
+      red = r;
+      green = g;
+      blue = b;
+      alpha = a;
+    }
+
+    Uint8 GetRed() const { return red; }
+    Uint8 GetGreen() const { return green; }
+    Uint8 GetBlue() const { return blue; }
+    Uint8 GetAlpha() const { return alpha; }
     Uint32 GetColor() const;
 
     SDL_Color GetSDLColor() const;
diff --git a/src/graphic/composite_shape.cpp b/src/graphic/composite_shape.cpp
index d6219fb..dfe3781 100644
--- a/src/graphic/composite_shape.cpp
+++ b/src/graphic/composite_shape.cpp
@@ -65,7 +65,7 @@ void CompositeShape::DrawOnScreen()
   int i = 0;
   for(std::vector<Polygon *>::iterator poly = layers.begin();
       poly != layers.end(); poly++, i++) {
-    (*poly)->Draw(&AppWormux::GetInstance()->video->window);
+    (*poly)->Draw(&GetMainWindow());
     if(i == 0) {
       min = (*poly)->GetMin();
       max = (*poly)->GetMax();
diff --git a/src/graphic/effects.cpp b/src/graphic/effects.cpp
index 1fbde10..e76e702 100644
--- a/src/graphic/effects.cpp
+++ b/src/graphic/effects.cpp
@@ -24,7 +24,7 @@
 
 //Make the sdl_surface 'a', do a wave of 'nbr_frames', and last 'duration' milliseconds.
 //wave_amp is the amplitude of the wave on the left and the right side of the sprite
-//wave_per is the number of periode of the wave when it is waved at the maximum
+//wave_per is the number of periods of the wave when it is waved at the maximum
 //used on the skin during teleportation
 Sprite* WaveSurface(Surface &a, unsigned int nbr_frames,
                     unsigned int duration, float wave_amp, float wave_per){
@@ -60,7 +60,7 @@ Sprite* WaveSurface(Surface &a, unsigned int nbr_frames,
 }
 
 // Modify the scale of 'spr' to make it deform as if it was rebounding
-// dy return the offset that should be used to display the sprite
+// dy returns the offset that should be used to display the sprite
 // at the good position t0 time when we began to rebound
 // per time to do one full rebound
 // dy_max offset max of the rebound ( 0 <= dy <= dy_max )
@@ -89,9 +89,9 @@ void Rebound(Sprite* spr, int &dy, uint t0, uint per, int dy_max)
 }
 
 //Returns value of y_stretch and y, to be used on an object, to make him do
-// a gelatine like shaking.
+// a gelatin-like shaking.
 // stretch_y: number of pixel to stretch the img
-// t0 : time of begining of the effect in milliseconds
+// t0 : beginning time of the effect in milliseconds
 // amp: amplitude of the oscillation in pixel
 // dur: duration of the oscillation in milliseconds
 // per: number of oscillations
@@ -105,7 +105,7 @@ void Gelatine (int &y, int &stretch_y, uint t0, uint amp, uint dur, uint per)
     return;
   }
 
-  //Amplitude decrease linearly with time
+  //Amplitude decreases linearly with time
   amp = amp * (dur - dt) / dur;
 
   //Scale
diff --git a/src/graphic/font.cpp b/src/graphic/font.cpp
index ddfc0b5..dc4e6bc 100644
--- a/src/graphic/font.cpp
+++ b/src/graphic/font.cpp
@@ -35,7 +35,7 @@ bool  Font::LIB_INIT = false;
  * Constants
  */
 // Size
-const int Font::FONT_SIZE[] = {40, 32, 24, 16, 12, 8};
+const int Font::FONT_SIZE[] = {40, 32, 24, 16, 12, 10};
 
 Font* Font::GetInstance(font_size_t ftype, font_style_t fstyle) {
   Font * font = NULL;
@@ -156,7 +156,7 @@ void Font::SetItalic()
 }
 
 void Font::Write(const Point2i& pos, const Surface &surface) const {
-  AppWormux::GetInstance()->video->window.Blit(surface, pos);
+  GetMainWindow().Blit(surface, pos);
 
   // TODO: Remove this line! (and use GameFont instead of Font)
   world.ToRedrawOnScreen( Rectanglei(pos, surface.GetSize()) );
diff --git a/src/graphic/fps.cpp b/src/graphic/fps.cpp
index 2c4a5a5..46f5f75 100644
--- a/src/graphic/fps.cpp
+++ b/src/graphic/fps.cpp
@@ -100,6 +100,6 @@ void FramePerSecond::Draw(){
   snprintf(buffer, sizeof(buffer)-1, "%.1f", average);
   buffer[sizeof(buffer)-1] = '\0';
   text->Set (Format(_("%s fps"), buffer));
-  text->DrawTopRight(Point2i(AppWormux::GetInstance()->video->window.GetWidth()-1,0));
+  text->DrawTopRight(Point2i(GetMainWindow().GetWidth()-1,0));
 }
 
diff --git a/src/graphic/polygon.cpp b/src/graphic/polygon.cpp
index d6a256b..eda92c3 100644
--- a/src/graphic/polygon.cpp
+++ b/src/graphic/polygon.cpp
@@ -20,17 +20,18 @@
  *****************************************************************************/
 
 #include "graphic/polygon.h"
-#include "tool/affine_transform.h"
 #include "graphic/sprite.h"
-#include "tool/random.h"
 #include "graphic/video.h"
 #include "include/app.h"
 #include "map/map.h"
+#include "network/randomsync.h"
+#include "tool/affine_transform.h"
+
 
 //=========== POLYGON BUFFER ============ //
 // Use this structure to store transformed point
 // In affine transformation, never transform directly the original point !
-// If you do it, your point will becoming dented.
+// If you do it, your point will become dented.
 
 PolygonBuffer::PolygonBuffer()
 {
@@ -175,7 +176,7 @@ Point2i PolygonItem::GetOffsetAlignment() const
 }
 
 //=========== POLYGON ============ //
-// Store a vector of point and handle affine transformation,
+// Store a vector of points and handle affine transformation,
 // Bezier interpolation handling etc.
 
 Polygon::Polygon()
@@ -309,7 +310,7 @@ bool Polygon::IsClockWise() const
   return (b.x - a.x) * (c.y - a.y) - (c.x - a.x) * (b.y - a.y) < 0;
 }
 
-// Not accurate at 100% but sufficent for the moment
+// Not 100% accurate but sufficient for now
 bool Polygon::IsOverlapping(const Polygon & poly) const
 {
   for(int i = 0; i < GetNbOfPoint(); i++) {
@@ -353,7 +354,7 @@ void Polygon::InsertPoint(int index, const Point2d & p)
   vector_tmp.push_back(p);
   shape_buffer->vx[i] = (int)p.x;
   shape_buffer->vy[i++] = (int)p.y;
-  // And interting remaining point of previous shape
+  // And inserting remaining points of previous shape
   for(; point != original_shape.end(); point++, i++) {
     tmp = *point;
     vector_tmp.push_back(tmp);
@@ -470,7 +471,7 @@ Point2d Polygon::GetRandomUpperPoint()
   std::vector<Point2d>::iterator point = transformed_shape.begin();
   Point2d tmp, previous;
   tmp = *point;
-  int start = Random::GetInt(0, GetNbOfPoint());
+  int start = RandomSync().GetInt(0, GetNbOfPoint());
   int i;
   for(i = 0; i < start; i++)
     point++;
@@ -490,8 +491,8 @@ int Polygon::GetNbOfPoint() const
   return (int)original_shape.size();
 }
 
-// And the famous Bezier curve. And this algorithme is that simple ? I'm so disappointed !
-// But now you can say to the world wormux is using Bezier curve.
+// And the famous Bezier curve. And this algorithm is that simple ? I'm so disappointed !
+// But now you can tell the world wormux is using Bezier curves.
 void Polygon::AddBezierCurve(const Point2d& anchor1, const Point2d& control1,
                              const Point2d& control2, const Point2d& anchor2,
                              const int num_steps, const bool add_first_point,
@@ -522,8 +523,8 @@ void Polygon::AddRandomCurve(const Point2d& start, const Point2d& end,
   if(add_first_point)
     AddPoint(start);
   for (int i = 1; i < num_steps - 1; i++) {
-    AddPoint(start + (step * i) + Point2d(Random::GetDouble(-x_random_offset, x_random_offset),
-                                          Random::GetDouble(-y_random_offset, y_random_offset)));
+    AddPoint(start + (step * i) + Point2d(RandomSync().GetDouble(-x_random_offset, x_random_offset),
+                                          RandomSync().GetDouble(-y_random_offset, y_random_offset)));
   }
   if(add_last_point)
     AddPoint(end);
@@ -558,9 +559,9 @@ Polygon * Polygon::GetBezierInterpolation(double smooth_value, int num_steps, do
 
     // Randomization
     if(rand != 0.0) {
-      trans.SetRotation(Random::GetDouble(-rand, rand));
+      trans.SetRotation(RandomSync().GetDouble(-rand, rand));
       v1 = trans * v1;
-      trans.SetRotation(Random::GetDouble(-rand, rand));
+      trans.SetRotation(RandomSync().GetDouble(-rand, rand));
       v2 = trans * v2;
     }
 
@@ -694,6 +695,6 @@ void Polygon::Draw(Surface * dest)
 
 void Polygon::DrawOnScreen()
 {
-  Draw(&AppWormux::GetInstance()->video->window);
+  Draw(&GetMainWindow());
   world.ToRedrawOnScreen(GetRectangleToRefresh());
 }
diff --git a/src/graphic/polygon_generator.cpp b/src/graphic/polygon_generator.cpp
index e019176..a1ee0fc 100644
--- a/src/graphic/polygon_generator.cpp
+++ b/src/graphic/polygon_generator.cpp
@@ -69,7 +69,7 @@ Polygon * PolygonGenerator::GenerateDentedCircle(double diameter, int nb_point,
   AffineTransform2D trans = AffineTransform2D();
   Point2d top;
   for(int i = 0; i < nb_point; i++) {
-    top = Point2d(0.0, (diameter + Random::GetDouble(-rand_offset, rand_offset)) / 2.0);
+    top = Point2d(0.0, (diameter + RandomLocal().GetDouble(-rand_offset, rand_offset)) / 2.0);
     trans.SetRotation((2.0 * M_PI * -i) / nb_point);
     tmp->AddPoint(trans * top);
   }
@@ -101,10 +101,10 @@ Polygon * PolygonGenerator::GenerateRoundedRectangle(double width, double height
 
 Polygon * PolygonGenerator::GenerateRandomShape()
 {
-  double height = Random::GetDouble(400.0, 600.0);
-  double width  = Random::GetDouble(400.0, 2000.0);
-  return GenerateRandomTrapeze(width, height, Random::GetDouble(10.0, 15.0), Random::GetDouble(10.0, 15.0),
-                               Random::GetSign() * Random::GetDouble(0.5, 1.0));
+  double height = RandomLocal().GetDouble(400.0, 600.0);
+  double width  = RandomLocal().GetDouble(400.0, 2000.0);
+  return GenerateRandomTrapeze(width, height, RandomLocal().GetDouble(10.0, 15.0), RandomLocal().GetDouble(10.0, 15.0),
+                               RandomLocal().GetSign() * RandomLocal().GetDouble(0.5, 1.0));
 }
 
 Polygon * PolygonGenerator::GenerateRandomTrapeze(const double width, const double height,
@@ -116,23 +116,23 @@ Polygon * PolygonGenerator::GenerateRandomTrapeze(const double width, const doub
   // XXX Unused !?
   // int number_of_upper_point;
   Polygon * tmp = new Polygon();
-  number_of_side_point = 1 + (int)Random::GetDouble((height * 0.25) / MIN_SPACE_BETWEEN_POINT,
+  number_of_side_point = 1 + (int)RandomLocal().GetDouble((height * 0.25) / MIN_SPACE_BETWEEN_POINT,
                                      height / MIN_SPACE_BETWEEN_POINT);
   if(coef > 0.0) {
     upper_width = width;
     lower_width = width * coef;
-    upper_offset = Random::GetDouble(0.0, width - lower_width);
+    upper_offset = RandomLocal().GetDouble(0.0, width - lower_width);
     lower_offset = 0.0;
   } else {
     upper_width = - width * coef;
     lower_width = width;
     upper_offset = 0.0;
-    lower_offset = Random::GetDouble(0.0, width - upper_width);
+    lower_offset = RandomLocal().GetDouble(0.0, width - upper_width);
   }
   // XXX Unused !?
-  //number_of_upper_point = Random::GetInt(1 + (int)((upper_width * 0.25) / MIN_SPACE_BETWEEN_POINT),
+  //number_of_upper_point = RandomLocal().GetInt(1 + (int)((upper_width * 0.25) / MIN_SPACE_BETWEEN_POINT),
   //                                       (int)(upper_width / MIN_SPACE_BETWEEN_POINT));
-  number_of_bottom_point = Random::GetInt(1 + (int)((lower_width * 0.25) / MIN_SPACE_BETWEEN_POINT),
+  number_of_bottom_point = RandomLocal().GetInt(1 + (int)((lower_width * 0.25) / MIN_SPACE_BETWEEN_POINT),
                                           (int)((coef * lower_width) / MIN_SPACE_BETWEEN_POINT));
   tmp->AddRandomCurve(Point2d(upper_offset, 0.0), Point2d(lower_offset, height),
                       x_rand_offset, y_rand_offset, number_of_side_point, false, false);
diff --git a/src/graphic/sprite.cpp b/src/graphic/sprite.cpp
index 7e04453..f68dade 100644
--- a/src/graphic/sprite.cpp
+++ b/src/graphic/sprite.cpp
@@ -272,7 +272,7 @@ void Sprite::Calculate_Rotation_Offset(const Surface& tmp_surface)
 {
   const SpriteFrame& frame = GetCurrentFrameObject();
   const Surface &surface = frame.surface;
-  // Calculate offset of the depending on hotspot rotation position :
+  // Calculate offset of the surface depending on hotspot rotation position :
 
   int surfaceHeight = surface.GetHeight();
   int surfaceWidth = surface.GetWidth();
@@ -413,7 +413,7 @@ void Sprite::DrawXY(const Point2i &pos)
   if( !show )
     return;
 
-  Blit(AppWormux::GetInstance()->video->window, pos);
+  Blit(GetMainWindow(), pos);
 }
 
 void Sprite::Show() { show = true; }
diff --git a/src/graphic/spriteanimation.cpp b/src/graphic/spriteanimation.cpp
index c5e9edd..75e16ab 100644
--- a/src/graphic/spriteanimation.cpp
+++ b/src/graphic/spriteanimation.cpp
@@ -25,6 +25,7 @@
 #include "graphic/spriteanimation.h"
 #include "game/time.h"
 #include "graphic/sprite.h"
+#include "tool/random.h"
 
 SpriteAnimation::SpriteAnimation(Sprite &p_sprite) :
   sprite(p_sprite)
@@ -36,6 +37,8 @@ SpriteAnimation::SpriteAnimation(Sprite &p_sprite) :
    show_on_finish = show_last_frame;
    loop = true;
    pingpong = false;
+   loop_wait = 0;
+   loop_wait_random = 0;
 }
 
 SpriteAnimation::SpriteAnimation(const SpriteAnimation &other, Sprite &p_sprite) :
@@ -48,6 +51,8 @@ SpriteAnimation::SpriteAnimation(const SpriteAnimation &other, Sprite &p_sprite)
    show_on_finish = other.show_on_finish;
    loop = other.loop;
    pingpong = other.pingpong;
+   loop_wait = other.loop_wait;
+   loop_wait_random = other.loop_wait_random;
 }
 
 void SpriteAnimation::SetSpeedFactor( float nv_speed){
@@ -84,6 +89,7 @@ void SpriteAnimation::Update(){
   int delta_to_next_f = (int)((float)((global_time->Read() - last_update) / sprite.GetCurrentFrameObject().delay) * speed_factor);
   last_update += (int)((float)(delta_to_next_f * sprite.GetCurrentFrameObject().delay) / speed_factor);
 
+
   //Animation is finished, when last frame have been fully played
   bool finish;
   if (frame_delta < 0)
@@ -99,6 +105,7 @@ void SpriteAnimation::Update(){
 
     if(pingpong)
     {
+
       if( frame_delta>0 && ( current_frame + frame_delta * delta_to_next_f ) >= frame_count)
       {
         next_frame = frame_count - next_frame -2;
@@ -109,13 +116,16 @@ void SpriteAnimation::Update(){
       {
         next_frame = (-((int)current_frame + frame_delta * delta_to_next_f )) % frame_count;
         frame_delta = - frame_delta;
+        CalculateWait();
       }
     }
 
     if(next_frame != current_frame)
     {
-      if(next_frame >= frame_count)
+      if(next_frame >= frame_count){
         next_frame = 0;
+        CalculateWait();
+      }
       sprite.SetCurrentFrame(next_frame);
     }
   }
@@ -142,3 +152,26 @@ SpriteAnimation::SpriteShowOnFinish SpriteAnimation::GetShowOnFinish() const {
   return show_on_finish;
 }
 
+void SpriteAnimation::SetLoopWaitRandom(int time)
+{
+  MSG_DEBUG("eye", "SetLoopWaitRandom  : %d -> %d", loop_wait_random, time);
+  loop_wait_random = time;
+}
+
+void SpriteAnimation::SetLoopWait(int time)
+{
+  MSG_DEBUG("eye", "SetLoopWait  : %d -> %d", loop_wait, time);
+  loop_wait = time;
+}
+
+void SpriteAnimation::CalculateWait()
+{
+  MSG_DEBUG("eye", "CalculateWait stat   :  wait = %d , random = %d", loop_wait, loop_wait_random);
+  MSG_DEBUG("eye", "CalculateWait 1 : %d", last_update);
+
+  if(loop_wait !=0)
+  {
+  last_update += loop_wait - loop_wait_random/2 + RandomLocal().GetInt(0, loop_wait_random);
+  }
+  MSG_DEBUG("eye", "CalculateWait 2 : %d", last_update);
+}
diff --git a/src/graphic/spriteanimation.h b/src/graphic/spriteanimation.h
index e2b2fb5..3e12f60 100644
--- a/src/graphic/spriteanimation.h
+++ b/src/graphic/spriteanimation.h
@@ -45,6 +45,8 @@ private:
   unsigned int last_update;
   float speed_factor;
   int frame_delta; // Used in Update() to get next frame
+  int loop_wait;
+  int loop_wait_random;
 
   // State
   bool finished;
@@ -63,6 +65,7 @@ public:
   void Update();
   void Finish();
   bool IsFinished() const;
+  void CalculateWait();
 
   // Control speed
   void SetSpeedFactor(float nv_speed);
@@ -71,6 +74,8 @@ public:
   void SetPlayBackward(bool enable);
   void SetLoopMode(bool enable);
   void SetPingPongMode(bool enable);
+  void SetLoopWaitRandom(int time);
+  void SetLoopWait(int time);
   void SetShowOnFinish(SpriteShowOnFinish show);
   SpriteShowOnFinish GetShowOnFinish() const;
 };
diff --git a/src/graphic/surface.cpp b/src/graphic/surface.cpp
index ba7472f..3db4009 100644
--- a/src/graphic/surface.cpp
+++ b/src/graphic/surface.cpp
@@ -863,3 +863,41 @@ SDL_Rect Surface::GetSDLRect(const Point2i &pt) const
 
   return sdlRect;
 }
+
+Uint32 Surface::ComputeCRC()
+{
+  Uint32 crc = 0;
+  Uint32 current_pix;
+  SDL_PixelFormat * current_fmt = surface->format;
+  Uint8 r, g, b, a;
+
+  Point2i offset;
+  int current_offset;
+
+  Lock();
+  // for each pixel of the image
+  for (offset.x = 0; offset.x < GetWidth(); offset.x++) {
+    for (offset.y = 0; offset.y < GetHeight(); offset.y++) {
+
+      current_offset = offset.y * surface->w + offset.x;
+
+      // Retrieving a pixel of sprite to merge
+      current_pix = ((Uint32*)surface->pixels)[current_offset];
+
+      // Retreiving each chanel of the pixel using pixel format
+      r = (Uint8)(((current_pix & current_fmt->Rmask) >> current_fmt->Rshift) << current_fmt->Rloss);
+      g = (Uint8)(((current_pix & current_fmt->Gmask) >> current_fmt->Gshift) << current_fmt->Gloss);
+      b = (Uint8)(((current_pix & current_fmt->Bmask) >> current_fmt->Bshift) << current_fmt->Bloss);
+      a = (Uint8)(((current_pix & current_fmt->Amask) >> current_fmt->Ashift) << current_fmt->Aloss);
+
+      // Computing CRC - each time, we had at most 255*4, the biggest storable value
+      // on a Uint32 is 4294967296
+      // avoid integer overflow with a stupid modulo
+      crc += (r + g + b + a); // each time, we had at most 255*4
+      crc = crc % 429496000;
+    }
+  }
+
+  Unlock();
+  return crc;
+}
diff --git a/src/graphic/surface.h b/src/graphic/surface.h
index 9afe682..7e97874 100644
--- a/src/graphic/surface.h
+++ b/src/graphic/surface.h
@@ -137,6 +137,7 @@ public:
   Uint8 GetBytesPerPixel() const;
   unsigned char *GetPixels() const;
 
+  Uint32 ComputeCRC();
 };
 
 #endif
diff --git a/src/graphic/text.cpp b/src/graphic/text.cpp
index 4ca41cd..89cfe4b 100644
--- a/src/graphic/text.cpp
+++ b/src/graphic/text.cpp
@@ -270,7 +270,7 @@ void Text::DrawCursor(const Point2i &text_pos, std::string::size_type cursor_pos
     txt_before_cursor.Set(GetText().substr(0, cursor_pos));
     txt_width = txt_before_cursor.GetWidth();
   }
-  AppWormux::GetInstance()->video->window.VlineColor(text_pos.GetX()+txt_width,
+  GetMainWindow().VlineColor(text_pos.GetX()+txt_width,
 						     text_pos.GetY()+2,
 						     text_pos.GetY()+GetHeight()-4, c_white);
 }
diff --git a/src/graphic/video.cpp b/src/graphic/video.cpp
index 4487a9b..90626ee 100644
--- a/src/graphic/video.cpp
+++ b/src/graphic/video.cpp
@@ -28,7 +28,8 @@
 #include "tool/i18n.h"
 
 
-Video::Video(){
+Video::Video()
+{
   SetMaxFps (50);
   fullscreen = false;
   SDLReady = false;
@@ -57,7 +58,8 @@ Video::Video(){
   ComputeAvailableConfigs();
 }
 
-Video::~Video(){
+Video::~Video()
+{
   if (icon)
     SDL_FreeSurface(icon);
   if( SDLReady )
@@ -65,7 +67,8 @@ Video::~Video(){
   SDLReady = false;
 }
 
-void Video::SetMaxFps(uint max_fps){
+void Video::SetMaxFps(uint max_fps)
+{
   m_max_fps = max_fps;
   if (0 < m_max_fps)
     m_max_delay = 1000/m_max_fps;
@@ -132,11 +135,15 @@ void Video::ComputeAvailableConfigs()
   }
 }
 
-bool Video::SetConfig(const int width, const int height, const bool _fullscreen){
+bool Video::SetConfig(const int width, const int height, const bool _fullscreen)
+{
+#ifdef __APPLE__
+  int flag = 0; // Never set fullscreen with OSX, as it's buggy
+#else
   int flag = (_fullscreen) ? SDL_FULLSCREEN : 0;
+#endif
   bool window_was_null = window.IsNull();
 
-
   // update the main window if needed
   if( window.IsNull() ||
      (width != window.GetWidth() ||
@@ -168,24 +175,29 @@ bool Video::SetConfig(const int width, const int height, const bool _fullscreen)
 void Video::ToggleFullscreen()
 {
 #ifndef WIN32
+#  ifndef __APPLE__ // Prevent buggy fullscreen under OSX
   SDL_WM_ToggleFullScreen( window.GetSurface() );
   fullscreen = !fullscreen;
+#  endif
 #else
   SetConfig(window.GetWidth(), window.GetHeight(), !fullscreen);
   AppWormux::GetInstance()->RefreshDisplay();
 #endif
 }
 
-void Video::SetWindowCaption(const std::string& caption) const {
+void Video::SetWindowCaption(const std::string& caption) const
+{
   SDL_WM_SetCaption( caption.c_str(), NULL );
 }
 
-void Video::SetWindowIcon(const std::string& filename) {
+void Video::SetWindowIcon(const std::string& filename)
+{
   icon = IMG_Load(filename.c_str());
   SDL_WM_SetIcon( icon, NULL );
 }
 
-void Video::InitSDL(){
+void Video::InitSDL()
+{
   if( SDLReady )
     return;
 
@@ -198,7 +210,12 @@ void Video::InitSDL(){
   SDLReady = true;
 }
 
-void Video::Flip(){
+void Video::Flip()
+{
   window.Flip();
 }
 
+Surface& GetMainWindow()
+{
+  return AppWormux::GetInstance()->video->window;
+}
diff --git a/src/graphic/video.h b/src/graphic/video.h
index 8702722..c4a7d72 100644
--- a/src/graphic/video.h
+++ b/src/graphic/video.h
@@ -60,4 +60,6 @@ public:
   void Flip(void);
 };
 
+Surface& GetMainWindow();
+
 #endif
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 45394d4..f16ffe0 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -40,11 +40,11 @@ Button::~Button()
   delete image;
 }
 
-void Button::Draw(const Point2i &/*mousePosition*/) const
+void Button::Draw(const Point2i &mousePosition) const
 {
-  Surface& surf = AppWormux::GetInstance()->video->window;
+  Surface& surf = GetMainWindow();
 
-  uint frame = (IsHighlighted());
+  uint frame = (IsHighlighted() || Contains(mousePosition));
 
   // Check that there are enough frames in the image...
   if (image->GetFrameCount() <= frame) {
diff --git a/src/gui/check_box.cpp b/src/gui/check_box.cpp
index f13c896..898af6a 100644
--- a/src/gui/check_box.cpp
+++ b/src/gui/check_box.cpp
@@ -71,7 +71,7 @@ void CheckBox::Pack()
 
 void CheckBox::Draw(const Point2i &/*mousePosition*/) const
 {
-  Surface& surf = AppWormux::GetInstance()->video->window;
+  Surface& surf = GetMainWindow();
 
   txt_label->DrawTopLeft( GetPosition() );
 
diff --git a/src/gui/combo_box.cpp b/src/gui/combo_box.cpp
index c5d84f8..497cc53 100644
--- a/src/gui/combo_box.cpp
+++ b/src/gui/combo_box.cpp
@@ -81,7 +81,7 @@ void ComboBox::Pack()
 
 void ComboBox::Draw(const Point2i &/*mousePosition*/) const
 {
-  Surface& video_window = AppWormux::GetInstance()->video->window;
+  Surface& video_window = GetMainWindow();
 
   //  the computed positions are to center on the image part of the widget
 
diff --git a/src/gui/list_box.cpp b/src/gui/list_box.cpp
index cb7b27f..83cf975 100644
--- a/src/gui/list_box.cpp
+++ b/src/gui/list_box.cpp
@@ -152,7 +152,7 @@ void BaseListBox::__Update(const Point2i &mousePosition,
 
 void BaseListBox::Draw(const Point2i &mousePosition) const
 {
-  Surface& surf = AppWormux::GetInstance()->video->window;
+  Surface& surf = GetMainWindow();
   int item = MouseIsOnWhichItem(mousePosition);
 
   // Draw items
@@ -247,6 +247,11 @@ void BaseListBox::AddWidgetItem(bool selected, Widget* item)
     Select (pos);
 }
 
+bool BaseListBox::IsSelectedItem()
+{
+  return (selected_item != -1);
+}
+
 void BaseListBox::Sort() const
 {
   //std::sort( m_items.begin(), m_items.end(), CompareItems() );
@@ -302,6 +307,8 @@ ListBoxItem::ListBoxItem(const std::string& _label,
 {
 }
 
+
+
 const std::string& ListBoxItem::GetLabel() const
 {
   return txt_label->GetText();
diff --git a/src/gui/list_box.h b/src/gui/list_box.h
index 7395ce5..b5fc1a6 100644
--- a/src/gui/list_box.h
+++ b/src/gui/list_box.h
@@ -82,6 +82,7 @@ public:
   void Deselect();
   void RemoveSelected();
   void ClearItems();
+  bool IsSelectedItem();
 
   uint Size() const { return m_items.size(); };
 };
diff --git a/src/gui/msg_box.cpp b/src/gui/msg_box.cpp
index f6e8833..d58bf6e 100644
--- a/src/gui/msg_box.cpp
+++ b/src/gui/msg_box.cpp
@@ -35,6 +35,11 @@ MsgBox::MsgBox(const Point2i& size, Font::font_size_t fsize, Font::font_style_t
 
 MsgBox::~MsgBox()
 {
+  Clear();
+}
+
+void MsgBox::Clear()
+{
   for (std::list<Text*>::iterator t=messages.begin(); t != messages.end(); t++)
     delete *t;
   messages.clear();
@@ -80,7 +85,7 @@ void MsgBox::NewMessage(const std::string &msg, const Color& color)
 
 void MsgBox::Draw(const Point2i &/*mousePosition*/) const
 {
-  Surface& surf = AppWormux::GetInstance()->video->window;
+  Surface& surf = GetMainWindow();
 
   // Draw the border
   surf.BoxColor(*this, defaultOptionColorBox);
diff --git a/src/gui/msg_box.h b/src/gui/msg_box.h
index 4cee108..b53837f 100644
--- a/src/gui/msg_box.h
+++ b/src/gui/msg_box.h
@@ -44,6 +44,8 @@ class MsgBox : public Widget
 
   void NewMessage(const std::string& msg, const Color& color = white_color);
 
+  void Clear();
+
   virtual void Draw (const Point2i &mousePosition) const;
   virtual void Pack();
 };
diff --git a/src/gui/null_widget.h b/src/gui/null_widget.h
index d7d18cf..0a9766a 100644
--- a/src/gui/null_widget.h
+++ b/src/gui/null_widget.h
@@ -29,7 +29,7 @@ class Surface;
 class NullWidget : public Widget
 {
  public:
-  NullWidget(const Rectanglei&) {};
+  NullWidget(const Point2i& size) : Widget(size) {};
   virtual ~NullWidget() {};
   virtual void Draw(const Point2i&) const {};
   virtual void Pack() {};
diff --git a/src/gui/picture_text_cbox.cpp b/src/gui/picture_text_cbox.cpp
index 5a16755..226abb1 100644
--- a/src/gui/picture_text_cbox.cpp
+++ b/src/gui/picture_text_cbox.cpp
@@ -47,7 +47,7 @@ PictureTextCBox::PictureTextCBox(const std::string &label,
 
 void PictureTextCBox::Draw(const Point2i &/*mousePosition*/) const
 {
-  Surface& video_window = AppWormux::GetInstance()->video->window;
+  Surface& video_window = GetMainWindow();
 
   if (m_value)
     {
diff --git a/src/gui/picture_widget.cpp b/src/gui/picture_widget.cpp
index d06ac2b..e07b399 100644
--- a/src/gui/picture_widget.cpp
+++ b/src/gui/picture_widget.cpp
@@ -78,7 +78,7 @@ void PictureWidget::SetNoSurface()
 
 void PictureWidget::Draw(const Point2i &/*mousePosition*/) const
 {
-  Surface& surf = AppWormux::GetInstance()->video->window;
+  Surface& surf = GetMainWindow();
 
   if (spr != NULL) {
     int x = GetPositionX() + ( GetSizeX()/2 ) - (spr->GetWidth()/2);
diff --git a/src/gui/progress_bar.cpp b/src/gui/progress_bar.cpp
index 7ba3b92..06a50f5 100644
--- a/src/gui/progress_bar.cpp
+++ b/src/gui/progress_bar.cpp
@@ -52,9 +52,7 @@ void ProgressBar::InitPos (uint px, uint py, uint plarg, uint phaut){
  *                         ProgressBar::PROG_BAR_HORIZONTAL
  * default orientation is ProgressBar::PROG_BAR_HORIZONTAL
  */
-void ProgressBar::InitVal (long pval, long pmin, long pmax,
-    enum orientation porientation){
-  ASSERT (pmin != pmax);
+void ProgressBar::InitVal (long pval, long pmin, long pmax, enum orientation porientation){
   ASSERT (pmin < pmax);
   val = pval;
   min = pmin;
@@ -135,7 +133,7 @@ void ProgressBar::DrawXY(const Point2i &pos) const{
     image.FillRect( r_marq, it->color);
   }
   Rectanglei dst(pos.x, pos.y, larg, haut);
-  AppWormux::GetInstance()->video->window.Blit(image, pos);
+  GetMainWindow().Blit(image, pos);
 
   world.ToRedrawOnScreen(dst);
 }
diff --git a/src/gui/question.cpp b/src/gui/question.cpp
index 641758f..f49090e 100644
--- a/src/gui/question.cpp
+++ b/src/gui/question.cpp
@@ -176,11 +176,11 @@ void Question::Set (const std::string &pmessage,
     Profile *res = resource_manager.LoadXMLProfile( "graphism.xml", false);
     background = new Sprite(resource_manager.LoadImage(res,bg_sprite), true);
     background->cache.EnableLastFrameCache();
-    background->ScaleSize(AppWormux::GetInstance()->video->window.GetSize());
+    background->ScaleSize(GetMainWindow().GetSize());
     resource_manager.UnLoadXMLProfile( res);
   }
   else
   {
-    text->SetMaxWidth(AppWormux::GetInstance()->video->window.GetWidth()/2);
+    text->SetMaxWidth(GetMainWindow().GetWidth()/2);
   }
 }
diff --git a/src/gui/spin_button_picture.cpp b/src/gui/spin_button_picture.cpp
index 871c1b3..26e9e0a 100644
--- a/src/gui/spin_button_picture.cpp
+++ b/src/gui/spin_button_picture.cpp
@@ -68,7 +68,7 @@ void SpinButtonWithPicture::Pack()
 
 void SpinButtonWithPicture::Draw(const Point2i &/*mousePosition*/) const
 {
-  Surface& surf = AppWormux::GetInstance()->video->window;
+  Surface& surf = GetMainWindow();
 
   //  the computed positions are to center on the image part of the widget
 
diff --git a/src/gui/tabs.cpp b/src/gui/tabs.cpp
index 3d78ce5..9b6d5b9 100644
--- a/src/gui/tabs.cpp
+++ b/src/gui/tabs.cpp
@@ -19,14 +19,20 @@
  * Tabs
  *****************************************************************************/
 
+#include <algorithm> // std::min/max
+
+#include "include/app.h"
 #include "graphic/colors.h"
 #include "graphic/font.h"
 #include "graphic/text.h"
+#include "graphic/video.h"
 #include "gui/box.h"
 #include "gui/button.h"
 #include "gui/tabs.h"
 #include "tool/resource_manager.h"
 
+#define TAB_MIN_WIDTH 200
+
 static Point2i widget_size(150, 150);
 
 class Tab
@@ -48,10 +54,10 @@ public:
   const std::string& GetId() const { return id; };
 };
 
-#define CIRCULAR_TABS   1
+#define CIRCULAR_TABS   0
 
 MultiTabs::MultiTabs(const Point2i& size):
-  Widget(size), current_tab(NULL)
+  Widget(size), max_visible_tabs(50), current_tab(-1), first_tab(0), nb_visible_tabs(1), tab_header_width(TAB_MIN_WIDTH)
 {
   tab_size = Point2i(size.x, size.y - 32);
 
@@ -60,8 +66,6 @@ MultiTabs::MultiTabs(const Point2i& size):
   prev_tab_bt = new Button(res, "menu/really_big_minus", false);
   next_tab_bt = new Button(res, "menu/really_big_plus", false);
 
-  current_tab_title = new Text("No tab!", primary_red_color, Font::FONT_MEDIUM, Font::FONT_BOLD, true);
-
   Widget::SetBorder(defaultOptionColorRect, 2);
   Widget::SetBackgroundColor(defaultOptionColorBox);
 
@@ -70,7 +74,7 @@ MultiTabs::MultiTabs(const Point2i& size):
 
 MultiTabs::~MultiTabs()
 {
-  for(std::list<Tab>::iterator t=tabs.begin();
+  for(std::vector<Tab>::iterator t=tabs.begin();
       t != tabs.end();
       t++)
     delete t->box;
@@ -78,53 +82,56 @@ MultiTabs::~MultiTabs()
   tabs.clear();
 }
 
-void MultiTabs::SetCurrentTab(Tab* _tab)
+void MultiTabs::SelectTab(uint current)
 {
-  ASSERT(_tab != NULL);
+  ASSERT(!tabs.empty());
+
+  if (current >= tabs.size())
+    return;
+
+  if (current_tab != (int)current) {
+    current_tab = current;
+
+    // update first_tab to be sure that current tab will be visible
+    if (current_tab < int(first_tab))
+      first_tab = current_tab;
+    else if (current_tab > int(first_tab + nb_visible_tabs -1))
+      first_tab = current_tab - nb_visible_tabs + 1;
 
-  if (current_tab != _tab) {
-    current_tab = _tab;
-    current_tab_title->Set(current_tab->GetTitle());
+    NeedRedrawing();
   }
-  NeedRedrawing();
 }
 
 void MultiTabs::PrevTab()
 {
-  if (current_tab == &(tabs.front()))
+  if (tabs.empty())
+    return;
+
+  if (current_tab == 0)
   {
 #if CIRCULAR_TABS
-    SetCurrentTab(&tabs.back());
+    SelectTab(tabs.size()-1);
 #endif
     return;
   }
 
-  std::list<Tab>::reverse_iterator it;
-  for (it = tabs.rbegin(); it != tabs.rend(); it++)
-    if ( &(*it) == current_tab)
-      break;
-
-  it++;
-  SetCurrentTab( &(*it));
+  SelectTab(current_tab-1);
 }
 
 void MultiTabs::NextTab()
 {
-  if (current_tab == &(tabs.back()))
+  if (tabs.empty())
+    return;
+
+  if (current_tab == int(tabs.size()-1))
   {
 #if CIRCULAR_TABS
-    SetCurrentTab(&tabs.front());
+    SelectTab(0);
 #endif
     return;
   }
 
-  std::list<Tab>::iterator it;
-  for (it = tabs.begin(); it != tabs.end(); it++) {
-    if ( &(*it) == current_tab)
-      break;
-  }
-  it++;
-  SetCurrentTab( &(*it));
+  SelectTab(current_tab+1);
 }
 
 void MultiTabs::AddNewTab(const std::string& id, const std::string& title, Widget * w)
@@ -133,38 +140,85 @@ void MultiTabs::AddNewTab(const std::string& id, const std::string& title, Widge
   tabs.push_back(tab);
   w->SetContainer(this);
 
-  SetCurrentTab(&(tabs.front()));
+  SelectTab(0);
 }
 
 void MultiTabs::DrawHeader(const Point2i &mousePosition) const
 {
+  if (tabs.empty())
+    return;
+
   // Draw the buttons to change tab
-  if (tabs.size() != 1)
+  if (nb_visible_tabs < tabs.size()) {
 #if !CIRCULAR_TABS
-  if (current_tab != &(tabs.front()))
+    if (first_tab != 0)
 #endif
-    prev_tab_bt->Draw(mousePosition);
+      prev_tab_bt->Draw(mousePosition);
 
-  if (tabs.size() != 1)
 #if !CIRCULAR_TABS
-  if (current_tab != &(tabs.back()))
+    if (first_tab + nb_visible_tabs -1 != tabs.size()-1)
 #endif
-    next_tab_bt->Draw(mousePosition);
+      next_tab_bt->Draw(mousePosition);
+  }
+
+  for (uint i = first_tab; i < first_tab + nb_visible_tabs; i++) {
+
+    // Draw the title
+    uint pos_x = prev_tab_bt->GetPositionX() + prev_tab_bt->GetSizeX() + 5
+      + (i-first_tab)*tab_header_width;
+
+    if (int(i) == current_tab) {
+      Text tab_title(tabs.at(i).GetTitle(), primary_red_color,
+		     Font::FONT_MEDIUM, Font::FONT_BOLD, true);
+
+      tab_title.DrawCenterTop(Point2i(pos_x + tab_header_width/2, position.y + 3) + 5);
+    } else {
+      Text tab_title(tabs.at(i).GetTitle(), dark_gray_color,
+		     Font::FONT_MEDIUM, Font::FONT_BOLD, false);
+
+      tab_title.DrawCenterTop(Point2i(pos_x + tab_header_width/2, position.y + 3) + 5);
+    }
+  }
 
-  // Draw the title of the current tab
-  uint center_x = (prev_tab_bt->GetPositionX() + prev_tab_bt->GetSizeX()
-		 + next_tab_bt->GetPositionX() )/2;
-  current_tab_title->DrawCenterTop(Point2i(center_x, position.y) + 5);
+  if (nb_visible_tabs > 1) {
+    uint current_tab_pos_x = prev_tab_bt->GetPositionX() + prev_tab_bt->GetSizeX() + 5 +
+      (current_tab-first_tab)*tab_header_width;
+
+    GetMainWindow().LineColor(current_tab_pos_x,
+			      current_tab_pos_x,
+			      position.y +1,
+			      position.y + GetHeaderHeight() - 2,
+			      GetBorderColor());
+    GetMainWindow().LineColor(current_tab_pos_x + tab_header_width,
+			      current_tab_pos_x + tab_header_width,
+			      position.y +1,
+			      position.y + GetHeaderHeight() - 2,
+			      GetBorderColor());
+
+    GetMainWindow().LineColor(position.x,
+			      current_tab_pos_x,
+			      position.y + GetHeaderHeight() - 2,
+			      position.y + GetHeaderHeight() - 2,
+			      GetBorderColor());
+
+    GetMainWindow().LineColor(current_tab_pos_x + tab_header_width,
+			      position.x + size.x - 2,
+			      position.y + GetHeaderHeight() - 2,
+			      position.y + GetHeaderHeight() - 2,
+			      GetBorderColor());
+  }
 }
 
 void MultiTabs::Draw(const Point2i &mousePosition) const
 {
+  if (tabs.empty())
+    return;
+
   // Draw the header
   DrawHeader(mousePosition);
 
   // Draw the current tab
-  if (current_tab)
-    current_tab->box->Draw(mousePosition);
+  tabs.at(current_tab).box->Draw(mousePosition);
 }
 
 void MultiTabs::Update(const Point2i &mousePosition,
@@ -183,8 +237,8 @@ void MultiTabs::Update(const Point2i &mousePosition,
     DrawHeader(mousePosition);
   }
 
-  if (current_tab)
-    current_tab->box->Update(mousePosition, lastMousePosition);
+  if (!tabs.empty())
+    tabs.at(current_tab).box->Update(mousePosition, lastMousePosition);
 
   need_redrawing = false;
 }
@@ -193,8 +247,8 @@ void MultiTabs::Pack()
 {
   // Update buttons position
   uint margin = 5;
-  prev_tab_bt->SetPosition(position.x + margin, position.y);
-  next_tab_bt->SetPosition(position.x + size.x - margin - next_tab_bt->GetSizeX(), position.y);
+  prev_tab_bt->SetPosition(position.x + margin, position.y + 2);
+  next_tab_bt->SetPosition(position.x + size.x - margin - next_tab_bt->GetSizeX(), position.y + 2);
 
   // Update tabs position
   Point2i tab_pos(position.x + margin,
@@ -202,35 +256,59 @@ void MultiTabs::Pack()
   Point2i tab_size(size.x - 2*margin,
 		   size.y - GetHeaderHeight() - margin);
 
-  std::list<Tab>::iterator it;
+  std::vector<Tab>::iterator it;
   for (it = tabs.begin(); it != tabs.end(); it++)
     {
       (*it).box->SetPosition(tab_pos);
       (*it).box->SetSize(tab_size);
       (*it).box->Pack();
     }
+
+  // Compute how many tabs can be displayed
+  nb_visible_tabs = std::min(uint(tabs.size()), uint(GetSizeX() / TAB_MIN_WIDTH));
+  nb_visible_tabs = std::min(nb_visible_tabs, max_visible_tabs);
+
+  if (nb_visible_tabs == 0)
+    nb_visible_tabs = 1;
+
+  // Compute tab size in the header
+  tab_header_width = ((next_tab_bt->GetPositionX() -
+		       (prev_tab_bt->GetPositionX() + prev_tab_bt->GetSizeX()) - 10))/ nb_visible_tabs;
 }
 
 void MultiTabs::NeedRedrawing()
 {
   need_redrawing = true;
 
-  if (current_tab)
-    current_tab->box->NeedRedrawing();
+  if (!tabs.empty())
+    tabs.at(current_tab).box->NeedRedrawing();
 }
 
 bool MultiTabs::SendKey(const SDL_keysym& key)
 {
-  if (current_tab)
-    return current_tab->box->SendKey(key);
+  if (tabs.empty())
+    return false;
+
+  if (SDL_GetModState()&(KMOD_CTRL|KMOD_META)) {
+    switch (key.sym) {
+    case SDLK_PAGEUP:
+      PrevTab();
+      return true;
+    case SDLK_PAGEDOWN:
+      NextTab();
+      return true;
+    default:
+      break;
+    }
+  }
 
-  return false;
+  return tabs.at(current_tab).box->SendKey(key);
 }
 
 Widget* MultiTabs::Click(const Point2i &mousePosition, uint button)
 {
-  if (current_tab)
-    return current_tab->box->Click(mousePosition, button);
+  if (!tabs.empty())
+    return tabs.at(current_tab).box->Click(mousePosition, button);
 
   return NULL;
 }
@@ -244,40 +322,49 @@ Widget* MultiTabs::ClickUp(const Point2i &mousePosition, uint button)
 			   size.x,
 			   prev_tab_bt->GetSizeY());
 
-    if (button == SDL_BUTTON_LEFT && prev_tab_bt->Contains(mousePosition)) {
-      PrevTab();
-      return this;
+    if (rect_header.Contains(mousePosition)) {
 
-    } else if (button == SDL_BUTTON_LEFT && next_tab_bt->Contains(mousePosition)) {
-      NextTab();
-      return this;
+	if (button == SDL_BUTTON_LEFT && prev_tab_bt->Contains(mousePosition)) {
+	  PrevTab();
 
-    } else if (button == SDL_BUTTON_WHEELDOWN && rect_header.Contains(mousePosition)) {
-      PrevTab();
-      return this;
+	} else if (button == SDL_BUTTON_LEFT && next_tab_bt->Contains(mousePosition)) {
+	  NextTab();
 
-    } else if (button == SDL_BUTTON_WHEELUP && rect_header.Contains(mousePosition)) {
-      NextTab();
-      return this;
-    }
+	} else if (button == SDL_BUTTON_WHEELDOWN) {
+	  PrevTab();
+
+	} else if (button == SDL_BUTTON_WHEELUP) {
+	  NextTab();
+
+	} else if (nb_visible_tabs > 1 && button == SDL_BUTTON_LEFT) {
+	  uint clicked_tab = (mousePosition.x - prev_tab_bt->GetPositionX() - prev_tab_bt->GetSizeX() - 5)/tab_header_width + first_tab;
+	  SelectTab(clicked_tab);
+
+	}
+	return this;
+      }
   }
 
-  if (current_tab)
-    return current_tab->box->ClickUp(mousePosition, button);
+  if (!tabs.empty())
+    return tabs.at(current_tab).box->ClickUp(mousePosition, button);
 
   return NULL;
 }
 
 const std::string& MultiTabs::GetCurrentTabId() const
 {
-  ASSERT(current_tab);
-  return current_tab->GetId();
+  ASSERT(!tabs.empty());
+  return tabs.at(current_tab).GetId();
 }
 
 uint MultiTabs::GetHeaderHeight() const
 {
-  uint header_h = std::max(current_tab_title->GetHeight(),
-			   prev_tab_bt->GetSizeY());
+  uint header_h = prev_tab_bt->GetSizeY();
   header_h += 5;
   return header_h;
 }
+
+void MultiTabs::SetMaxVisibleTabs(uint max)
+{
+  max_visible_tabs = max;
+}
diff --git a/src/gui/tabs.h b/src/gui/tabs.h
index 4aeb5b3..90b36de 100644
--- a/src/gui/tabs.h
+++ b/src/gui/tabs.h
@@ -22,7 +22,7 @@
 #ifndef GUI_TABS_H
 #define GUI_TABS_H
 
-#include <list>
+#include <vector>
 #include "include/base.h"
 #include "gui/widget.h"
 
@@ -34,16 +34,19 @@ class Tab;
 class MultiTabs : public Widget
 {
 private:
-  std::list<Tab> tabs;
-  Tab* current_tab;
-  Text *current_tab_title;
+  std::vector<Tab> tabs;
+
+  uint max_visible_tabs;
+
+  int current_tab;
+  uint first_tab;
+  uint nb_visible_tabs;
+  uint tab_header_width;
 
   Button* prev_tab_bt;
   Button* next_tab_bt;
   Point2i tab_size;
 
-  void SetCurrentTab(Tab* _tab);
-
   void PrevTab();
   void NextTab();
 
@@ -58,6 +61,8 @@ public:
 
   uint GetHeaderHeight() const;
 
+  void SelectTab(uint current);
+
   // from widget
   virtual void NeedRedrawing();
   virtual void Draw(const Point2i &mousePosition) const;
@@ -68,6 +73,8 @@ public:
   virtual bool SendKey(const SDL_keysym&);
   virtual Widget* Click(const Point2i &mousePosition, uint button);
   virtual Widget* ClickUp(const Point2i &mousePosition, uint button);
+
+  void SetMaxVisibleTabs(uint max);
 };
 
 #endif // GUI_TABS_H
diff --git a/src/gui/talk_box.cpp b/src/gui/talk_box.cpp
new file mode 100644
index 0000000..cad5c8b
--- /dev/null
+++ b/src/gui/talk_box.cpp
@@ -0,0 +1,112 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Talk box: box handling chat in network menus
+ *****************************************************************************/
+
+#include "graphic/text.h"
+#include "graphic/video.h"
+#include "gui/button.h"
+#include "gui/msg_box.h"
+#include "gui/text_box.h"
+#include "include/app.h"
+#include "network/admin_commands.h"
+#include "network/chat.h"
+#include "tool/resource_manager.h"
+
+#include "talk_box.h"
+
+
+TalkBox::TalkBox(const Point2i& size, Font::font_size_t fsize, Font::font_style_t fstyle) :
+  VBox(size.x, false, false)
+{
+  SetNoBorder();
+
+  msg_box = new MsgBox(Point2i(size.x, size.y - 20), fsize, fstyle);
+  AddWidget(msg_box);
+
+  HBox* tmp2_box = new HBox(16, false);
+  tmp2_box->SetMargin(4);
+  tmp2_box->SetBorder(Point2i(0,0));
+  line_to_send_tbox = new TextBox("", size.x-20, fsize, fstyle);
+  tmp2_box->AddWidget(line_to_send_tbox);
+
+  Profile *res = resource_manager.LoadXMLProfile( "graphism.xml",false);
+  send_txt_bt = new Button(res, "menu/send_txt", true);
+  tmp2_box->AddWidget(send_txt_bt);
+  resource_manager.UnLoadXMLProfile(res);
+
+  AddWidget(tmp2_box);
+}
+
+void TalkBox::NewMessage(const std::string &msg, const Color& color)
+{
+  msg_box->NewMessage(msg, color);
+}
+
+void TalkBox::SendChatMsg()
+{
+  std::string empty = "";
+  std::string txt = line_to_send_tbox->GetText();
+  if (txt[0] == '/')
+    ProcessCommand(txt);
+  else if (txt != "" )
+    Chat::SendMessage(txt);
+
+  line_to_send_tbox->SetText(empty);
+}
+
+Widget* TalkBox::ClickUp(const Point2i &mousePosition, uint button)
+{
+  Widget* w = VBox::ClickUp(mousePosition, button);
+  if (w == send_txt_bt) {
+    SendChatMsg();
+    return this;
+  }
+  return w;
+}
+
+bool TalkBox::TextHasFocus() const
+{
+  return line_to_send_tbox->HasFocus();
+}
+
+bool TalkBox::SendKey(SDL_keysym key)
+{
+  bool r = false;
+
+  switch (key.sym) {
+  case SDLK_RETURN:
+  case SDLK_KP_ENTER:
+    SendChatMsg();
+    r = true;
+    break;
+  default:
+    if (send_txt_bt->HasFocus()) {
+      r = send_txt_bt->SendKey(key);
+    }
+    break;
+  }
+
+  return r;
+}
+
+void TalkBox::Clear()
+{
+  msg_box->Clear();
+}
diff --git a/src/gui/talk_box.h b/src/gui/talk_box.h
new file mode 100644
index 0000000..67f5683
--- /dev/null
+++ b/src/gui/talk_box.h
@@ -0,0 +1,62 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Talk box: box handling chat in network menus
+ *****************************************************************************/
+
+#ifndef TALK_BOX_H
+#define TALK_BOX_H
+
+#include "graphic/surface.h"
+#include "gui/box.h"
+#include "include/base.h"
+#include "tool/point.h"
+#include "tool/rectangle.h"
+
+class Button;
+class MsgBox;
+class TextBox;
+
+class TalkBox : public VBox
+{
+ private:
+  /* If you need this, implement it (correctly) */
+  TalkBox(const TalkBox&);
+  TalkBox operator=(const TalkBox&);
+  /**********************************************/
+
+  MsgBox* msg_box;
+  TextBox* line_to_send_tbox;
+  Button* send_txt_bt;
+
+ public:
+  TalkBox(const Point2i& size, Font::font_size_t font_size, Font::font_style_t font_style);
+
+  void NewMessage(const std::string &msg, const Color& color = white_color);
+  void SendChatMsg();
+  void Clear();
+
+  bool TextHasFocus() const;
+  TextBox* GetTextBox() const {return line_to_send_tbox; };
+
+  bool SendKey(SDL_keysym key);
+  virtual Widget* ClickUp(const Point2i &mousePosition, uint button);
+};
+
+
+#endif
diff --git a/src/gui/widget.cpp b/src/gui/widget.cpp
index 64cdd1e..6d0a3f8 100644
--- a/src/gui/widget.cpp
+++ b/src/gui/widget.cpp
@@ -68,7 +68,7 @@ Widget::Widget(const Point2i &size):
 // From Container: it redraws the border and the background
 void Widget::RedrawBackground(const Rectanglei& rect)
 {
-  Surface& surf = AppWormux::GetInstance()->video->window;
+  Surface& surf = GetMainWindow();
 
   if (ct != NULL)
     ct->RedrawBackground(rect);
diff --git a/src/gui/widget.h b/src/gui/widget.h
index 6870f74..9837158 100644
--- a/src/gui/widget.h
+++ b/src/gui/widget.h
@@ -98,8 +98,13 @@ class Widget : public Rectanglei, public Container
 
   // border, background color
   void SetBorder(const Color &border_color, uint boder_size);
+  const Color& GetBorderColor() const { return border_color; };
+
   void SetBackgroundColor(const Color &background_color);
+  const Color& GetBackgroundColor() const { return background_color; };
+
   void SetHighlightBgColor(const Color &highlight_bg_color);
+  const Color& GetHighlightBgColor() const { return highlight_bg_color; };
 
   // font color
   // If (update_now == true), we call OnFontChange()
@@ -111,6 +116,13 @@ class Widget : public Rectanglei, public Container
 
   void SetContainer(Container * _ct) { ct = _ct; };
 
+  // to manage browsing between the widgets with keyboard
+  virtual Widget* GetFirstWidget() const { return NULL; };
+  virtual Widget* GetLastWidget() const { return NULL; };
+  virtual Widget* GetNextWidget(const Widget */*w*/, bool /*loop*/) const { return NULL; };
+  virtual Widget* GetPreviousWidget(const Widget */*w*/, bool /*loop*/) const { return NULL; };
+  virtual bool IsWidgetBrowser() const { return false; };
+
   virtual void Pack() = 0;
 };
 
diff --git a/src/gui/widget_list.cpp b/src/gui/widget_list.cpp
index c337078..1e1fe98 100644
--- a/src/gui/widget_list.cpp
+++ b/src/gui/widget_list.cpp
@@ -22,20 +22,17 @@
 #include <SDL_keyboard.h>
 #include "gui/widget_list.h"
 #include "gui/widget.h"
+#include "interface/mouse.h"
 #include <iostream>
 
 WidgetList::WidgetList()
 {
-  last_clicked = NULL;
-  mouse_selection = NULL;
-  keyboard_selection = NULL;
+  selected_widget = NULL;
 }
 
 WidgetList::WidgetList(const Point2i &size) : Widget(size)
 {
-  last_clicked = NULL;
-  mouse_selection = NULL;
-  keyboard_selection = NULL;
+  selected_widget = NULL;
 }
 
 WidgetList::~WidgetList()
@@ -61,119 +58,238 @@ void WidgetList::AddWidget(Widget* w)
   w->SetContainer(this);
 }
 
-void WidgetList::Update(const Point2i &mousePosition)
+void WidgetList::RemoveWidget(Widget* w)
 {
-  if (mouse_selection != NULL && !mouse_selection->Contains(mousePosition)) {
-    mouse_selection = NULL;
-  }
+  ASSERT(w!=NULL);
+  widget_list.remove(w);
+  w->SetContainer(NULL);
+  delete w;
+}
 
+void WidgetList::Update(const Point2i &mousePosition)
+{
   for (std::list<Widget*>::iterator w=widget_list.begin();
       w != widget_list.end();
       w++)
   {
     // Then redraw the widget
     (*w)->Update(mousePosition, lastMousePosition);
-    if (lastMousePosition != mousePosition && (*w)->Contains(mousePosition)) {
-      mouse_selection = (*w);
-      mouse_selection->SetHighlighted(true);
+  }
+
+  lastMousePosition = mousePosition;
+}
+
+void WidgetList::SetFocusOn(Widget* widget, bool force_mouse_position)
+{
+  if (widget == selected_widget)
+    return;
+
+  // Previous selection ?
+  if (selected_widget != NULL) {
+    selected_widget->SetFocus(false);
+  }
+
+  selected_widget = widget;
+
+  if (selected_widget) {
+    selected_widget->SetFocus(true);
+
+    if (force_mouse_position &&
+	!selected_widget->Contains(Mouse::GetInstance()->GetPosition())) {
+
+      Mouse::GetInstance()->SetPosition(selected_widget->GetPosition() +
+					selected_widget->GetSize()/2);
     }
+  }
+}
 
-    if ((*w) != mouse_selection && (*w) != keyboard_selection
-	&& !(*w)->Contains(mousePosition)) {
-      (*w)->SetHighlighted(false);
+Widget* WidgetList::GetFirstWidget() const
+{
+  Widget *first = NULL;
+
+  MSG_DEBUG("widgetlist", "%p::GetFirstWidget()", this);
+
+  for (std::list<Widget*>::const_iterator it = widget_list.begin();
+       it != widget_list.end();
+       it++) {
+    if ((*it)->IsWidgetBrowser()) {
+      MSG_DEBUG("widgetlist", "%s:%p is a widget browser!\n", typeid(*it).name(), (*it));
+
+      first = (*it)->GetFirstWidget();
+      if (first != NULL)
+	return first;
+    } else {
+      MSG_DEBUG("widgetlist", "%s:%p is NOT a widget browser!\n", typeid(*it).name(), (*it));
+
+      return (*it);
     }
   }
 
-  if (mouse_selection != NULL && keyboard_selection != NULL && lastMousePosition != mousePosition) {
-    keyboard_selection->SetFocus(false);
-    keyboard_selection = NULL;
+  return NULL;
+}
+
+Widget* WidgetList::GetLastWidget() const
+{
+  Widget *last = NULL;
+
+  for (std::list<Widget*>::const_reverse_iterator it = widget_list.rbegin();
+       it != widget_list.rend();
+       it++) {
+    if ((*it)->IsWidgetBrowser()) {
+      last = (*it)->GetLastWidget();
+      if (last != NULL)
+	return last;
+    } else {
+      return (*it);
+    }
   }
-  lastMousePosition = mousePosition;
+
+  return NULL;
 }
 
-void WidgetList::SetKeyboardFocusOnNextWidget()
+Widget* WidgetList::GetNextWidget(const Widget *w, bool loop) const
 {
-  // No widget => exit
+  Widget *r = NULL;
+
+  ASSERT(!w || !w->IsWidgetBrowser());
+
+  MSG_DEBUG("widgetlist", "%p::GetNextWidget(%s:%p)", this, typeid(w).name(), w);
+
   if (widget_list.size() == 0) {
-    keyboard_selection = NULL;
-    return;
+    return NULL;
   }
 
-  // Previous selection ?
-  if (keyboard_selection != NULL)
-    keyboard_selection->SetFocus(false);
-  else if (mouse_selection != NULL) {
-    keyboard_selection = mouse_selection;
-    mouse_selection->SetFocus(false);
-  } else {
-    keyboard_selection = (*widget_list.begin());
-    keyboard_selection->SetFocus(true);
-    return;
+  if (w == NULL) {
+    r = GetFirstWidget();
+    MSG_DEBUG("widgetlist", "%p::GetNextWidget(%s:%p) ==> %s%p", this, typeid(w).name(), w, typeid(r).name(), r);
+    return r;
   }
 
-  std::list<Widget*>::iterator w = widget_list.begin();
-  for (;  w != widget_list.end(); w++) {
-    if (keyboard_selection == (*w))
+  std::list<Widget*>::const_iterator it;
+  for (it = widget_list.begin(); it != widget_list.end(); it++) {
+
+    MSG_DEBUG("widgetlist", "iterate on %s:%p", typeid(*it).name(), (*it));
+
+    if (w == (*it)) {
+      MSG_DEBUG("widgetlist", "we have found %s:%p", typeid(*it).name(), (*it));
+
+      it++;
+      if (it != widget_list.end())
+	r = (*it);
+      else if (loop)
+	r = GetFirstWidget();
+      else
+	r = (Widget*)w;
       break;
-  }
-  w++;
+    }
+
+    if ((*it)->IsWidgetBrowser()) {
+      MSG_DEBUG("widgetlist", "%s:%p is a widget browser!\n", typeid(*it).name(), (*it));
+
+      r = (*it)->GetNextWidget(w, false);
 
-  // The next widget is not the end ?
-  if (w != widget_list.end()) {
-    keyboard_selection = (*w);
-  } else {
-    keyboard_selection = (*widget_list.begin());
+      if (r && r == w && it != widget_list.end()) {
+	MSG_DEBUG("widgetlist", "r == w %s:%p", typeid(r).name(), (r));
+	it++;
+	if (it != widget_list.end()) {
+	  r = (*it);
+	  MSG_DEBUG("widgetlist", "r ==>  %s:%p", typeid(r).name(), (r));
+	  if (r->IsWidgetBrowser()) {
+	    r = r->GetFirstWidget();
+	  }
+	} else if (loop) {
+	  r = GetFirstWidget();
+	}
+      }
+      if (r)
+	break;
+    } else {
+      MSG_DEBUG("widgetlist", "%s:%p is NOT a widget browser!\n", typeid(*it).name(), (*it));
+    }
   }
-  keyboard_selection->SetFocus(true);
+
+  ASSERT(!r || !r->IsWidgetBrowser());
+
+  MSG_DEBUG("widgetlist", "%p::GetNextWidget(%s:%p) ==> %s%p", this, typeid(w).name(), w, typeid(r).name(), r);
+
+  return r;
 }
 
-void WidgetList::SetKeyboardFocusOnPreviousWidget()
+void WidgetList::SetFocusOnNextWidget()
 {
-  Widget * previous_one = NULL;
-
   // No widget => exit
   if (widget_list.size() == 0) {
-    keyboard_selection = NULL;
+    selected_widget = NULL;
     return;
   }
 
-  // Previous selection ?
-  if (keyboard_selection != NULL)
-    keyboard_selection->SetFocus(false);
-  else if (mouse_selection != NULL) {
-    keyboard_selection = mouse_selection;
-    mouse_selection->SetFocus(false);
-  } else {
-    keyboard_selection = (*widget_list.begin());
-    keyboard_selection->SetFocus(true);
-    return;
+  MSG_DEBUG("widgetlist", "before %s:%p", typeid(selected_widget).name(), selected_widget);
+
+  Widget* w = GetNextWidget(selected_widget, true);
+  SetFocusOn(w, true);
+}
+
+Widget* WidgetList::GetPreviousWidget(const Widget *w, bool loop) const
+{
+  Widget *r = NULL;
+
+  if (widget_list.size() == 0) {
+    return NULL;
+  }
+
+  if (w == NULL) {
+    r = GetLastWidget();
+    return r;
   }
 
-  std::list<Widget*>::iterator w = widget_list.begin();
-  for (; w != widget_list.end(); w++) {
-    if (keyboard_selection == (*w))
+  for (std::list<Widget*>::const_reverse_iterator it = widget_list.rbegin();
+       it != widget_list.rend();
+       it++) {
+    if (w == (*it)) {
+      it++;
+      if (it != widget_list.rend())
+	r = (*it);
+      else if (loop)
+	r = (*widget_list.rbegin());
+      else
+	r = NULL;
       break;
-    previous_one = (*w);
+    }
   }
 
-  // The next widget is not the end ?
-  if (previous_one == NULL) {
-    w = widget_list.end(); w--;
-    keyboard_selection = (*w);
-  } else {
-    keyboard_selection = previous_one;
+  return r;
+}
+
+void WidgetList::SetFocusOnPreviousWidget()
+{
+  // No widget => exit
+  if (widget_list.size() == 0) {
+    selected_widget = NULL;
+    return;
   }
-  keyboard_selection->SetFocus(true);
+
+  Widget* w = GetPreviousWidget(selected_widget, true);
+  SetFocusOn(w, true);
 }
 
 bool WidgetList::SendKey(SDL_keysym key)
 {
-  if (last_clicked != NULL)
-    return last_clicked->SendKey(key);
+  if (selected_widget != NULL)
+    return selected_widget->SendKey(key);
 
   return false;
 }
 
+void WidgetList::Draw(const Point2i &mousePosition) const
+{
+  for (std::list<Widget*>::const_iterator w=widget_list.begin();
+      w != widget_list.end();
+      w++)
+  {
+    (*w)->Draw(mousePosition);
+  }
+}
+
 Widget* WidgetList::ClickUp(const Point2i &mousePosition, uint button)
 {
   for(std::list<Widget*>::iterator w=widget_list.begin();
@@ -185,7 +301,7 @@ Widget* WidgetList::ClickUp(const Point2i &mousePosition, uint button)
       Widget* child = (*w)->ClickUp(mousePosition,button);
       if(child != NULL)
       {
-        SetMouseFocusOn(child);
+        SetFocusOn(child);
         return child;
       }
     }
@@ -219,18 +335,6 @@ void WidgetList::NeedRedrawing()
   }
 }
 
-void WidgetList::SetMouseFocusOn(Widget* w)
-{
-  if(last_clicked != NULL) {
-    last_clicked->SetFocus(false);
-  }
-
-  if (w != NULL) {
-    last_clicked = w ;
-    last_clicked->SetFocus(true);
-  }
-}
-
 void WidgetList::Pack()
 {
   for(std::list<Widget*>::iterator w=widget_list.begin();
diff --git a/src/gui/widget_list.h b/src/gui/widget_list.h
index e091b47..f91289f 100644
--- a/src/gui/widget_list.h
+++ b/src/gui/widget_list.h
@@ -35,9 +35,7 @@ private:
   /*********************************************/
 
   Point2i lastMousePosition;
-  Widget* last_clicked;
-  Widget* keyboard_selection;
-  Widget* mouse_selection;
+  Widget* selected_widget;
 
 protected:
   std::list<Widget*> widget_list;
@@ -49,7 +47,7 @@ public:
   virtual ~WidgetList();
 
   virtual void Update(const Point2i &mousePosition);
-  virtual void Draw(const Point2i &/*mousePosition*/) const { };
+  virtual void Draw(const Point2i &mousePosition) const;
   // set need_redrawing to true for all sub widgets;
   virtual void NeedRedrawing();
 
@@ -60,15 +58,21 @@ public:
 
   // to add a widget
   void AddWidget(Widget* widget);
+  void RemoveWidget(Widget* w);
 
   // Navigate between widget with keyboard
-  virtual void SetKeyboardFocusOnNextWidget();
-  virtual void SetKeyboardFocusOnPreviousWidget();
-  Widget * GetCurrentKeyboardSelectedWidget() const { return keyboard_selection; };
+  virtual void SetFocusOnNextWidget();
+  virtual void SetFocusOnPreviousWidget();
+  Widget * GetCurrentKeyboardSelectedWidget() const { return selected_widget; };
 
-  // set focus on a widget
-  void SetMouseFocusOn(Widget* widget);
+  // to implement WidgetBrowser
+  virtual Widget* GetFirstWidget() const;
+  virtual Widget* GetLastWidget() const;
+  virtual Widget* GetNextWidget(const Widget *w, bool loop) const;
+  virtual Widget* GetPreviousWidget(const Widget *w, bool loop) const;
+  virtual bool IsWidgetBrowser() const { return true; };
 
+  void SetFocusOn(Widget* widget, bool force_mouse_position = false);
   virtual void Pack();
 };
 
diff --git a/src/include/action.cpp b/src/include/action.cpp
index e6a3f88..04da84b 100644
--- a/src/include/action.cpp
+++ b/src/include/action.cpp
@@ -82,19 +82,19 @@ Action::Action (const char *is, DistantComputer* _creator)
 
 uint Action::ComputeCRC() const
 {
-  uint crc = 0;
+  uint _crc = 0;
   for(std::list<uint32_t>::const_iterator it = var.begin(); it != var.end(); it++)
-    crc += *it;
-  return crc;
+    _crc += *it;
+  return _crc;
 }
 
 bool Action::CheckCRC() const
 {
-  uint32_t crc;
-  crc = 0;
-  for(std::list<uint32_t>::const_iterator it = var.begin(); it != var.end(); it++)
-    crc += *it;
-  return this->crc == crc;
+  uint32_t _crc = ComputeCRC();
+
+  MSG_DEBUG("network.crc", "CRC : received %d, computed %d", crc, _crc);
+
+  return _crc == crc;
 }
 
 void Action::Init(Action_t type)
@@ -106,7 +106,7 @@ void Action::Init(Action_t type)
   crc = 0;
 }
 
-void Action::Write(char *os) const
+void Action::WriteTo(char *os) const
 {
   SDLNet_Write32(m_type, os);
   os += 4;
@@ -125,11 +125,11 @@ void Action::Write(char *os) const
 }
 
 // Convert the action to a packet
-void Action::WritePacket(char* &packet, int & size) const
+void Action::WriteToPacket(char* &packet, int & size) const
 {
   size = GetSize();
   packet = (char*)malloc(size);
-  Write(packet);
+  WriteTo(packet);
 }
 
 //-------------  Add datas to the action  ----------------
diff --git a/src/include/action.h b/src/include/action.h
index 3c5b7cb..9f37943 100644
--- a/src/include/action.h
+++ b/src/include/action.h
@@ -41,6 +41,7 @@ public:
     ACTION_NETWORK_CHANGE_STATE,
     ACTION_NETWORK_CHECK_PHASE1,
     ACTION_NETWORK_CHECK_PHASE2,
+    ACTION_NETWORK_DISCONNECT_ON_ERROR,
 
     // ########################################################
     ACTION_PLAYER_CHANGE_WEAPON,
@@ -105,16 +106,22 @@ public:
     // ########################################################
   } Action_t;
 
-protected:
+private:
   std::list<uint32_t> var;
   Action_t m_type;
   uint m_timestamp;
   uint crc;
+
+  DistantComputer* creator;
+
   Action(const Action& an_action);
   const Action& operator=(const Action&);
-public:
 
-  DistantComputer* creator;
+  void WriteTo(char *packet) const;
+
+  uint ComputeCRC() const;
+
+public:
 
   //inline Action_t &operator++() { ;}
 
@@ -171,12 +178,11 @@ public:
            + 4 // crc
            + int(var.size()) * 4;
   }
-  uint ComputeCRC() const;
   bool CheckCRC() const;
-  uint GetCRC() const { return crc; };
-  void Write(char *packet) const;
-  void WritePacket(char* & packet, int & size) const;
+  void WriteToPacket(char* & packet, int & size) const;
   Action_t GetType() const { return m_type; };
+
+  DistantComputer* GetCreator() const { return creator; } ;
 };
 
 //-----------------------------------------------------------------------------
diff --git a/src/include/action_handler.cpp b/src/include/action_handler.cpp
index a2c7732..f0cef47 100644
--- a/src/include/action_handler.cpp
+++ b/src/include/action_handler.cpp
@@ -26,9 +26,11 @@
 #include "character/character.h"
 #include "character/body.h"
 #include "character/move.h"
+#include "game/config.h"
 #include "game/game_mode.h"
 #include "game/game.h"
 #include "game/time.h"
+#include "include/app.h"
 #include "include/constant.h"
 #include "interface/game_msg.h"
 #include "network/chat.h"
@@ -66,11 +68,11 @@
 
 void Action_Nickname(Action *a)
 {
-  if(Network::GetInstance()->IsServer() && a->creator)
+  if (Network::GetInstance()->IsServer() && a->GetCreator())
   {
       std::string nickname = a->PopString();
       std::cout<<"New nickname: " + nickname<< std::endl;
-      a->creator->nickname = nickname;
+      a->GetCreator()->SetNickname(nickname);
   }
 }
 
@@ -85,19 +87,34 @@ void Action_Network_ChangeState (Action *a)
     switch (Network::GetInstance()->GetState())
     {
     case Network::NO_NETWORK:
-      a->creator->SetState(DistantComputer::STATE_INITIALIZED);
+      a->GetCreator()->SetState(DistantComputer::STATE_INITIALIZED);
       ASSERT(client_state == Network::NETWORK_MENU_OK);
       break;
 
     case Network::NETWORK_LOADING_DATA:
-      a->creator->SetState(DistantComputer::STATE_READY);
+      a->GetCreator()->SetState(DistantComputer::STATE_READY);
       ASSERT(client_state == Network::NETWORK_READY_TO_PLAY);
       break;
 
+    case Network::NETWORK_PLAYING:
+      a->GetCreator()->SetState(DistantComputer::STATE_NEXT_GAME);
+      ASSERT(client_state == Network::NETWORK_NEXT_GAME);
+      break;
+
+    case Network::NETWORK_NEXT_GAME:
+      if (client_state == Network::NETWORK_MENU_OK) {
+	a->GetCreator()->SetState(DistantComputer::STATE_INITIALIZED);
+      } else if (client_state == Network::NETWORK_NEXT_GAME) {
+	a->GetCreator()->SetState(DistantComputer::STATE_NEXT_GAME);
+      } else {
+	ASSERT(false);
+      }
+      break;
+
     default:
       NET_ASSERT(false)
       {
-        if(a->creator) a->creator->force_disconnect = true;
+        if(a->GetCreator()) a->GetCreator()->force_disconnect = true;
         return;
       }
       break;
@@ -123,7 +140,7 @@ void Action_Network_ChangeState (Action *a)
     default:
        NET_ASSERT(false)
        {
-         if(a->creator) a->creator->force_disconnect = true;
+         if(a->GetCreator()) a->GetCreator()->force_disconnect = true;
          return;
        }
     }
@@ -138,6 +155,7 @@ void Action_Network_Check_Phase1 (Action */*a*/)
 
   Action b(Action::ACTION_NETWORK_CHECK_PHASE2);
   b.Push(ActiveMap()->GetRawName());
+  b.Push(int(ActiveMap()->ReadImgGround().ComputeCRC()));
 
   TeamsList::iterator it = GetTeamsList().playing_list.begin();
   for (; it != GetTeamsList().playing_list.end() ; ++it) {
@@ -145,18 +163,56 @@ void Action_Network_Check_Phase1 (Action */*a*/)
   }
 
   // send information to the server
-  Network::GetInstance()->SendAction(&b);
+  Network::GetInstance()->SendAction(b);
 }
 
-static void Error_in_Network_Check_Phase2 (Action *a)
+enum net_error {
+  WRONG_MAP_NAME,
+  WRONG_MAP_CRC,
+  WRONG_TEAM
+};
+
+static std::string NetErrorId_2_String(enum net_error error)
 {
-  a->creator->force_disconnect = true;
-  std::string str = Format("Error initializing network: Client %s does not agree with you!!\n",
-			   a->creator->GetAddress().c_str());
-  std::cerr << str << std::endl;
+  std::string s;
+
+  switch (error) {
+  case WRONG_MAP_NAME:
+    s = _("Wrong map name!");
+    break;
+  case WRONG_MAP_CRC:
+    s = _("Wrong map CRC!");
+    break;
+  case WRONG_TEAM:
+    s = _("Wrong team!");
+    break;
+  }
+  return s;
+}
+
+void Action_Network_Disconnect_On_Error(Action *a)
+{
+  enum net_error error = (enum net_error)a->PopInt();
+  AppWormux::DisplayError(NetErrorId_2_String(error));
+  Network::Disconnect();
+}
 
-  // this client has been checked, it is NOT ok, it will be disconnected
-  a->creator->SetState(DistantComputer::STATE_CHECKED); // If not, it creates a deadlock.
+void DisconnectOnError(enum net_error error)
+{
+  Action a(Action::ACTION_NETWORK_DISCONNECT_ON_ERROR);
+  a.Push(int(error));
+  Network::GetInstance()->SendAction(a);
+  Network::Disconnect();
+}
+
+static void Error_in_Network_Check_Phase2 (Action *a, enum net_error error)
+{
+  std::string str = Format(_("Error initializing network: Client %s does not agree with you!! - %s"),
+			   a->GetCreator()->GetAddress().c_str(),
+			   NetErrorId_2_String(error).c_str());
+  std::cerr << str << std::endl;
+  DisconnectOnError(error);
+  AppWormux::DisplayError(str);
 }
 
 void Action_Network_Check_Phase2 (Action *a)
@@ -165,11 +221,20 @@ void Action_Network_Check_Phase2 (Action *a)
   if (Network::GetInstance()->IsClient())
     return;
 
-  // Check the map
+  // Check the map name
   std::string map = a->PopString();
   if (map != ActiveMap()->GetRawName()) {
     std::cerr << map << " != " << ActiveMap()->GetRawName() << std::endl;
-    Error_in_Network_Check_Phase2(a);
+    Error_in_Network_Check_Phase2(a, WRONG_MAP_NAME);
+    return;
+  }
+
+  // Check the map CRC
+  int crc = int(ActiveMap()->ReadImgGround().ComputeCRC());
+  int remote_crc = a->PopInt();
+  if (crc != remote_crc) {
+    std::cerr << map << " is different (crc=" << crc << ", remote crc="<< remote_crc << ")" << std::endl;
+    Error_in_Network_Check_Phase2(a, WRONG_MAP_CRC);
     return;
   }
 
@@ -179,13 +244,13 @@ void Action_Network_Check_Phase2 (Action *a)
   for (; it != GetTeamsList().playing_list.end() ; ++it) {
     team = a->PopString();
     if (team != (*it)->GetId()) {
-      Error_in_Network_Check_Phase2(a);
+      Error_in_Network_Check_Phase2(a, WRONG_TEAM);
       return;
     }
   }
 
   // this client has been checked, it's ok :-)
-  a->creator->SetState(DistantComputer::STATE_CHECKED);
+  a->GetCreator()->SetState(DistantComputer::STATE_CHECKED);
 }
 
 // ########################################################
@@ -254,7 +319,7 @@ void Action_Game_SetState (Action *a)
 {
   // to re-synchronize random number generator
   uint seed = a->PopInt();
-  randomSync.SetRand(seed);
+  RandomSync().SetRand(seed);
 
   Game::game_loop_state_t state = Game::game_loop_state_t(a->PopInt());
   Game::GetInstance()->Really_SetState(state);
@@ -266,8 +331,8 @@ void Action_Rules_SetGameMode (Action *a)
 {
   NET_ASSERT(Network::GetInstance()->IsClient())
   {
-    if (a->creator)
-      a->creator->force_disconnect = true;
+    if (a->GetCreator())
+      a->GetCreator()->force_disconnect = true;
     return;
   }
 
@@ -303,31 +368,21 @@ void SendGameMode()
 
   MSG_DEBUG("game_mode", "Sending game_mode: %s", game_mode_name.c_str());
 
-  Network::GetInstance()->SendAction(&a);
+  Network::GetInstance()->SendAction(a);
 }
 
 // ########################################################
 
 void Action_ChatMessage (Action *a)
 {
-  if(Network::GetInstance()->IsServer() && a->creator)
-  {
-    a->creator->SendChatMessage(a);
-  }
-  else
-  {
-    std::string msg = a->PopString();
-    ChatLogger::GetInstance()->LogMessage(msg);
-    if(Game::GetInstance()->IsGameLaunched())
-    {
-      //Add message to chat session in Game
-      Game::GetInstance()->chatsession.NewMessage(msg);
-    }
-    else if (Network::GetInstance()->network_menu != NULL) {
-      //Network Menu
-      Network::GetInstance()->network_menu->ReceiveMsgCallback(msg);
-    }
-  }
+  std::string nickname = a->PopString();
+  std::string message = a->PopString();
+
+  if (Network::GetInstance()->IsServer() && a->GetCreator())
+    a->GetCreator()->SetNickname(nickname);
+
+  ChatLogger::GetInstance()->LogMessage(nickname+"> "+message);
+  AppWormux::GetInstance()->ReceiveMsgCallback(nickname+"> "+message);
 }
 
 void Action_Menu_SetMap (Action *a)
@@ -346,14 +401,17 @@ void Action_Menu_SetMap (Action *a)
   }
 }
 
-void Action_Menu_AddTeam (Action *a)
+void UpdateLocalNickname()
 {
-  if(Network::GetInstance()->IsServer() && a->creator)
-  {
-    a->creator->ManageTeam(a);
-    return;
-  }
+  std::string nickname = GetTeamsList().GetLocalHeadCommanders();
+  if (nickname == "")
+    nickname = Network::GetInstance()->GetDefaultNickname();
 
+  Network::GetInstance()->SetNickname(nickname);
+}
+
+void Action_Menu_AddTeam (Action *a)
+{
   ConfigTeam the_team;
 
   the_team.id = a->PopString();
@@ -362,50 +420,67 @@ void Action_Menu_AddTeam (Action *a)
 
   MSG_DEBUG("action_handler.menu", "+ %s", the_team.id.c_str());
 
-  GetTeamsList().AddTeam(the_team);
+  bool local_team = (!Network::IsConnected() || !a->GetCreator());
+
+  GetTeamsList().AddTeam(the_team, local_team);
 
   if (Network::GetInstance()->network_menu != NULL)
-  {
     Network::GetInstance()->network_menu->AddTeamCallback(the_team.id);
+
+  if (Network::IsConnected()) {
+    if (!local_team)
+      a->GetCreator()->AddTeam(the_team.id);
+    else
+      UpdateLocalNickname();
   }
 }
 
 void Action_Menu_UpdateTeam (Action *a)
 {
+  std::string old_team_id = a->PopString();
+
   ConfigTeam the_team;
 
   the_team.id = a->PopString();
   the_team.player_name = a->PopString();
   the_team.nb_characters = uint(a->PopInt());
 
-  GetTeamsList().UpdateTeam (the_team);
+  GetTeamsList().UpdateTeam(old_team_id, the_team);
 
   if (Network::GetInstance()->network_menu != NULL)
-    Network::GetInstance()->network_menu->UpdateTeamCallback(the_team.id);
+    Network::GetInstance()->network_menu->UpdateTeamCallback(old_team_id, the_team.id);
+
+  if (Network::IsConnected()) {
+    if (a->GetCreator())
+      a->GetCreator()->UpdateTeam(old_team_id, the_team.id);
+    else
+      UpdateLocalNickname();
+  }
 }
 
 void Action_Menu_DelTeam (Action *a)
 {
-  if (Network::GetInstance()->IsServer() && a->creator)
-  {
-    a->creator->ManageTeam(a);
-    return;
-  }
+  std::string team_id = a->PopString();
 
-  std::string team = a->PopString();
+  if (Network::GetInstance()->IsServer() && a->GetCreator()) {
+    a->GetCreator()->RemoveTeam(team_id);
+  }
 
-  MSG_DEBUG("action_handler.menu", "- %s", team.c_str());
+  MSG_DEBUG("action_handler.menu", "- %s", team_id.c_str());
   if (Game::GetInstance()->IsGameLaunched() && Network::GetInstance()->IsServer()) {
     int i;
-    Team* t = GetTeamsList().FindById(team, i);
-    if (t == &ActiveTeam()) // we have loose the turn master!!
+    Team* the_team = GetTeamsList().FindById(team_id, i);
+    if (the_team == &ActiveTeam()) // we have loose the turn master!!
       Network::GetInstance()->SetTurnMaster(true);
   }
 
-  GetTeamsList().DelTeam (team);
+  GetTeamsList().DelTeam(team_id);
+
+  if (!a->GetCreator())
+    UpdateLocalNickname();
 
   if (Network::GetInstance()->network_menu != NULL)
-    Network::GetInstance()->network_menu->DelTeamCallback(team);
+    Network::GetInstance()->network_menu->DelTeamCallback(team_id);
 }
 
 // ########################################################
@@ -416,7 +491,7 @@ void SyncCharacters()
   ASSERT(Network::GetInstance()->IsTurnMaster());
 
   Action a_begin_sync(Action::ACTION_NETWORK_SYNC_BEGIN);
-  Network::GetInstance()->SendAction(&a_begin_sync);
+  Network::GetInstance()->SendAction(a_begin_sync);
   TeamsList::iterator
     it=GetTeamsList().playing_list.begin(),
     end=GetTeamsList().playing_list.end();
@@ -435,7 +510,7 @@ void SyncCharacters()
     }
   }
   Action a_sync_end(Action::ACTION_NETWORK_SYNC_END);
-  Network::GetInstance()->SendAction(&a_sync_end);
+  Network::GetInstance()->SendAction(a_sync_end);
 }
 
 void Action_Character_Jump (Action */*a*/)
@@ -469,11 +544,11 @@ void SendActiveCharacterAction(const Action& a)
 {
   ASSERT(ActiveTeam().IsLocal() || ActiveTeam().IsLocalAI());
   Action a_begin_sync(Action::ACTION_NETWORK_SYNC_BEGIN);
-  Network::GetInstance()->SendAction(&a_begin_sync);
+  Network::GetInstance()->SendAction(a_begin_sync);
   SendActiveCharacterInfo();
-  Network::GetInstance()->SendAction(&a);
+  Network::GetInstance()->SendAction(a);
   Action a_end_sync(Action::ACTION_NETWORK_SYNC_END);
-  Network::GetInstance()->SendAction(&a_end_sync);
+  Network::GetInstance()->SendAction(a_end_sync);
 }
 
 // Send character information over the network (it's totally stupid to send it locally ;-)
@@ -481,7 +556,7 @@ void SendCharacterInfo(int team_no, int char_no)
 {
   Action a(Action::ACTION_CHARACTER_SET_PHYSICS);
   a.StoreCharacter(team_no, char_no);
-  Network::GetInstance()->SendAction(&a);
+  Network::GetInstance()->SendAction(a);
 }
 
 uint last_time = 0;
@@ -604,7 +679,7 @@ void Action_Wind (Action *a)
 void Action_Network_RandomInit (Action *a)
 {
   MSG_DEBUG("random", "Initialization from network");
-  randomSync.SetRand(a->PopInt());
+  RandomSync().SetRand(a->PopInt());
 }
 
 void Action_Network_SyncBegin (Action */*a*/)
@@ -631,9 +706,13 @@ void Action_Network_Connect(Action *a)
   ChatLogger::LogMessageIfOpen(msg);
   if(Game::GetInstance()->IsGameLaunched())
     GameMessages::GetInstance()->Add(msg);
-  else if (Network::GetInstance()->network_menu != NULL)
-    //Network Menu
-    Network::GetInstance()->network_menu->ReceiveMsgCallback(msg);
+  else if (Network::GetInstance()->network_menu != NULL) {
+    // Play some sound to warn server player
+    if (Config::GetInstance()->GetWarnOnNewPlayer())
+      JukeBox::GetInstance()->Play("share", "menu/newcomer");
+    // Menu
+    AppWormux::GetInstance()->ReceiveMsgCallback(msg);
+  }
 }
 
 // Only used to notify clients that someone disconnected from the server
@@ -645,7 +724,7 @@ void Action_Network_Disconnect(Action *a)
     GameMessages::GetInstance()->Add(msg);
   } else if (Network::GetInstance()->network_menu != NULL)
     //Network Menu
-    Network::GetInstance()->network_menu->ReceiveMsgCallback(msg);
+    AppWormux::GetInstance()->ReceiveMsgCallback(msg);
 }
 
 void Action_Explosion (Action *a)
@@ -718,18 +797,20 @@ void ActionHandler::NewAction(Action* a, bool repeat_to_network)
   queue.push_back(a);
   //  std::cout << "  queue_size " << queue.size() << std::endl;
   SDL_UnlockMutex(mutex);
-  if (repeat_to_network) Network::GetInstance()->SendAction(a);
+
+  if (repeat_to_network)
+    Network::GetInstance()->SendAction(*a);
 }
 
 void ActionHandler::NewActionActiveCharacter(Action* a)
 {
   ASSERT(ActiveTeam().IsLocal() || ActiveTeam().IsLocalAI());
   Action a_begin_sync(Action::ACTION_NETWORK_SYNC_BEGIN);
-  Network::GetInstance()->SendAction(&a_begin_sync);
+  Network::GetInstance()->SendAction(a_begin_sync);
   SendActiveCharacterInfo();
   NewAction(a);
   Action a_end_sync(Action::ACTION_NETWORK_SYNC_END);
-  Network::GetInstance()->SendAction(&a_end_sync);
+  Network::GetInstance()->SendAction(a_end_sync);
 }
 
 void ActionHandler::Register (Action::Action_t action,
@@ -750,7 +831,7 @@ void ActionHandler::Exec(Action *a)
   handler_it it=handler.find(a->GetType());
   NET_ASSERT(it != handler.end())
   {
-    if(a->creator) a->creator->force_disconnect = true;
+    if(a->GetCreator()) a->GetCreator()->force_disconnect = true;
     return;
   }
   (*it->second) (a);
@@ -780,6 +861,7 @@ ActionHandler::ActionHandler():
   Register (Action::ACTION_NETWORK_CHANGE_STATE, "NETWORK_change_state", &Action_Network_ChangeState);
   Register (Action::ACTION_NETWORK_CHECK_PHASE1, "NETWORK_check1", &Action_Network_Check_Phase1);
   Register (Action::ACTION_NETWORK_CHECK_PHASE2, "NETWORK_check2", &Action_Network_Check_Phase2);
+  Register (Action::ACTION_NETWORK_DISCONNECT_ON_ERROR, "NETWORK_disconnect_on_error", &Action_Network_Disconnect_On_Error);
 
   // ########################################################
   Register (Action::ACTION_PLAYER_CHANGE_WEAPON, "PLAYER_change_weapon", &Action_Player_ChangeWeapon);
diff --git a/src/include/app.h b/src/include/app.h
index 0962356..ffe7fe1 100644
--- a/src/include/app.h
+++ b/src/include/app.h
@@ -47,6 +47,8 @@ private:
 public:
   void SetCurrentMenu(Menu *menu);
   void RefreshDisplay();
+  static void DisplayError(const std::string &msg);
+  void ReceiveMsgCallback(const std::string& msg);
   static AppWormux * GetInstance();
   ~AppWormux();
 
diff --git a/src/interface/game_msg.cpp b/src/interface/game_msg.cpp
index 3fcc930..7040cb7 100644
--- a/src/interface/game_msg.cpp
+++ b/src/interface/game_msg.cpp
@@ -53,7 +53,7 @@ void GameMessages::Draw(){
   uint msgy = 50;
 
   for( iterator i=liste.begin(); i != liste.end(); ++i ){
-    (*i)->DrawCenterTop(Point2i(AppWormux::GetInstance()->video->window.GetWidth()/2, msgy));
+    (*i)->DrawCenterTop(Point2i(GetMainWindow().GetWidth()/2, msgy));
     msgy += HAUT_POLICE_MINI + INTERLIGNE_MINI;
   }
 }
diff --git a/src/interface/interface.cpp b/src/interface/interface.cpp
index 33569f2..fd55b88 100644
--- a/src/interface/interface.cpp
+++ b/src/interface/interface.cpp
@@ -50,7 +50,7 @@ Interface::Interface()
   display = true;
   start_hide_display = 0;
   start_show_display = 0;
-  display_minimap = false;
+  display_minimap = true;
 
   Profile *res = resource_manager.LoadXMLProfile( "graphism.xml", false);
   game_menu = resource_manager.LoadImage( res, "interface/background_interface");
@@ -300,12 +300,29 @@ void Interface::DrawTeamEnergy() const
 // Draw map preview
 void Interface::DrawMapPreview()
 {
-  Surface& window  = AppWormux::GetInstance()->video->window;
+  Surface&       window  = GetMainWindow();
   const Surface* preview = world.ground.GetPreview();
-  Point2i  offset  = window.GetSize() - world.ground.GetPreviewSize() - Point2i(MARGIN/2, 2*MARGIN);
+  Point2i        offset(window.GetWidth() - world.ground.GetPreviewSize().x - 2*MARGIN, 2*MARGIN);
+  Rectanglei     rect_preview(offset, world.ground.GetPreviewSize());
+
   window.Blit(*preview, world.ground.GetPreviewRect(), offset);
-  Rectanglei rect_preview(offset, world.ground.GetPreviewSize());
+
+  // Draw water
+  if (world.water.IsActive()) {
+    const Color *color = world.water.GetColor();
+    ASSERT(color);
+
+    // Scale water height according to preview size
+    uint       h = (world.water.GetSelfHeight() * rect_preview.GetSizeY() + (world.GetSize().GetY()/2))
+                 / world.GetSize().GetY();
+    Rectanglei water(offset.x, offset.y+rect_preview.GetSizeY()-h, rect_preview.GetSizeX(), h);
+
+    // Draw box with color according to water type
+    window.BoxColor(water, *color);
+  }
+
   world.ToRedrawOnScreen(rect_preview);
+  window.RectangleColor(rect_preview, white_color);
 
   FOR_EACH_TEAM(team) {
     const Surface& icon = (*team)->GetMiniFlag();
@@ -315,7 +332,7 @@ void Interface::DrawMapPreview()
          ++character) {
       if (!character -> IsDead()) {
         Point2i     coord = world.ground.PreviewCoordinates((*character).GetPosition()) + offset;
-        
+
         window.Blit(icon, coord - icon.GetSize()/2);
         if (character->IsActiveCharacter()) {
           uint radius = (icon.GetSize().x < icon.GetSize().y) ? icon.GetSize().y : icon.GetSize().x;
@@ -413,8 +430,9 @@ void Interface::Hide()
     start_hide_display = Time::GetInstance()->Read() - (1000 - ((int)Time::GetInstance()->Read() - start_hide_display));
 }
 
-void Interface::UpdateTimer(uint utimer)
+void Interface::UpdateTimer(uint utimer, const Color& color)
 {
+  timer->SetColor(color);
   timer->Set(ulong2str(utimer));
   remaining_turn_time = utimer;
 }
@@ -433,7 +451,7 @@ void AbsoluteDraw(const Surface &s, const Point2i& pos)
   Rectanglei rectSource(rectSurface.GetPosition() - pos, rectSurface.GetSize());
   Point2i ptDest = rectSurface.GetPosition() - Camera::GetInstance()->GetPosition();
 
-  AppWormux::GetInstance()->video->window.Blit(s, rectSource, ptDest);
+  GetMainWindow().Blit(s, rectSource, ptDest);
 }
 
 void HideGameInterface()
diff --git a/src/interface/interface.h b/src/interface/interface.h
index 5686b75..275d1e5 100644
--- a/src/interface/interface.h
+++ b/src/interface/interface.h
@@ -25,6 +25,7 @@
 #include "include/base.h"
 #include "include/singleton.h"
 #include "weapon_menu.h"
+#include "graphic/colors.h"
 #include "gui/energy_bar.h"
 #include "gui/energy_bar.h"
 #include "gui/progress_bar.h"
@@ -119,7 +120,7 @@ protected:
    Point2i GetSize() const;
 
    void SetCurrentOverflyWeapon(Weapon * weapon) { weapon_under_cursor = weapon; };
-   void UpdateTimer(uint utimer);
+   void UpdateTimer(uint utimer, const Color& color = black_color);
    void UpdateWindIndicator(int wind_value) { wind_bar.UpdateValue(wind_value); };
    void EnableDisplayTimer (bool _display) {display_timer = _display;};
    void ToggleMinimap() { display_minimap = !display_minimap; };
diff --git a/src/interface/loading_screen.cpp b/src/interface/loading_screen.cpp
index 0e0df36..75a132f 100644
--- a/src/interface/loading_screen.cpp
+++ b/src/interface/loading_screen.cpp
@@ -54,8 +54,8 @@ LoadingScreen::~LoadingScreen()
 
 void LoadingScreen::DrawBackground()
 {
-  loading_bg->ScaleSize(AppWormux::GetInstance()->video->window.GetWidth(), AppWormux::GetInstance()->video->window.GetHeight());
-  loading_bg->Blit( AppWormux::GetInstance()->video->window, 0, 0);
+  loading_bg->ScaleSize(GetMainWindow().GetWidth(), GetMainWindow().GetHeight());
+  loading_bg->Blit( GetMainWindow(), 0, 0);
   AppWormux::GetInstance()->video->Flip();
 }
 
@@ -65,14 +65,14 @@ void LoadingScreen::StartLoading(uint nb, const std::string& resource,
   const Surface& image = resource_manager.LoadImage(res, "loading_screen/"+resource);
 
   int slot_margin_x = (120/2 - image.GetWidth()/2);
-  int x = (AppWormux::GetInstance()->video->window.GetWidth()/2)- (3*120) + nb*120;
-  int y = (AppWormux::GetInstance()->video->window.GetHeight()/2)+40;
+  int x = (GetMainWindow().GetWidth()/2)- (3*120) + nb*120;
+  int y = (GetMainWindow().GetHeight()/2)+40;
 
   Rectanglei dest ( x+slot_margin_x,
                     y,
                     image.GetWidth(),
                     image.GetHeight() );
-  AppWormux::GetInstance()->video->window.Blit( image, dest.GetPosition());
+  GetMainWindow().Blit( image, dest.GetPosition());
 
   Font::GetInstance(Font::FONT_MEDIUM)->WriteCenter(Point2i(x+120/2, y+80), label, white_color);
 
diff --git a/src/interface/mouse.cpp b/src/interface/mouse.cpp
index caf7016..2015070 100644
--- a/src/interface/mouse.cpp
+++ b/src/interface/mouse.cpp
@@ -38,6 +38,7 @@
 #include "tool/point.h"
 #include "tool/resource_manager.h"
 #include "weapon/weapon.h"
+#include "game/time.h"
 
 std::string __pointers[] = {
   "mouse/pointer_standard",
@@ -58,7 +59,8 @@ std::string __pointers[] = {
 std::map<Mouse::pointer_t, MouseCursor> Mouse::cursors;
 
 Mouse::Mouse():
-  lastpos(-1,-1)
+  lastpos(-1,-1),
+  last_hide_time(0)
 {
   visible = MOUSE_VISIBLE;
 
@@ -75,6 +77,19 @@ Mouse::Mouse():
   resource_manager.UnLoadXMLProfile(res);
 }
 
+bool Mouse::HasFocus() const
+{
+  Uint8 state = SDL_GetAppState();
+
+  if ((state & SDL_APPMOUSEFOCUS) &&
+      (state & SDL_APPINPUTFOCUS) &&
+      (state & SDL_APPACTIVE)) {
+    return true;
+  }
+
+  return false;
+}
+
 void Mouse::ActionLeftClic(bool) const
 {
   const Point2i pos_monde = GetWorldPosition();
@@ -148,9 +163,13 @@ void Mouse::ActionWheelDown(bool shift) const
 
 bool Mouse::HandleClic (const SDL_Event& event) const
 {
+  if (!HasFocus()) {
+    return false;
+  }
+
   if ( event.type != SDL_MOUSEBUTTONDOWN &&
        event.type != SDL_MOUSEBUTTONUP ) {
-    return false ;
+    return false;
   }
 
   if (Game::GetInstance()->ReadState() != Game::PLAYING)
@@ -219,7 +238,7 @@ void Mouse::Refresh()
     {
       Show();
       lastpos = pos;
-      counter = NB_LOOP_BEFORE_HIDE;  
+      counter = NB_LOOP_BEFORE_HIDE;
       ShowGameInterface();
     }
   else
@@ -291,7 +310,7 @@ void Mouse::Draw() const
 
   const MouseCursor& cursor = GetCursor(current_pointer);
   const Surface& surf = cursor.GetSurface();
-  AppWormux::GetInstance()->video->window.Blit(surf, GetPosition() - cursor.GetClicPos());
+  GetMainWindow().Blit(surf, GetPosition() - cursor.GetClicPos());
   world.ToRedrawOnScreen(Rectanglei(GetPosition().x - cursor.GetClicPos().x,
                                     GetPosition().y - cursor.GetClicPos().y,
 				    surf.GetWidth(), surf.GetHeight()));
@@ -299,26 +318,44 @@ void Mouse::Draw() const
 
 void Mouse::Show()
 {
+  if(((Time::GetInstance()->Read()-last_hide_time) > 10000) && (visible == MOUSE_HIDDEN))
+  {
+      CenterPointer();
+  }
   visible = MOUSE_VISIBLE;
 
   if (Config::GetInstance()->GetDefaultMouseCursor()) {
     SDL_ShowCursor(true); // be sure cursor is visible
   }
+
 }
 
 void Mouse::Hide()
 {
+  if(visible == MOUSE_VISIBLE)
+  {
+  last_hide_time = Time::GetInstance()->Read();
+  }
   visible = MOUSE_HIDDEN;
   SDL_ShowCursor(false); // be sure cursor is invisible
+
 }
 
 // Center the pointer on the screen
 void Mouse::CenterPointer()
 {
+  SetPosition(Point2i(GetMainWindow().GetWidth() / 2,
+		      GetMainWindow().GetHeight() / 2));
+}
+
+void Mouse::SetPosition(Point2i pos)
+{
+  if (!HasFocus()) // The application has not the focus, don't move the mouse cursor!
+    return;
+
   MSG_DEBUG("mouse", "1) %d, %d\n", GetPosition().GetX(), GetPosition().GetY());
 
-  SDL_WarpMouse(AppWormux::GetInstance()->video->window.GetWidth() / 2,
-                AppWormux::GetInstance()->video->window.GetHeight() / 2);
+  SDL_WarpMouse(pos.x, pos.y);
   SDL_PumpEvents(); // force new position else GetPosition does not return new position
 
   lastpos = GetPosition();
diff --git a/src/interface/mouse.h b/src/interface/mouse.h
index 6aa2b7a..9ea5c9d 100644
--- a/src/interface/mouse.h
+++ b/src/interface/mouse.h
@@ -65,6 +65,7 @@ private:
 
   visibility_t visible;
   pointer_t current_pointer;
+  uint last_hide_time;
 
   void GetDesignatedCharacter() const;
 
@@ -85,6 +86,7 @@ public:
   Point2i GetPosition() const;
   Point2i GetWorldPosition() const;
   void CenterPointer();
+  void SetPosition(Point2i pos);
 
   // Choose the pointer
   pointer_t GetPointer() const;
@@ -95,6 +97,8 @@ public:
   void Show();
   void Hide();
 
+  bool HasFocus() const;
+
   visibility_t GetVisibility() const { return visible; };
 };
 #endif
diff --git a/src/interface/weapon_menu.cpp b/src/interface/weapon_menu.cpp
index e0430df..2ca150d 100644
--- a/src/interface/weapon_menu.cpp
+++ b/src/interface/weapon_menu.cpp
@@ -144,7 +144,8 @@ WeaponsMenu::WeaponsMenu():
   jelly_time(JELLY_TIME),
   rotation_time(ROTATION_TIME),
   nbr_weapon_type(0),
-  nb_weapon_type(new int[MAX_NUMBER_OF_WEAPON])
+  nb_weapon_type(new int[MAX_NUMBER_OF_WEAPON]),
+  old_pointer(Mouse::POINTER_SELECT)
 {
   // Loading value from XML
   Profile *res = resource_manager.LoadXMLProfile("graphism.xml", false);
@@ -219,6 +220,8 @@ void WeaponsMenu::Show()
     show = true;
 
     JukeBox::GetInstance()->Play("share", "menu/weapon_menu_show");
+
+    old_pointer = Mouse::GetInstance()->SetPointer(Mouse::POINTER_SELECT);
   }
 }
 
@@ -234,6 +237,8 @@ void WeaponsMenu::Hide(bool play_sound)
 
     if (play_sound)
       JukeBox::GetInstance()->Play("share", "menu/weapon_menu_hide");
+
+    Mouse::GetInstance()->SetPointer(old_pointer);
   }
 }
 
@@ -290,8 +295,8 @@ void WeaponsMenu::RefreshWeaponList()
 AffineTransform2D WeaponsMenu::ComputeToolTransformation()
 {
   // Init animation parameter
-  Point2d start(AppWormux::GetInstance()->video->window.GetWidth(), 0);
-  Point2i pos(AppWormux::GetInstance()->video->window.GetSize() / 2 + Point2i((int)(tools_menu->GetWidth() / 2) + 10, 0));
+  Point2d start(GetMainWindow().GetWidth(), 0);
+  Point2i pos(GetMainWindow().GetSize() / 2 + Point2i((int)(tools_menu->GetWidth() / 2) + 10, 0));
   Point2d end(POINT2I_2_POINT2D(pos));
   double zoom_start = 0.2, zoom_end = 1.0;
   double angle_start = M_PI * GetRotationTime(), angle_end = 0.0;
@@ -308,7 +313,7 @@ AffineTransform2D WeaponsMenu::ComputeWeaponTransformation()
 {
   // Init animation parameter
   Point2d start(0, 0);
-  Point2i pos(AppWormux::GetInstance()->video->window.GetSize() / 2 - Point2i((int)(weapons_menu->GetWidth() / 2) + 10, 0));
+  Point2i pos(GetMainWindow().GetSize() / 2 - Point2i((int)(weapons_menu->GetWidth() / 2) + 10, 0));
   Point2d end(POINT2I_2_POINT2D(pos));
   double zoom_start = 0.2, zoom_end = 1.0;
   double angle_start = -M_PI * GetRotationTime(), angle_end = 0.0;
diff --git a/src/interface/weapon_menu.h b/src/interface/weapon_menu.h
index 9f56a05..131a1c6 100644
--- a/src/interface/weapon_menu.h
+++ b/src/interface/weapon_menu.h
@@ -23,8 +23,10 @@
 #define WEAPON_MENU_H
 
 #include "include/base.h"
-#include "tool/affine_transform.h"
+#include "interface/mouse.h"
 #include "graphic/polygon.h"
+#include "tool/affine_transform.h"
+
 #include <vector>
 
 // Forward declaration
@@ -76,6 +78,8 @@ class WeaponsMenu
   int nbr_weapon_type; // number of weapon type = number of rows
   int * nb_weapon_type;
 
+  Mouse::pointer_t old_pointer;
+
  public:
   WeaponsMenu();
   ~WeaponsMenu();
diff --git a/src/main.cpp b/src/main.cpp
index 9fd4685..b852454 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -50,15 +50,18 @@ using namespace std;
 #include "menu/main_menu.h"
 #include "menu/network_connection_menu.h"
 #include "menu/options_menu.h"
+#include "menu/skin_menu.h"
 #include "network/index_server.h"
 #include "particles/particle.h"
 #include "sound/jukebox.h"
 #include "tool/debug.h"
 #include "tool/i18n.h"
+#include "tool/random.h"
 
 static MainMenu::menu_item choice = MainMenu::NONE;
 static bool skip_menu = false;
-//static NetworkConnectionMenu::network_menu_action_t net_action = NetworkConnectionMenu::NET_BROWSE_INTERNET;
+static const char* skin = NULL;
+static NetworkConnectionMenu::network_menu_action_t net_action = NetworkConnectionMenu::NET_NOTHING;
 
 AppWormux *AppWormux::singleton = NULL;
 
@@ -76,7 +79,7 @@ AppWormux::AppWormux():
   menu(NULL)
 {
   JukeBox::GetInstance()->Init();
-
+  RandomLocal().InitRandom();
   cout << "[ " << _("Run game") << " ]" << endl;
 }
 
@@ -122,9 +125,8 @@ int AppWormux::Main(void)
         }
         case MainMenu::NETWORK:
         {
-          NetworkConnectionMenu network_connection_menu;
+          NetworkConnectionMenu network_connection_menu(net_action);
           menu = &network_connection_menu;
-          //network_connection_menu.SetAction(net_action);
           network_connection_menu.Run(skip_menu);
           break;
         }
@@ -151,13 +153,21 @@ int AppWormux::Main(void)
         }
         case MainMenu::QUIT:
           quit = true;
+          break;
+        case MainMenu::SKIN_VIEWER:
+        {
+          SkinMenu skin_menu(skin);
+          menu = &skin_menu;
+          skin_menu.Run();
+          break;
+        }
         default:
           break;
       }
       menu = NULL;
       choice = MainMenu::NONE;
       skip_menu = false;
-      //net_action = NetworkConnectionMenu::NET_BROWSE_INTERNET;
+      net_action = NetworkConnectionMenu::NET_NOTHING;
     }
     while (!quit);
 
@@ -166,8 +176,9 @@ int AppWormux::Main(void)
   catch(const exception & e)
   {
     cerr << endl
-      << "C++ exception caught:" << endl
-      << e.what() << endl << endl;
+	 << "C++ exception caught:" << endl
+	 << e.what() << endl << endl;
+    AppWormux::DisplayError(e.what());
     WakeUpDebugger();
   }
   catch(...)
@@ -227,6 +238,30 @@ void AppWormux::RefreshDisplay()
   }
 }
 
+void AppWormux::DisplayError(const std::string &msg)
+{
+  if (singleton == NULL) {
+    std::cerr << msg << std::endl;
+    return;
+  }
+
+  if (Game::GetInstance()->IsGameLaunched()) {
+    // nothing to do
+  } else if (singleton->menu) {
+      singleton->menu->DisplayError(msg);
+  }
+}
+
+void AppWormux::ReceiveMsgCallback(const std::string& msg)
+{
+  if (Game::GetInstance()->IsGameLaunched()) {
+    //Add message to chat session in Game
+    Game::GetInstance()->chatsession.NewMessage(msg);
+  } else if (menu) {
+    menu->ReceiveMsgCallback(msg);
+  }
+}
+
 void AppWormux::End() const
 {
   cout << endl << "[ " << _("Quit Wormux") << " ]" << endl;
@@ -274,6 +309,26 @@ void DisplayWelcomeMessage()
 #endif
 }
 
+void PrintUsage(const char* cmd_name)
+{
+  printf("usage: \n");
+  printf("%s -h|--help : show this help\n", cmd_name);
+  printf("%s -v|--version : show the version\n", cmd_name);
+  printf("%s -r|--reset-config : reset the configuration to default\n", cmd_name);
+  printf("%s -y|--skin-viewer [team] : start the skin viewer (for development only)\n", cmd_name);
+  printf("%s [-p|--play] [-g|--game-mode <game_mode>]"
+	 " [-s|--server] [-c|--client [ip]]\n"
+	 " [-l [ip/hostname of index server]]\n"
+#ifdef DEBUG
+	 " [-d|--debug <debug_masks>|all]\n"
+#endif
+	 , cmd_name);
+#ifdef DEBUG
+  printf("\nWith :\n");
+  printf(" <debug_masks> ::= { action | action_handler | action_handler.menu | ai | ai.move | body | body_anim | body.state | bonus | box | camera.follow | camera.shake | camera.tracking | character | character.collision | character.energy | damage | downloader | explosion | game | game.endofturn | game_mode | game.statechange | ghost | grapple.break | grapple.hook | grapple.node | ground_generator.element | index_server | jukebox | jukebox.cache | jukebox.play | lst_objects | map | map.collision | map.load | map.random | menu | mine | mouse | network | network.crc | network.crc_bad | network.traffic | network.turn_master | physical | physical.mem | physic.compute | physic.fall | physic.move | physic.overlapping | physic.pendulum | physic.physic | physic.position | physic.state | physic.sync | random | random.get | singleton | socket | sprite | team | test_rectangle | weapon | weapon.change | weapon.handposition | weapon.projectile | weapon.shoot | widget.border | wind | xml | xml.tree }\n");
+#endif
+}
+
 void ParseArgs(int argc, char * argv[])
 {
   int c;
@@ -284,39 +339,27 @@ void ParseArgs(int argc, char * argv[])
       {"blitz",      no_argument,       NULL, 'b'},
       {"version",    no_argument,       NULL, 'v'},
       {"play",       no_argument,       NULL, 'p'},
-      {"internet",   no_argument,       NULL, 'i'},
       {"client",     optional_argument, NULL, 'c'},
       {"server",     no_argument,       NULL, 's'},
+      {"skin-viewer",optional_argument, NULL, 'y'},
       {"game-mode",  required_argument, NULL, 'g'},
       {"debug",      required_argument, NULL, 'd'},
+      {"reset-config", no_argument,     NULL, 'r'},
       {NULL,         no_argument,       NULL,  0 }
     };
 
-  while ((c = getopt_long (argc, argv, "hbvpic::l::sg:d:",
+  while ((c = getopt_long (argc, argv, "hbvpc::l::sy::g:d:",
                            long_options, &option_index)) != -1)
     {
       switch (c)
         {
         case 'h':
-          printf("usage: %s [-h|--help] [-v|--version] [-p|--play]"
-                 " [-i|--internet] [-s|--server] [-c|--client [ip]]\n"
-		 " [-g|--game-mode <game_mode>]"
-#ifdef DEBUG
-                 " [-d|--debug <debug_masks>|all]\n"
-#endif
-                 " [-l [ip/hostname]]\n", argv[0]);
-#ifdef DEBUG
-          printf("\nWith :\n");
-          printf(" <debug_masks> ::= { action | action_handler | action_handler.menu | ai | ai.move | body | body_anim | body.state | bonus | box | camera.follow | camera.shake | camera.tracking | character | character.collision | character.energy | damage | downloader | explosion | game | game.endofturn | game_mode | game.statechange | ghost | grapple.break | grapple.hook | grapple.node | ground_generator.element | index_server | jukebox | jukebox.cache | jukebox.play | lst_objects | map | map.collision | map.load | map.random | menu | mine | mouse | network | network.crc | network.crc_bad | network.traffic | network.turn_master | physical | physical.mem | physic.compute | physic.fall | physic.move | physic.overlapping | physic.pendulum | physic.physic | physic.position | physic.state | physic.sync | random | random.get | singleton | socket | sprite | team | test_rectangle | weapon | weapon.change | weapon.handposition | weapon.projectile | weapon.shoot | widget.border | wind }\n");
-#endif
-          exit(0);
-          break;
-        case 'b':
-          Game::SetMode(Game::BLITZ);
+	  PrintUsage(argv[0]);
+          exit(EXIT_SUCCESS);
           break;
         case 'v':
           DisplayWelcomeMessage();
-          exit(0);
+          exit(EXIT_SUCCESS);
           break;
         case 'p':
           choice = MainMenu::PLAY;
@@ -324,10 +367,10 @@ void ParseArgs(int argc, char * argv[])
           break;
         case 'c':
           choice = MainMenu::NETWORK;
-          //net_action = NetworkConnectionMenu::NET_CONNECT_LOCAL;
+          net_action = NetworkConnectionMenu::NET_CONNECT;
           if (optarg)
             {
-              Config::GetInstance()->SetNetworkHost(optarg);
+              Config::GetInstance()->SetNetworkClientHost(optarg);
             }
           skip_menu = true;
           break;
@@ -341,22 +384,35 @@ void ParseArgs(int argc, char * argv[])
           break;
         case 's':
           choice = MainMenu::NETWORK;
-          //net_action = NetworkConnectionMenu::NET_HOST;
-          skip_menu = true;
-          break;
-        case 'i':
-          choice = MainMenu::NETWORK;
-          //net_action = NetworkConnectionMenu::NET_BROWSE_INTERNET;
+          net_action = NetworkConnectionMenu::NET_HOST;
           skip_menu = true;
           break;
         case 'l':
           if (optarg) IndexServer::GetInstance()->SetLocal(optarg);
           else        IndexServer::GetInstance()->SetLocal();
           break;
+        case 'y':
+          choice = MainMenu::SKIN_VIEWER;
+          skin = optarg;
+          skip_menu = true;
+          break;
 	case 'g':
 	  printf("Game-mode: %s\n", optarg);
 	  Config::GetInstance()->SetGameMode(optarg);
 	  break;
+	case 'r':
+	  {
+	    bool r;
+	    r = Config::GetInstance()->RemovePersonalConfigFile();
+	    if (!r)
+	      exit(EXIT_FAILURE);
+	    exit(EXIT_SUCCESS);
+	  }
+	  break;
+	default:
+	  fprintf(stderr, "Unknow option %c", c);
+	  PrintUsage(argv[0]);
+	  exit(EXIT_FAILURE);
         }
     }
 }
diff --git a/src/map/camera.cpp b/src/map/camera.cpp
index 448a107..1772412 100644
--- a/src/map/camera.cpp
+++ b/src/map/camera.cpp
@@ -215,6 +215,9 @@ void Camera::RestoreMouseCursor()
 
 void Camera::ScrollCamera()
 {
+  if (!Mouse::GetInstance()->HasFocus()) // The application has not the focus, don't move the camera!!
+    return;
+
   Point2i mousePos = Mouse::GetInstance()->GetPosition();
 
   uint zone_size = Config::GetInstance()->GetScrollBorderSize();
@@ -315,6 +318,7 @@ void Camera::FollowObject(const PhysicalObj *obj, bool follow,
   MSG_DEBUG( "camera.tracking", "Following object %s",
                                  obj->GetName().c_str());
 
+  Mouse::GetInstance()->Hide();
   if (followed_object != obj || !IsVisible(*obj) || auto_crop != follow)
     auto_crop = follow;
 
@@ -362,8 +366,8 @@ Point2i Camera::ComputeShake() const
         func_val = ( 1 - t ) * sin( arg ) / arg;
     };
 
-    float x_ampl = ( float )Random::GetDouble( -m_shake_amplitude.x, m_shake_amplitude.x );
-    float y_ampl = ( float )Random::GetDouble( -m_shake_amplitude.y, m_shake_amplitude.y );
+    float x_ampl = ( float )RandomLocal().GetDouble( -m_shake_amplitude.x, m_shake_amplitude.x );
+    float y_ampl = ( float )RandomLocal().GetDouble( -m_shake_amplitude.y, m_shake_amplitude.y );
     m_shake.x = ( int )( x_ampl * func_val//( float )m_shake_amplitude.x * func_val
         + ( float )m_shake_centerpoint.x );
     m_shake.y = ( int )( y_ampl * func_val//( float )m_shake_amplitude.y * func_val
diff --git a/src/map/ground.cpp b/src/map/ground.cpp
index e9f2222..d03447b 100644
--- a/src/map/ground.cpp
+++ b/src/map/ground.cpp
@@ -33,6 +33,7 @@
 #include "include/app.h"
 #include "include/constant.h"
 #include "tool/i18n.h"
+#include "tool/isnan.h"
 #include "tool/resource_manager.h"
 
 Ground::Ground()
@@ -89,14 +90,7 @@ double Ground::Tangent(int x,int y) const {
    */
   Point2i p1,p2;
   if(!PointContigu(x,y, p1.x,p1.y, -1,-1))
-  {
-#ifdef _MSC_VER
-    const unsigned long nan[2] ={0xffffffff, 0x7fffffff};
-    return *( double* )nan;
-#else
-    return NAN;
-#endif
-  }
+    return getNaN();
 
   if(!PointContigu(x,y, p2.x,p2.y, p1.x,p1.y))
   {
diff --git a/src/map/maps_list.cpp b/src/map/maps_list.cpp
index 8be0c89..bf5fbeb 100644
--- a/src/map/maps_list.cpp
+++ b/src/map/maps_list.cpp
@@ -21,6 +21,7 @@
 
 #include "include/action.h"
 #include "map/maps_list.h"
+#include "map/water.h"
 #include "game/config.h"
 #include "graphic/surface.h"
 #include "tool/resource_manager.h"
@@ -28,6 +29,7 @@
 #include "tool/file_tools.h"
 #include "tool/i18n.h"
 #include "tool/random.h"
+#include "tool/string_tools.h"
 #include "tool/xml_document.h"
 #include <iostream>
 #include <algorithm>
@@ -52,6 +54,7 @@ InfoMap::InfoMap(const std::string &map_name,
   random_generated(false),
   island_type(RANDOM_GENERATED),
   water_type(Water::NO_WATER),
+  water_name(),
   res_profile(NULL)
 {
   wind.nb_sprite = 0;
@@ -84,11 +87,17 @@ void InfoMap::LoadBasicInfo()
   MSG_DEBUG("map.load", "Map loaded: %s", m_map_name.c_str());
 }
 
-bool InfoMap::ProcessXmlData(xmlNode *xml)
+bool InfoMap::ProcessXmlData(const xmlNode *xml)
 {
+    uint tmpisle = (uint) island_type;
+
   XmlReader::ReadBool(xml, "random", random_generated);
+
+  XmlReader::ReadUint(xml, "generator", tmpisle);
+  island_type = (Island_type) tmpisle;
+
   // Read author informations
-  xmlNode *author = XmlReader::GetMarker(xml, "author");
+  const xmlNode *author = XmlReader::GetMarker(xml, "author");
   if (author != NULL) {
     std::string
       a_name,
@@ -124,11 +133,8 @@ bool InfoMap::ProcessXmlData(xmlNode *xml)
   XmlReader::ReadBool(xml, "is_open", is_opened);
 
   // reading water type
-  water_type = Water::NO_WATER;
-  uint wtype;
-  XmlReader::ReadUint(xml, "water", wtype);
-  if (wtype < uint(Water::MAX_WATER_TYPE))
-    water_type = Water::Water_type(wtype);
+  XmlReader::ReadString(xml, "water", water_name);
+  water_type = (Water::Water_type)Water::GetWaterType(water_name);
 
   // Load padding value
   bool add_pad = false;
@@ -138,7 +144,7 @@ bool InfoMap::ProcessXmlData(xmlNode *xml)
     lower_right_pad = resource_manager.LoadPoint2i(res_profile, "lower_right_pad");
   }
 
-  xmlNode* xmlwind = XmlReader::GetMarker(xml, "wind");
+  const xmlNode* xmlwind = XmlReader::GetMarker(xml, "wind");
   if (xmlwind != NULL)
   {
     double rot_speed=0.0;
@@ -304,7 +310,7 @@ void MapsList::SelectMapByName (const std::string &name)
 {
   // Random map!!
   if (name == "random") {
-    active_map_index = Random::GetLong(0, lst.size()-1);
+    active_map_index = RandomLocal().GetLong(0, lst.size()-1);
 
     MSG_DEBUG("map.random", "select %u", active_map_index);
     random_map = true;
@@ -362,3 +368,21 @@ InfoMap* ActiveMap()
 {
   return MapsList::GetInstance()->ActiveMap();
 }
+
+std::string InfoMap::GetWaterName()
+{
+  LoadBasicInfo();
+  int water;
+  if(str2int(water_name, water) && water < Water::MAX_WATER_TYPE) {
+    if(water == Water::WATER) {
+      return "water";
+    } else if(water == Water::LAVA) {
+      return "lava";
+    } else if(water == Water::RADIOACTIVE) {
+      return "radioactive";
+    }
+  }
+  // not an old water definition or invalid type
+  return water_name;
+}
+
diff --git a/src/map/maps_list.h b/src/map/maps_list.h
index af198b8..0360778 100644
--- a/src/map/maps_list.h
+++ b/src/map/maps_list.h
@@ -31,6 +31,7 @@
 // Forward declarations
 class Action;
 class Profile;
+class Water;
 typedef struct _xmlNode xmlNode;
 
 class InfoMap {
@@ -39,6 +40,7 @@ class InfoMap {
     RANDOM_GENERATED,
     SINGLE_ISLAND,
     PLATEFORMS,
+    GRID_ELEMENTS,
     DEFAULT
   } Island_type;
 
@@ -73,12 +75,13 @@ private:
   Point2i lower_right_pad;
   Island_type island_type;
   Water::Water_type water_type;
+  std::string water_name;
 
   struct s_wind wind;
 
   Profile *res_profile;
 
-  bool ProcessXmlData(xmlNode* xml);
+  bool ProcessXmlData(const xmlNode* xml);
   void LoadData();
   void LoadBasicInfo(); // Fails with abort if error
 
@@ -87,31 +90,32 @@ public:
   ~InfoMap();
   void FreeData();
 
-  const std::string& GetRawName() const { return m_map_name; };
-  const std::string& GetDirectory() const { return m_directory; };
-  const std::string& ReadFullMapName() { LoadBasicInfo(); return name; };
-  const std::string& ReadAuthorInfo() { LoadBasicInfo(); return author_info; };
-  const std::string& ReadMusicPlaylist() { LoadBasicInfo(); return music_playlist; };
+  const std::string& GetRawName() const { return m_map_name; }
+  const std::string& GetDirectory() const { return m_directory; }
+  const std::string& ReadFullMapName() { LoadBasicInfo(); return name; }
+  const std::string& ReadAuthorInfo() { LoadBasicInfo(); return author_info; }
+  const std::string& ReadMusicPlaylist() { LoadBasicInfo(); return music_playlist; }
   std::string GetConfigFilepath() const;
 
   Surface& ReadImgGround();
   Surface& ReadImgSky();
-  const Surface& ReadPreview() { LoadBasicInfo(); return preview; };
+  const Surface& ReadPreview() { LoadBasicInfo(); return preview; }
 
-  const struct s_wind& GetWind() const { return wind; };
+  const struct s_wind& GetWind() const { return wind; }
 
-  uint GetNbBarrel() { LoadBasicInfo(); return nb_barrel; };
-  uint GetNbMine() { LoadBasicInfo(); return nb_mine; };
-  Profile * ResProfile() const { return res_profile; };
+  uint GetNbBarrel() { LoadBasicInfo(); return nb_barrel; }
+  uint GetNbMine() { LoadBasicInfo(); return nb_mine; }
+  Profile * ResProfile() const { return res_profile; }
 
-  bool IsOpened() { LoadBasicInfo(); return is_opened; };
-  bool IsRandomGenerated() { LoadBasicInfo(); return random_generated; };
-  Water::Water_type WaterType() { LoadBasicInfo(); return water_type; };
+  bool IsOpened() { LoadBasicInfo(); return is_opened; }
+  bool IsRandomGenerated() { LoadBasicInfo(); return random_generated; }
+  std::string GetWaterName();
+  const Water::Water_type& GetWaterType() { return water_type; }
 
-  Point2i GetUpperLeftPad() { return upper_left_pad; };
-  Point2i GetLowerRightPad() { return lower_right_pad; };
-  void SetUpperLeftPad(const Point2i & value) { upper_left_pad = value; };
-  void SetLowerRightPad(const Point2i & value) { lower_right_pad = value; };
+  Point2i GetUpperLeftPad() { return upper_left_pad; }
+  Point2i GetLowerRightPad() { return lower_right_pad; }
+  void SetUpperLeftPad(const Point2i & value) { upper_left_pad = value; }
+  void SetLowerRightPad(const Point2i & value) { lower_right_pad = value; }
 
 };
 
diff --git a/src/map/random_map.cpp b/src/map/random_map.cpp
index 59e6d6f..af74743 100644
--- a/src/map/random_map.cpp
+++ b/src/map/random_map.cpp
@@ -24,21 +24,18 @@
 #include "graphic/polygon_generator.h"
 #include "graphic/sprite.h"
 #include "map/maps_list.h"
+#include "network/randomsync.h"
 #include "tool/affine_transform.h"
-#include "tool/random.h"
 #include "tool/resource_manager.h"
 #include "tool/debug.h"
 #include "tool/xml_document.h"
 #include <sstream>
-#ifdef _WIN32
-#  include <time.h>
-#endif
 
 Surface * RandomElementList::GetRandomElement()
 {
   if(size() == 0)
     return NULL;
-  return (*this)[Random::GetInt(0, size() - 1)];
+  return (*this)[RandomSync().GetInt(0, size() - 1)];
 }
 
 RandomElementList::~RandomElementList()
@@ -126,20 +123,20 @@ void RandomMap::GeneratePlatforms()
 
   XmlReader::ReadUint(profile->doc->GetRoot(), "platform_element_chance", elemchance);
 
-  uint nplats = Random::GetInt(minplats, maxplats);
+  uint nplats = RandomSync().GetInt(minplats, maxplats);
 
   result.Fill(0);
 
   for (uint i = 0; i < nplats; i++) {
-    double wid = Random::GetDouble(minwidth, maxwidth);
-    double hei = Random::GetDouble(minhei, maxhei);
-    if (Random::GetInt(0,99) < (int) vertchance) {
+    double wid = RandomSync().GetDouble(minwidth, maxwidth);
+    double hei = RandomSync().GetDouble(minhei, maxhei);
+    if (RandomSync().GetInt(0,99) < (int) vertchance) {
       double tmp = wid;
       wid = hei;
       hei = tmp;
     }
-    double x = Random::GetDouble(0, (width - wid));
-    double y = Random::GetDouble(0, (height - hei));
+    double x = RandomSync().GetDouble(0, (width - wid));
+    double y = RandomSync().GetDouble(0, (height - hei));
 
     Polygon *tmp = new Polygon();
 
@@ -148,9 +145,9 @@ void RandomMap::GeneratePlatforms()
     tmp->AddPoint(Point2d(x+wid, y+hei));
     tmp->AddPoint(Point2d(x, y+hei));
 
-    if (Random::GetInt(0,99) < (int)elemchance) {
+    if (RandomSync().GetInt(0,99) < (int)elemchance) {
       Surface * random_element = random_element_list.GetRandomElement();
-      int dx = Random::GetInt((int)(x+10), (int)(x+wid-10));
+      int dx = RandomSync().GetInt((int)(x+10), (int)(x+wid-10));
       int dy = (int) (y+(minhei / 2));
       if (random_element != NULL) {
         Surface * tmp_surf = new Surface(random_element->GetSurface());
@@ -158,7 +155,7 @@ void RandomMap::GeneratePlatforms()
       }
     }
 
-    bezier_shape = tmp->GetBezierInterpolation(1.0, 30, Random::GetDouble(0.0, 0.5));
+    bezier_shape = tmp->GetBezierInterpolation(1.0, 30, RandomSync().GetDouble(0.0, 0.5));
 
     // Expand
     expanded_bezier_shape = new Polygon(*bezier_shape);
@@ -185,11 +182,11 @@ void RandomMap::GeneratePlatforms()
 
 void RandomMap::GenerateIsland()
 {
-  double minhei = height / Random::GetDouble(7, 5);
-  double maxhei = height / Random::GetDouble(1.5, 4);
+  double minhei = height / RandomSync().GetDouble(7, 5);
+  double maxhei = height / RandomSync().GetDouble(1.5, 4);
 
-  double current_y_pos = height - Random::GetDouble(minhei, maxhei);
-  int num_of_points = Random::GetInt(5, 20);
+  double current_y_pos = height - RandomSync().GetDouble(minhei, maxhei);
+  int num_of_points = RandomSync().GetInt(5, 20);
 
   result.Fill(0);
 
@@ -199,10 +196,10 @@ void RandomMap::GenerateIsland()
   tmp->AddPoint(Point2d(-100, height + 100));
 
   for (int i = 1; i < num_of_points - 1; i++) {
-    current_y_pos = height - Random::GetDouble(minhei, maxhei);
+    current_y_pos = height - RandomSync().GetDouble(minhei, maxhei);
     double current_x_pos = (((double)i / (double) num_of_points) * (double)width);
     tmp->AddPoint(Point2d(current_x_pos, current_y_pos));
-    if (Random::GetInt(0, 5) < 1) {
+    if (RandomSync().GetInt(0, 5) < 1) {
       Surface * random_element = random_element_list.GetRandomElement();
       if(random_element != NULL) {
         Point2i position((int)current_x_pos, (int)(current_y_pos + 20.0));
@@ -217,7 +214,9 @@ void RandomMap::GenerateIsland()
   tmp->AddPoint(Point2d(width / 2, height + 100));
 
   // Get bezier interpolation
-  bezier_shape = tmp->GetBezierInterpolation(1.0, 30, Random::GetDouble(0.0, 0.5));
+  double nb = RandomSync().GetDouble(0.0, 0.5);
+  MSG_DEBUG("ground_generator.island", "bezier interpolation: 1.0, 30, %f", nb);
+  bezier_shape = tmp->GetBezierInterpolation(1.0, 30, nb);
   delete tmp;
 
   // Expand
@@ -237,18 +236,66 @@ void RandomMap::GenerateIsland()
   DrawElement();
 }
 
+void RandomMap::GenerateGridElements()
+{
+    uint grid_wid = 300, grid_hei = 300;
+    uint elemchance = 75;
+    uint elem_adj_x_min = 0, elem_adj_x_max = 0;
+    uint elem_adj_y_min = 0, elem_adj_y_max = 0;
+
+    uint dx, dy;
+
+    if (number_of_element < 1) return;
+
+    XmlReader::ReadUint(profile->doc->GetRoot(), "generator_grid_wid", grid_wid);
+    if (grid_wid < 1) grid_wid = 1;
+
+    XmlReader::ReadUint(profile->doc->GetRoot(), "generator_grid_hei", grid_hei);
+    if (grid_hei < 1) grid_hei = 1;
+
+    XmlReader::ReadUint(profile->doc->GetRoot(), "generator_element_chance", elemchance);
+
+    XmlReader::ReadUint(profile->doc->GetRoot(), "generator_element_adj_x_min", elem_adj_x_min);
+    XmlReader::ReadUint(profile->doc->GetRoot(), "generator_element_adj_x_max", elem_adj_x_max);
+    if (elem_adj_x_min > elem_adj_x_max) elem_adj_x_min = elem_adj_x_max;
+
+    XmlReader::ReadUint(profile->doc->GetRoot(), "generator_element_adj_y_min", elem_adj_y_min);
+    XmlReader::ReadUint(profile->doc->GetRoot(), "generator_element_adj_y_max", elem_adj_y_max);
+    if (elem_adj_y_min > elem_adj_y_max) elem_adj_y_min = elem_adj_y_max;
+
+    result.Fill(0);
+
+    for (dx = grid_wid; dx < (uint)width; dx += grid_wid)
+	for (dy = grid_hei; dy < (uint)height; dy += grid_hei)
+	    if (RandomSync().GetInt(0,99) < (int)elemchance) {
+		Surface * random_element = random_element_list.GetRandomElement();
+		if (random_element != NULL) {
+		    uint ex = dx + RandomSync().GetInt(elem_adj_x_min, elem_adj_x_max);
+		    uint ey = dy + RandomSync().GetInt(elem_adj_y_min, elem_adj_y_max);
+		    Surface * tmp_surf = new Surface(random_element->GetSurface());
+		    AddElement(tmp_surf, Point2i(ex, ey));
+		}
+	    }
+
+    DrawElement();
+}
+
 void RandomMap::Generate(InfoMap::Island_type generator)
 {
-  srand(time(NULL));
+  MSG_DEBUG("map.generation", "> Begin creation of random generated map");
+
   if(generator == InfoMap::RANDOM_GENERATED) {
-    generator = (InfoMap::Island_type) Random::GetInt(InfoMap::SINGLE_ISLAND, InfoMap::DEFAULT);
+    generator = (InfoMap::Island_type) RandomSync().GetInt(InfoMap::SINGLE_ISLAND, InfoMap::DEFAULT);
     generator = InfoMap::PLATEFORMS;
   }
   switch (generator) {
     case InfoMap::PLATEFORMS: GeneratePlatforms(); break;
     case InfoMap::SINGLE_ISLAND: GenerateIsland(); break;
+    case InfoMap::GRID_ELEMENTS: GenerateGridElements(); break;
     default: GenerateIsland(); break;
   }
+
+  MSG_DEBUG("map.generation", "< End creation of random generated map");
 }
 
 void RandomMap::SaveMap()
diff --git a/src/map/random_map.h b/src/map/random_map.h
index faa96b6..7fed7d0 100644
--- a/src/map/random_map.h
+++ b/src/map/random_map.h
@@ -98,6 +98,7 @@ class RandomMap {
    void Generate(InfoMap::Island_type generator);
    void GenerateIsland();
    void GeneratePlatforms();
+   void GenerateGridElements();
    void SaveMap();
    Surface GetRandomMap() const { return result; };
 };
diff --git a/src/map/sky.cpp b/src/map/sky.cpp
index 3228a67..266c8f0 100644
--- a/src/map/sky.cpp
+++ b/src/map/sky.cpp
@@ -51,7 +51,7 @@ void Sky::Draw(bool redraw_all)
 {
   if(last_pos != Camera::GetInstance()->GetPosition() || redraw_all) {
     last_pos = Camera::GetInstance()->GetPosition();
-    RedrawParticle(Rectanglei(Camera::GetInstance()->GetPosition(), AppWormux::GetInstance()->video->window.GetSize()));
+    RedrawParticle(Rectanglei(Camera::GetInstance()->GetPosition(), GetMainWindow().GetSize()));
     return;
   }
 
@@ -71,18 +71,18 @@ void Sky::RedrawParticle(const Rectanglei &particle) const
 {
   Rectanglei ds(GetSkyPos() + particle.GetPosition() - Camera::GetInstance()->GetPosition(),
                 particle.GetSize());
-  AppWormux::GetInstance()->video->window.Blit(image, ds, particle.GetPosition() - Camera::GetInstance()->GetPosition());
+  GetMainWindow().Blit(image, ds, particle.GetPosition() - Camera::GetInstance()->GetPosition());
 }
 
 Point2i Sky::GetSkyPos() const
 {
   Point2i min(0, 0);
-  Point2i max = image.GetSize() - AppWormux::GetInstance()->video->window.GetSize();
+  Point2i max = image.GetSize() - GetMainWindow().GetSize();
   Point2i tmp = Camera::GetInstance()->GetPosition();
   int w_w = world.GetWidth();
   int w_h = world.GetHeight();
-  int v_w = AppWormux::GetInstance()->video->window.GetWidth();
-  int v_h = AppWormux::GetInstance()->video->window.GetHeight();
+  int v_w = GetMainWindow().GetWidth();
+  int v_h = GetMainWindow().GetHeight();
   double x_sky = (double)(tmp.x) / (double)(w_w - v_w);
   double y_sky = (double)(tmp.y) / (double)(w_h - v_h);
   return max * Point2d(x_sky, y_sky);
diff --git a/src/map/tile.cpp b/src/map/tile.cpp
index 5015c96..010f52f 100644
--- a/src/map/tile.cpp
+++ b/src/map/tile.cpp
@@ -26,14 +26,20 @@
 #include "include/app.h"
 #include "map/camera.h"
 
+// We need only one empty tile
+TileItem_Empty EmptyTile;
+
 Tile::Tile()
 : m_preview(NULL)
 {
 }
 
 void Tile::FreeMem(){
-  for (uint i=0; i<nbr_cell; ++i)
-    delete item[i];
+  for (uint i=0; i<nbr_cell; ++i) {
+    // Don't delete empty tile as we use only one instance for empty tile
+    if(item[i] != &EmptyTile)
+      delete item[i];
+  }
   nbr_cell = 0;
   item.clear();
   if (m_preview)
@@ -178,7 +184,8 @@ void Tile::MergeSprite(const Point2i &position, Surface& surf){
       TileItem *ti = item[c.y*nbCells.x + c.x];
       Point2i offset = position - c * CELL_SIZE;
       if(ti->IsTotallyEmpty()) {
-        delete item[c.y*nbCells.x + c.x];
+        // Don't delete the old item as we use only one empty tile
+        // delete item[c.y*nbCells.x + c.x];
         ti = item[c.y*nbCells.x + c.x] = new TileItem_AlphaSoftware(CELL_SIZE);
         ti->GetSurface().SetAlpha(0,0);
         ti->GetSurface().Fill(0x00000000);
@@ -196,7 +203,7 @@ void Tile::InitPreview()
 {
   Point2i offset     =  m_upper_left_offset + m_lower_right_offset;
   Point2i world_size = size - offset;
-  m_last_video_size = AppWormux::GetInstance()->video->window.GetSize();
+  m_last_video_size = GetMainWindow().GetSize();
   m_shift = 0;
   while (world_size > m_last_video_size/4)
   {
@@ -216,7 +223,7 @@ void Tile::InitPreview()
 // Rerender all of the preview
 void Tile::CheckPreview()
 {
-  if (AppWormux::GetInstance()->video->window.GetSize() == m_last_video_size)
+  if (GetMainWindow().GetSize() == m_last_video_size)
     return;
 
   InitPreview();
@@ -277,7 +284,7 @@ void Tile::LoadImage(Surface& terrain, const Point2i & upper_left_offset, const
       printf("\nDeleting tile %i",i);
 #endif
       delete item[i];
-      item[i] = (TileItem*)new TileItem_Empty;
+      item[i] = (TileItem*)&EmptyTile;
     }
 #ifdef DBG_TILE
     else
@@ -329,7 +336,7 @@ void Tile::DrawTile_Clipped(Rectanglei worldClip) const
         Point2i ptDest = destRect.GetPosition() - Camera::GetInstance()->GetPosition();
         Point2i ptSrc = destRect.GetPosition() - c * CELL_SIZE;
 
-        AppWormux::GetInstance()->video->window.Blit( item[c.y*nbCells.x + c.x]->GetSurface(), Rectanglei(ptSrc, destRect.GetSize()) , ptDest);
+        GetMainWindow().Blit( item[c.y*nbCells.x + c.x]->GetSurface(), Rectanglei(ptSrc, destRect.GetSize()) , ptDest);
       }
     }
 }
@@ -388,7 +395,8 @@ void Tile::CheckEmptyTiles()
      printf("Deleting tile %i\n",i);
 #endif
       delete item[i];
-      item[i] = (TileItem*)new TileItem_Empty;
+      // Don't instanciate a new empty tile but use the already existing one
+      item[i] = (TileItem*)&EmptyTile;
     }
   }
 }
diff --git a/src/map/tile.h b/src/map/tile.h
index 6ab7bfd..4cd9eeb 100644
--- a/src/map/tile.h
+++ b/src/map/tile.h
@@ -28,6 +28,9 @@
 class Surface;
 class Sprite;
 class TileItem;
+class TileItem_Empty;
+
+extern TileItem_Empty EmptyTile;
 
 const uint EXPLOSION_BORDER_SIZE = 10;
 
diff --git a/src/map/tileitem.cpp b/src/map/tileitem.cpp
index 41e7ba5..4173e37 100644
--- a/src/map/tileitem.cpp
+++ b/src/map/tileitem.cpp
@@ -27,6 +27,7 @@
 #include "include/app.h"
 #include "map/camera.h"
 #include "tool/error.h"
+#include "tool/math_tools.h"
 #include "tool/point.h"
 //#include "tool/stats.h"
 #ifdef DBG_TILE
@@ -48,14 +49,14 @@ void TileItem::ScalePreview(uint8_t *odata, uint opitch, uint shift)
 
 // === Common to all TileItem_* except TileItem_Emtpy ==============================
 void TileItem_AlphaSoftware::Draw(const Point2i &pos){
-  AppWormux::GetInstance()->video->window.Blit(GetSurface(),
+  GetMainWindow().Blit(GetSurface(),
         pos * CELL_SIZE - Camera::GetInstance()->GetPosition());
 }
 
 void TileItem_Empty::Draw(const Point2i &/*pos*/)
 {
 #ifdef DBG_TILE
-  AppWormux::GetInstance()->video->window.FillRect(Rectanglei(pos * CELL_SIZE - Camera::GetInstance()->GetPosition(),CELL_SIZE), c_red);
+  GetMainWindow().FillRect(Rectanglei(pos * CELL_SIZE - Camera::GetInstance()->GetPosition(),CELL_SIZE), c_red);
 #endif
 }
 // === Implemenation of TileItem_Software_ALpha ==============================
@@ -132,44 +133,36 @@ void TileItem_AlphaSoftware::Dig(const Point2i &center, const uint radius){
   const uint line_size = m_surface.GetPitch();
   const uint bpp       = m_surface.GetBytesPerPixel();
 
-  int y = (center.y - (int)radius - (int)EXPLOSION_BORDER_SIZE >= 0) ? (center.y - (int)radius - EXPLOSION_BORDER_SIZE) : 0;
+  int y = center.y - (int)(radius+EXPLOSION_BORDER_SIZE);
+  if (y < 0) y = 0;
   buf += y * line_size;
 
   //Empties each line of the tile horizontaly that are in the circle
-  while ( (uint) y <= center.y + radius + EXPLOSION_BORDER_SIZE&& y < CELL_SIZE.y )
+  for (; (uint)y <= center.y + radius + EXPLOSION_BORDER_SIZE && y < CELL_SIZE.y;
+       buf += line_size, y++)
   {
     //Abscisse distance from the center of the circle to the circle
     int dac = center.y - y;
 
-    //Angle on the circle
-    float angle = asin( (float)dac / (float)radius);
+    //Darken the border of the removed ground
+    int blength = lround(sqrt((double)(radius+EXPLOSION_BORDER_SIZE)*(radius+EXPLOSION_BORDER_SIZE) - dac*dac));
+
+    //Nothing to empty, just darken
+    if ((uint)abs(dac) > radius) {
+	Darken(center.x-blength, center.x+blength, buf, bpp);
+	continue;
+    }
 
     //Zone of the line which needs to be emptied
-    int start_x, end_x, lenght;
-    lenght = (int) ((float) radius * cos (angle));
-    lenght = lenght > 0 ? lenght : - lenght;
-    start_x = center.x - lenght;
-    lenght *= 2;
-    end_x = start_x + lenght;
-    Empty(start_x, end_x, buf, bpp);
+    int length = lround(sqrt((double)radius*radius - dac*dac));
 
-    //Darken the border of the removed ground
     // Left half of the circle
-    int bstart_x, bend_x, blenght;
-    angle = asin( (float)dac / (float)(radius + EXPLOSION_BORDER_SIZE));
-    blenght = (int) ((float) (radius + EXPLOSION_BORDER_SIZE) * cos (angle));
-    blenght = blenght > 0 ? blenght : - blenght;
-    bstart_x = center.x - blenght;
-    bend_x = bstart_x + (blenght - lenght/2);
-    Darken(bstart_x, bend_x, buf, bpp);
-
-    // Right half of the circle
-    bstart_x = center.x + lenght/2 + 1;
-    bend_x = bstart_x + (blenght - lenght/2);
-    Darken(bstart_x, bend_x, buf, bpp);
-
-    buf += line_size;
-    y++;
+    Darken(center.x-blength, center.x-length, buf, bpp);
+
+    // Rigth half of the circle
+    Darken(center.x+length, center.x+blength, buf, bpp);
+
+    Empty(center.x-length, center.x+length, buf, bpp);
   }
 }
 
diff --git a/src/map/water.cpp b/src/map/water.cpp
index 61c8eec..66d65bf 100644
--- a/src/map/water.cpp
+++ b/src/map/water.cpp
@@ -30,6 +30,7 @@
 #include "particles/particle.h"
 #include "tool/math_tools.h"
 #include "tool/resource_manager.h"
+#include "tool/string_tools.h"
 
 const uint GO_UP_TIME = 1; // min
 const uint GO_UP_STEP = 15; // pixels
@@ -38,7 +39,14 @@ const uint GO_UP_OSCILLATION_NBR = 30; // amplitude
 const float t = (GO_UP_OSCILLATION_TIME*1000.0);
 const float a = GO_UP_STEP/t;
 const float b = 1.0;
-int pattern_height = 0; // TODO: relocate
+
+int Water::pattern_height = 0;
+
+Water::~Water()
+{
+  if (type_color)
+    delete type_color;
+}
 
 /*
  * Water consists of 1) water.png texture, which is the actual wave and
@@ -55,25 +63,19 @@ int pattern_height = 0; // TODO: relocate
 void Water::Init()
 {
   std::string image = "gfx/";
-  switch (water_type) {
-  case WATER:
-    image += "water";
-    break;
-  case LAVA:
-    image += "lava";
-    break;
-  default:
-    ASSERT(false);
-    break;
-  }
+  image += water_name;
 
-  Profile *res = resource_manager.LoadXMLProfile( "graphism.xml", false);
+  Profile *res = resource_manager.LoadXMLProfile("graphism.xml", false);
 
   surface = resource_manager.LoadImage(res, image);
   surface.SetAlpha(0, 0);
 
   image += "_bottom";
 
+  if (water_type != NO_WATER)
+    type_color = new Color(resource_manager.LoadColor(res, "water_colors/" + water_name));
+  else
+    type_color = NULL;
   bottom = resource_manager.LoadImage(res, image);
   bottom.SetAlpha(0, 0);
 
@@ -101,9 +103,30 @@ void Water::Init()
   resource_manager.UnLoadXMLProfile(res);
 }
 
+Water::Water_type Water::GetWaterType(std::string & water)
+{
+  if(water == "water") {
+    return WATER;
+  } else if(water == "lava") {
+    return LAVA;
+  } else if(water == "radioactive") {
+    return RADIOACTIVE;
+  } else { // Old water definition (aka 0 = no water, 1 = water, 2 = lava etc)
+    int water_t;
+    if(str2int(water, water_t) && water_t < MAX_WATER_TYPE) {
+      return (Water_type)water_t;
+    }
+  }
+  return NO_WATER;
+}
+
 void Water::Reset()
 {
-  water_type = ActiveMap()->WaterType();
+  water_name = ActiveMap()->GetWaterName();
+  water_type = GetWaterType(water_name);
+  if (type_color)
+    delete type_color;
+  type_color = NULL;
 
   if (!IsActive())
     return;
@@ -269,7 +292,16 @@ void Water::Splash(const Point2i& pos) const
   case LAVA:
     ParticleEngine::AddNow(Point2i(pos.x, pos.y-5), 5, particle_LAVA, true, -1, 20);
     break;
+  case RADIOACTIVE:
+    ParticleEngine::AddNow(Point2i(pos.x, pos.y-5), 5, particle_RADIOACTIVE, true, -1, 20);
+    break;
   default:
     break;
   }
 }
+
+void Water::Smoke(const Point2i& pos) const
+{
+  ParticleEngine::AddNow(Point2i(pos.x, pos.y-5), 2, particle_SMOKE, true, 0, 1);
+}
+
diff --git a/src/map/water.h b/src/map/water.h
index ba81beb..324de36 100644
--- a/src/map/water.h
+++ b/src/map/water.h
@@ -29,6 +29,9 @@
 const uint WATER_INITIAL_HEIGHT = 100;
 #define pattern_width 180
 
+// Forward declaration
+class Color;
+
 class Water
 {
 public:
@@ -36,10 +39,13 @@ public:
     NO_WATER,
     WATER,
     LAVA,
+    RADIOACTIVE,
     MAX_WATER_TYPE
   } Water_type;
 
 private:
+  static int pattern_height;
+  Color* type_color;
   int height_mvt;
   double shift1;
   uint water_height;
@@ -50,8 +56,11 @@ private:
   Surface bottom;
   Surface wpattern;
   Water_type water_type;
+  std::string water_name;
 
 public:
+  Water() : type_color(NULL) { }
+  ~Water();
   void Init();
   void Reset();
   void Free();
@@ -59,7 +68,11 @@ public:
   void Draw();
   bool IsActive() const { return water_type != NO_WATER; }
   int GetHeight(int x) const;
+  uint GetSelfHeight() const { return water_height+(pattern_height/2); }
+  static Water_type GetWaterType(std::string & water);
+  const Color* GetColor() { return type_color; }
 
   void Splash(const Point2i& pos) const;
+  void Smoke(const Point2i& pos) const;
 };
 #endif
diff --git a/src/map/wind.cpp b/src/map/wind.cpp
index 78b86e3..7339e06 100644
--- a/src/map/wind.cpp
+++ b/src/map/wind.cpp
@@ -51,13 +51,13 @@ WindParticle::WindParticle(const std::string &xml_file, float scale) :
   double mass, wind_factor ;
   //Mass = mass_mean + or - 25%
   mass = GetMass();
-  mass *= (1.0 + randomObj.GetLong(-100, 100)/400.0);
+  mass *= (1.0 + RandomLocal().GetLong(-100, 100)/400.0);
   SetMass (mass);
   SetSize( Point2i(20,20) );
   wind_factor = GetWindFactor() ;
-  wind_factor *= (1.0 + randomObj.GetLong(-100, 100)/400.0);
+  wind_factor *= (1.0 + RandomLocal().GetLong(-100, 100)/400.0);
   SetWindFactor(wind_factor);
-  SetAirResistFactor(GetAirResistFactor() * (1.0 + randomObj.GetLong(-100, 100)/400.0));
+  SetAirResistFactor(GetAirResistFactor() * (1.0 + RandomLocal().GetLong(-100, 100)/400.0));
 
   MSG_DEBUG("wind", "Create wind particle: %s, %f, %f", xml_file.c_str(), mass, wind_factor);
 
@@ -75,24 +75,24 @@ WindParticle::WindParticle(const std::string &xml_file, float scale) :
   sprite->Scale(scale, scale);
   sprite->RefreshSurface();
   sprite->SetAlpha(scale);
-  sprite->SetCurrentFrame(randomObj.GetLong(0, sprite->GetFrameCount() - 1));
+  sprite->SetCurrentFrame(RandomLocal().GetLong(0, sprite->GetFrameCount() - 1));
 
   if(ActiveMap()->GetWind().need_flip) {
     flipped = new Sprite(*sprite);
     flipped->Scale(-scale, scale);
     flipped->RefreshSurface();
     flipped->SetAlpha(scale);
-    flipped->SetCurrentFrame(randomObj.GetLong(0, sprite->GetFrameCount()-1));
+    flipped->SetCurrentFrame(RandomLocal().GetLong(0, sprite->GetFrameCount()-1));
   } else {
     flipped = NULL;
   }
 
   if(ActiveMap()->GetWind().rotation_speed != 0.0) {
     sprite->EnableRotationCache(64);
-    sprite->SetRotation_rad(randomObj.GetLong(0,628)/100.0); // 0 < angle < 2PI
+    sprite->SetRotation_rad(RandomLocal().GetLong(0,628)/100.0); // 0 < angle < 2PI
     if(flipped) {
       flipped->EnableRotationCache(64);
-      flipped->SetRotation_rad(randomObj.GetLong(0,628)/100.0); // 0 < angle < 2PI
+      flipped->SetRotation_rad(RandomLocal().GetLong(0,628)/100.0); // 0 < angle < 2PI
     }
   }
 }
@@ -199,7 +199,7 @@ void Wind::Reset(){
 }
 
 void Wind::ChooseRandomVal() const{
-  int val = randomObj.GetLong(-100, 100);
+  int val = RandomLocal().GetLong(-100, 100);
   ActionHandler::GetInstance()->NewAction (new Action(Action::ACTION_WIND, val));
 }
 
@@ -234,8 +234,8 @@ void Wind::RandomizeParticlesPos()
 
   for (; it != end; ++it)
   {
-    (*it)->SetXY(Point2i( randomObj.GetLong(Camera::GetInstance()->GetPositionX(), Camera::GetInstance()->GetPositionX()+Camera::GetInstance()->GetSizeX()),
-                          randomObj.GetLong(Camera::GetInstance()->GetPositionY(), Camera::GetInstance()->GetPositionY()+Camera::GetInstance()->GetSizeY())));
+    (*it)->SetXY(Point2i( RandomLocal().GetLong(Camera::GetInstance()->GetPositionX(), Camera::GetInstance()->GetPositionX()+Camera::GetInstance()->GetSizeX()),
+                          RandomLocal().GetLong(Camera::GetInstance()->GetPositionY(), Camera::GetInstance()->GetPositionY()+Camera::GetInstance()->GetSizeY())));
     MSG_DEBUG("wind", "new particule position: %d, %d", (*it)->GetX(), (*it)->GetY());
   }
 }
diff --git a/src/menu/credits_menu.cpp b/src/menu/credits_menu.cpp
index 6eece53..7268bdc 100644
--- a/src/menu/credits_menu.cpp
+++ b/src/menu/credits_menu.cpp
@@ -42,13 +42,13 @@ public:
   std::string country;
   std::string description;
 
-  bool Feed (xmlNode* node);
+  bool Feed (const xmlNode* node);
   std::string PrettyString(bool with_email) const;
 };
 
 //-----------------------------------------------------------------------------
 
-bool Author::Feed (xmlNode* node)
+bool Author::Feed (const xmlNode* node)
 {
   if (!XmlReader::ReadString(node, "name", name))
     return false;
@@ -88,8 +88,8 @@ std::string Author::PrettyString(bool with_email) const
 CreditsMenu::CreditsMenu()  :
   Menu("credit/background", vOk)
 {
-  ListBox * lbox_authors = new ListBox(Point2i(AppWormux::GetInstance()->video->window.GetWidth()-60,
-					       AppWormux::GetInstance()->video->window.GetHeight()-60-30),
+  ListBox * lbox_authors = new ListBox(Point2i(GetMainWindow().GetWidth()-60,
+					       GetMainWindow().GetHeight()-60-30),
 				       false);
   lbox_authors->SetBackgroundColor(Color(0,0,0,200));
   lbox_authors->SetPosition(30, 30);
@@ -129,7 +129,7 @@ void CreditsMenu::PrepareAuthorsList(ListBox * lbox_authors) const
 
   for(uint i = 0; i < (sizeof teams / sizeof* teams); ++i)
   {
-    xmlNodeArray team = XmlReader::GetNamedNeighbours(doc.GetRoot(), teams[i]);
+    xmlNodeArray team = XmlReader::GetNamedChildren(doc.GetRoot(), teams[i]);
 
     if (team.empty())
       continue;
diff --git a/src/menu/game_menu.cpp b/src/menu/game_menu.cpp
index 65b8222..7d9cba0 100644
--- a/src/menu/game_menu.cpp
+++ b/src/menu/game_menu.cpp
@@ -20,6 +20,7 @@
  *****************************************************************************/
 
 #include "menu/game_menu.h"
+#include "menu/game_mode_editor.h"
 #include "menu/map_selection_box.h"
 #include "menu/teams_selection_box.h"
 
@@ -27,11 +28,8 @@
 #include "game/config.h"
 #include "game/game_mode.h"
 #include "graphic/video.h"
-#include "gui/null_widget.h"
-#include "gui/picture_text_cbox.h"
-#include "gui/picture_widget.h"
-#include "gui/spin_button_picture.h"
 #include "gui/tabs.h"
+#include "gui/combo_box.h"
 #include "include/app.h"
 #include "tool/i18n.h"
 #include "tool/resource_manager.h"
@@ -43,10 +41,6 @@ const uint MARGIN_BOTTOM = 50;
 const uint TEAMS_BOX_H = 205;
 const uint OPTIONS_BOX_H = 150;
 
-
-const uint TPS_TOUR_MIN = 10;
-const uint TPS_TOUR_MAX = 120;
-
 // ################################################
 // ##  GAME MENU CLASS
 // ################################################
@@ -56,7 +50,7 @@ GameMenu::GameMenu() :
   Profile *res = resource_manager.LoadXMLProfile( "graphism.xml",false);
   Point2i stdSize(130, W_UNDEF);
 
-  Surface& window = AppWormux::GetInstance()->video->window;
+  Surface& window = GetMainWindow();
 
   // Calculate main box size
   uint mainBoxWidth = window.GetWidth() - 2*MARGIN_SIDE;
@@ -88,19 +82,7 @@ GameMenu::GameMenu() :
   // ################################################
   Point2i option_size(130, 130);
 
-  game_options = new GridBox(mainBoxWidth, option_size, false);
-
-  opt_duration_turn = new SpinButtonWithPicture(_("Duration of a turn"), "menu/timing_turn",
-                                                option_size,
-                                                TPS_TOUR_MIN, 5,
-                                                TPS_TOUR_MIN, TPS_TOUR_MAX);
-  game_options->AddWidget(opt_duration_turn);
-
-  opt_energy_ini = new SpinButtonWithPicture(_("Initial energy"), "menu/energy",
-                                             option_size,
-                                             100, 5,
-                                             5, 200);
-  game_options->AddWidget(opt_energy_ini);
+  game_options = new GameModeEditor(mainBoxWidth, option_size, false);
   tabs->AddNewTab("TAB_Game", _("Game"), game_options);
 
   tabs->SetPosition(MARGIN_SIDE, tabs_team->GetPositionY()+tabs_team->GetSizeY()+ MARGIN_TOP);
@@ -108,15 +90,6 @@ GameMenu::GameMenu() :
   widgets.AddWidget(tabs);
   widgets.Pack();
 
-  // Values initialization
-
-  // Load game options
-  GameMode::GetInstance()->Load();
-
-  GameMode * game_mode = GameMode::GetInstance();
-  opt_duration_turn->SetValue(game_mode->duration_turn);
-  opt_energy_ini->SetValue(game_mode->character.init_energy);
-
   resource_manager.UnLoadXMLProfile(res);
 }
 
@@ -131,7 +104,11 @@ void GameMenu::OnClick(const Point2i &mousePosition, int button)
 
 void GameMenu::OnClickUp(const Point2i &mousePosition, int button)
 {
-  widgets.ClickUp(mousePosition, button);
+  Widget *w = widgets.ClickUp(mousePosition, button);
+
+  if (w == game_options->GetGameModeComboBox()) {
+    game_options->LoadGameMode();
+  }
 }
 
 void GameMenu::SaveOptions()
@@ -145,17 +122,14 @@ void GameMenu::SaveOptions()
   //Save options in XML (including current selected teams, selected map)
   Config::GetInstance()->Save(true);
 
-  GameMode * game_mode = GameMode::GetInstance();
-  game_mode->duration_turn = opt_duration_turn->GetValue() ;
-  game_mode->character.init_energy = opt_energy_ini->GetValue() ;
-
+  game_options->ValidGameMode();
 }
 
 bool GameMenu::signal_ok()
 {
   SaveOptions();
   play_ok_sound();
-  Game::GetInstance()->Start();
+  Game::UpdateGameMode()->Start();
   return true;
 }
 
diff --git a/src/menu/game_menu.h b/src/menu/game_menu.h
index 5142131..f51f5d6 100644
--- a/src/menu/game_menu.h
+++ b/src/menu/game_menu.h
@@ -27,8 +27,7 @@
 // Forward declarations
 class TeamsSelectionBox;
 class MapSelectionBox;
-class SpinButtonWithPicture;
-class CheckBox;
+class GameModeEditor;
 
 class GameMenu : public Menu
 {
@@ -44,9 +43,7 @@ class GameMenu : public Menu
    MapSelectionBox * map_box;
 
    /* Game options controllers */
-   Box * game_options;
-   SpinButtonWithPicture *opt_duration_turn;
-   SpinButtonWithPicture *opt_energy_ini;
+   GameModeEditor * game_options;
 
    void SaveOptions();
    void OnClick(const Point2i &mousePosition, int button);
diff --git a/src/menu/game_mode_editor.cpp b/src/menu/game_mode_editor.cpp
new file mode 100644
index 0000000..bdca275
--- /dev/null
+++ b/src/menu/game_mode_editor.cpp
@@ -0,0 +1,156 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Game mode editor
+ *****************************************************************************/
+
+#include <vector>
+
+#include "menu/game_mode_editor.h"
+
+#include "game/config.h"
+#include "game/game_mode.h"
+#include "gui/combo_box.h"
+#include "gui/spin_button_picture.h"
+#include "tool/i18n.h"
+
+const uint TPS_TOUR_MIN = 10;
+const uint TPS_TOUR_MAX = 240;
+
+GameModeEditor::GameModeEditor(uint max_line_width, const Point2i& option_size, bool _draw_border) :
+  GridBox(max_line_width, option_size, _draw_border)
+{
+  // ################################################
+  // ##  GAME OPTIONS
+  // ################################################
+
+  std::vector<std::pair<std::string, std::string> > game_modes;
+  game_modes.push_back(std::pair<std::string, std::string>("classic", _("Classic")));
+  game_modes.push_back(std::pair<std::string, std::string>("unlimited", _("Unlimited")));
+  game_modes.push_back(std::pair<std::string, std::string>("blitz", _("Blitz")));
+
+  opt_game_mode = new ComboBox(_("Game mode"), "menu/game_mode", option_size,
+			       game_modes, Config::GetInstance()->GetGameMode());
+  AddWidget(opt_game_mode);
+
+  opt_duration_turn = new SpinButtonWithPicture(_("Duration of a turn"), "menu/timing_turn",
+                                                option_size,
+                                                TPS_TOUR_MIN, 10,
+                                                TPS_TOUR_MIN, TPS_TOUR_MAX);
+  AddWidget(opt_duration_turn);
+
+  std::vector<std::pair<std::string, std::string> > character_selections;
+  character_selections.push_back(std::pair<std::string, std::string>("always", _("Always")));
+  character_selections.push_back(std::pair<std::string, std::string>("before_action", _("Before action")));
+  character_selections.push_back(std::pair<std::string, std::string>("never", _("Never")));
+
+  opt_allow_character_selection = new ComboBox(_("Character switching"), "menu/character_selection", option_size,
+					       character_selections, "always");
+  AddWidget(opt_allow_character_selection);
+
+  /* Characters energy */
+  opt_energy_ini = new SpinButtonWithPicture(_("Initial energy"), "menu/init_energy",
+                                             option_size,
+                                             10, 10,
+                                             10, 500);
+  AddWidget(opt_energy_ini);
+
+  opt_energy_max = new SpinButtonWithPicture(_("Max energy"), "menu/max_energy",
+                                             option_size,
+                                             10, 10,
+                                             10, 500);
+  AddWidget(opt_energy_max);
+
+
+  /* some death mode options */
+
+  opt_time_before_death_mode = new SpinButtonWithPicture(_("Duration before death mode"), "menu/timing_death",
+							 option_size,
+							 200, 50,
+							 200, 3000);
+  AddWidget(opt_time_before_death_mode);
+
+  opt_damage_during_death_mode = new SpinButtonWithPicture(_("Damage per turn during death mode"), "menu/death_energy",
+							   option_size,
+							   1, 1,
+							   1, 20);
+  AddWidget(opt_damage_during_death_mode);
+
+  opt_gravity = new SpinButtonWithPicture(_("Gravity"), "menu/gravity",
+							   option_size,
+							   10, 5,
+							   10, 60);
+  AddWidget(opt_gravity);
+
+  LoadGameMode();
+}
+
+GameModeEditor::~GameModeEditor()
+{
+}
+
+
+void GameModeEditor::LoadGameMode()
+{
+  Config::GetInstance()->SetGameMode(opt_game_mode->GetValue());
+  GameMode * game_mode = GameMode::GetInstance();
+  game_mode->Load();
+
+  if (game_mode->allow_character_selection == GameMode::ALWAYS) {
+    opt_allow_character_selection->SetChoice(0); // "always"
+  } else if (game_mode->allow_character_selection == GameMode::BEFORE_FIRST_ACTION) {
+    opt_allow_character_selection->SetChoice(1); // "before_action"
+  } else if (game_mode->allow_character_selection == GameMode::NEVER) {
+    opt_allow_character_selection->SetChoice(2); // "never"
+  } else {
+    ASSERT(false);
+  }
+
+  opt_duration_turn->SetValue(game_mode->duration_turn);
+  opt_energy_ini->SetValue(game_mode->character.init_energy);
+  opt_energy_max->SetValue(game_mode->character.max_energy);
+  opt_time_before_death_mode->SetValue(game_mode->duration_before_death_mode);
+  opt_damage_during_death_mode->SetValue(game_mode->damage_per_turn_during_death_mode);
+  opt_gravity->SetValue((int)(game_mode->gravity));
+
+  NeedRedrawing();
+}
+
+void GameModeEditor::ValidGameMode() const
+{
+  GameMode * game_mode = GameMode::GetInstance();
+  game_mode->Load();
+
+  if (opt_allow_character_selection->GetValue() == "always") {
+    game_mode->allow_character_selection = GameMode::ALWAYS;
+  } else if (opt_allow_character_selection->GetValue() == "before_action") {
+    game_mode->allow_character_selection = GameMode::BEFORE_FIRST_ACTION;
+  } else if (opt_allow_character_selection->GetValue() == "never") {
+    game_mode->allow_character_selection = GameMode::NEVER;
+  } else {
+    ASSERT(false);
+  }
+
+  game_mode->duration_turn = opt_duration_turn->GetValue();
+  game_mode->character.init_energy = opt_energy_ini->GetValue();
+  game_mode->character.max_energy = opt_energy_max->GetValue();
+  game_mode->duration_before_death_mode = opt_time_before_death_mode->GetValue();
+  game_mode->damage_per_turn_during_death_mode = opt_damage_during_death_mode->GetValue();
+  game_mode->gravity = opt_gravity->GetValue();
+}
+
diff --git a/src/menu/game_mode_editor.h b/src/menu/game_mode_editor.h
new file mode 100644
index 0000000..6a18bb2
--- /dev/null
+++ b/src/menu/game_mode_editor.h
@@ -0,0 +1,62 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Game mode editor
+ *****************************************************************************/
+
+#ifndef GAME_MODE_EDITOR_H
+#define GAME_MODE_EDITOR_H
+
+#include "gui/box.h"
+
+// Forward declarations
+class SpinButtonWithPicture;
+class ComboBox;
+class CheckBox;
+
+class GameModeEditor : public GridBox
+{
+  /* If you need this, implement it (correctly)*/
+  GameModeEditor(const GameModeEditor&);
+  GameModeEditor operator=(const GameModeEditor&);
+  /********************************************/
+
+  ComboBox *opt_game_mode;
+
+  ComboBox *opt_allow_character_selection;
+
+  SpinButtonWithPicture *opt_duration_turn;
+
+  SpinButtonWithPicture *opt_energy_ini;
+  SpinButtonWithPicture *opt_energy_max;
+
+  SpinButtonWithPicture *opt_time_before_death_mode;
+  SpinButtonWithPicture *opt_damage_during_death_mode;
+  SpinButtonWithPicture *opt_gravity;
+
+public:
+  GameModeEditor(uint max_line_width, const Point2i& option_size, bool _draw_border=true);
+  ~GameModeEditor();
+
+  const ComboBox* GetGameModeComboBox() const { return opt_game_mode; };
+
+  void LoadGameMode();
+  void ValidGameMode() const;
+};
+
+#endif
diff --git a/src/menu/help_menu.cpp b/src/menu/help_menu.cpp
index 86927ee..15ebed2 100644
--- a/src/menu/help_menu.cpp
+++ b/src/menu/help_menu.cpp
@@ -20,11 +20,12 @@
  *****************************************************************************/
 
 #include "include/app.h"
+#include "graphic/text.h"
+#include "graphic/sprite.h"
 #include "graphic/video.h"
-#include "gui/box.h"
-#include "gui/picture_widget.h"
 #include "menu/help_menu.h"
 #include "game/config.h"
+#include "tool/i18n.h"
 #include "tool/resource_manager.h"
 #include "tool/xml_document.h"
 
@@ -34,23 +35,10 @@ static const uint CHECKBOX_SIZE = 50;
 HelpMenu::HelpMenu()  :
   Menu("help/background", vOk)
 {
-  Point2i size = AppWormux::GetInstance()->video->window.GetSize()
-               - Point2i(2*BORDER,2*BORDER+CHECKBOX_SIZE);
-
-  std::string lang = Config::GetInstance()->GetLanguage();
   Profile *res = resource_manager.LoadXMLProfile( "graphism.xml", false);
-  xmlNode *elem = resource_manager.GetElement (res, "surface", "help/help_shortkeys_" + lang);
-  std::string filename;
-  if (elem == NULL || !res->doc->ReadStringAttr(elem, "file", filename))
-    lang = "en";
+  img_keyboard = new Sprite(resource_manager.LoadImage(res, "help/shortkeys"), true);
+  img_keyboard->cache.EnableLastFrameCache();
   resource_manager.UnLoadXMLProfile(res);
-  PictureWidget *help_image = new PictureWidget(size, "help/help_shortkeys_" + lang, true);
-
-  VBox *help = new VBox(size.x);
-  help->SetPosition(BORDER, BORDER);
-  help->AddWidget(help_image);
-  widgets.AddWidget(help);
-  widgets.Pack();
 }
 
 HelpMenu::~HelpMenu()
@@ -67,6 +55,43 @@ bool HelpMenu::signal_cancel()
   return true;
 }
 
+void HelpMenu::DrawBackground()
+{
+  Menu::DrawBackground();
+  img_keyboard->Blit(GetMainWindow(), BORDER, BORDER);
+
+  const uint MIDDLE_X = 64;
+  const uint MIDDLE_Y = 13;
+
+  Text tmp(_("Quit game"), dark_gray_color, Font::FONT_TINY, Font::FONT_NORMAL, false);
+  tmp.SetMaxWidth(130);
+
+  tmp.DrawCenter(Point2i(13+BORDER+MIDDLE_X, 5+BORDER+MIDDLE_Y));
+  tmp.Set(_("Show/hide interface")); tmp.DrawCenter(Point2i(148+BORDER+MIDDLE_X, 5+BORDER+MIDDLE_Y));
+  tmp.Set(_("Fullscreen / window")); tmp.DrawCenter(Point2i(311+BORDER+MIDDLE_X, 5+BORDER+MIDDLE_Y));
+  tmp.Set(_("High jump")); tmp.DrawCenter(Point2i(460+BORDER+MIDDLE_X, 5+BORDER+MIDDLE_Y));
+  tmp.Set(_("Talk in network battle")); tmp.DrawCenter(Point2i(13+BORDER+MIDDLE_X, 32+BORDER+MIDDLE_Y));
+  tmp.Set(_("Change weapon category")); tmp.DrawCenter(Point2i(148+BORDER+MIDDLE_X, 32+BORDER+MIDDLE_Y));
+  tmp.Set(_("Configuration menu")); tmp.DrawCenter(Point2i(311+BORDER+MIDDLE_X, 32+BORDER+MIDDLE_Y));
+  tmp.Set(_("Jump")); tmp.DrawCenter(Point2i(460+BORDER+MIDDLE_X, 32+BORDER+MIDDLE_Y));
+  tmp.Set(_("Drag&drop: Move camera")); tmp.DrawCenter(Point2i(539+BORDER+MIDDLE_X, 82+BORDER+MIDDLE_Y));
+  tmp.Set(_("Click: Center camera on character")); tmp.DrawCenter(Point2i(539+BORDER+MIDDLE_X, 111+BORDER+MIDDLE_Y));
+  tmp.Set(_("Change weapon countdown")); tmp.DrawCenter(Point2i(539+BORDER+MIDDLE_X, 140+BORDER+MIDDLE_Y));
+  tmp.Set(_("Change aim angle")); tmp.DrawCenter(Point2i(539+BORDER+MIDDLE_X, 169+BORDER+MIDDLE_Y));
+  tmp.Set(_("Move character")); tmp.DrawCenter(Point2i(539+BORDER+MIDDLE_X, 198+BORDER+MIDDLE_Y));
+  tmp.Set(_("On map: Select a target")); tmp.DrawCenter(Point2i(539+BORDER+MIDDLE_X, 227+BORDER+MIDDLE_Y));
+  tmp.Set(_("On a character: Changes active one")); tmp.DrawCenter(Point2i(539+BORDER+MIDDLE_X, 255+BORDER+MIDDLE_Y));
+  tmp.Set(_("Show weapons menu")); tmp.DrawCenter(Point2i(539+BORDER+MIDDLE_X, 284+BORDER+MIDDLE_Y));
+  tmp.Set(_("Smaller aim angle and walk step")); tmp.DrawCenter(Point2i(25+BORDER+MIDDLE_X, 253+BORDER+MIDDLE_Y));
+  tmp.Set(_("Jump backwards")); tmp.DrawCenter(Point2i(188+BORDER+MIDDLE_X, 253+BORDER+MIDDLE_Y));
+  tmp.Set(_("Pause")); tmp.DrawCenter(Point2i(337+BORDER+MIDDLE_X, 253+BORDER+MIDDLE_Y));
+  tmp.Set(_("Move camera with mouse or arrows")); tmp.DrawCenter(Point2i(25+BORDER+MIDDLE_X, 281+BORDER+MIDDLE_Y));
+  tmp.Set(_("Weapon: Fire / Bonus box: falls fast")); tmp.DrawCenter(Point2i(188+BORDER+MIDDLE_X, 281+BORDER+MIDDLE_Y));
+  tmp.Set(_("Show/hide minimap")); tmp.DrawCenter(Point2i(337+BORDER+MIDDLE_X, 281+BORDER+MIDDLE_Y));
+  tmp.Set(_("Change active character")); tmp.DrawCenter(Point2i(25+BORDER+MIDDLE_X, 310+BORDER+MIDDLE_Y));
+  tmp.Set(_("Center camera to character")); tmp.DrawCenter(Point2i(188+BORDER+MIDDLE_X, 310+BORDER+MIDDLE_Y));
+}
+
 void HelpMenu::Draw(const Point2i& /*mousePosition*/)
 {
 }
diff --git a/src/menu/help_menu.h b/src/menu/help_menu.h
index 5d65cc9..48509dd 100644
--- a/src/menu/help_menu.h
+++ b/src/menu/help_menu.h
@@ -26,14 +26,18 @@
 
 // Forward declarations
 class ListBox;
+class Sprite;
 
 class HelpMenu : public Menu
 {
  private:
+  Sprite* img_keyboard;
+
   bool signal_ok();
   bool signal_cancel();
 
   void Draw(const Point2i &mousePosition);
+  void DrawBackground();
 
   void OnClick(const Point2i &mousePosition, int button);
   void OnClickUp(const Point2i &mousePosition, int button);
diff --git a/src/menu/main_menu.cpp b/src/menu/main_menu.cpp
index f403f5d..6b287a1 100644
--- a/src/menu/main_menu.cpp
+++ b/src/menu/main_menu.cpp
@@ -52,7 +52,7 @@ MainMenu::~MainMenu()
 MainMenu::MainMenu() :
     Menu("main_menu/bg_main", vNo)
 {
-  uint window_width = AppWormux::GetInstance()->video->window.GetWidth();
+  uint window_width = GetMainWindow().GetWidth();
 
   Point2i size(120,110);
   Box* box = new GridBox(window_width, size, true);
@@ -80,8 +80,8 @@ MainMenu::MainMenu() :
   // We must "pack" all the widgets before centering the box to compute its size
   box->Pack();
 
-  uint center_x = AppWormux::GetInstance()->video->window.GetWidth()/2;
-  uint center_y = AppWormux::GetInstance()->video->window.GetHeight()/2;
+  uint center_x = GetMainWindow().GetWidth()/2;
+  uint center_y = GetMainWindow().GetHeight()/2;
   box->SetPosition(center_x - box->GetSizeX()/2, center_y - box->GetSizeY()/2);
 
   widgets.Pack();
@@ -92,7 +92,8 @@ MainMenu::MainMenu() :
   std::string s2(Constants::WEB_SITE);
   website_text = new Text(s2, green_color, Font::FONT_MEDIUM, Font::FONT_NORMAL, false);
 
-  JukeBox::GetInstance()->PlayMusic("menu");
+  if (!JukeBox::GetInstance()->IsPlayingMusic())
+    JukeBox::GetInstance()->PlayMusic("menu");
 
   StatStart("Main:Menu");
 }
@@ -166,7 +167,7 @@ bool MainMenu::signal_ok()
 
 void MainMenu::DrawBackground()
 {
-  Surface& window = AppWormux::GetInstance()->video->window;
+  Surface& window = GetMainWindow();
 
   Menu::DrawBackground();
 
diff --git a/src/menu/main_menu.h b/src/menu/main_menu.h
index 05dcf70..7c15fba 100644
--- a/src/menu/main_menu.h
+++ b/src/menu/main_menu.h
@@ -51,6 +51,7 @@ public:
     HELP,
     CREDITS,
     QUIT,
+    SKIN_VIEWER
   } menu_item;
 
 
diff --git a/src/menu/map_selection_box.cpp b/src/menu/map_selection_box.cpp
index 78a133b..9b360ba 100644
--- a/src/menu/map_selection_box.cpp
+++ b/src/menu/map_selection_box.cpp
@@ -53,7 +53,7 @@ MapSelectionBox::MapSelectionBox(const Point2i &_size, bool _display_only) :
 
   // Previews
   Box* previews_box = new HBox(map_preview_height+10, false);
-  previews_box->SetBorder( Point2i(10,0) );
+  previews_box->SetNoBorder();
 
    // compute margin width between previews
   uint map_preview_width = map_preview_height*4/3;
@@ -61,14 +61,15 @@ MapSelectionBox::MapSelectionBox(const Point2i &_size, bool _display_only) :
 
   uint margin = 0;
 
-  if ( uint(size.x - 20) > uint(total_width_previews + bt_map_plus->GetSizeX() + bt_map_minus->GetSizeX())) {
-    margin = (size.x - 20 -
-              (total_width_previews + bt_map_plus->GetSizeX() + bt_map_minus->GetSizeX()) ) / 6;
+  if ( uint(size.x) > uint(total_width_previews + bt_map_plus->GetSizeX() + bt_map_minus->GetSizeX()
+			   + border.x)) {
+    margin = (size.x -
+              (total_width_previews + bt_map_plus->GetSizeX() + bt_map_minus->GetSizeX() + border.x) ) / 6;
   }
 
   if (margin < 5) {
     margin = 5;
-    uint total_size_wo_margin = size.x - 20 - 6*margin - bt_map_plus->GetSizeX() - bt_map_minus->GetSizeX();
+    uint total_size_wo_margin = size.x - 6*margin - bt_map_plus->GetSizeX() - bt_map_minus->GetSizeX() - border.x;
     map_preview_width = (total_size_wo_margin)/4; // <= total = w + 4*(3/4)w
     map_preview_height = 3/4 * map_preview_width;
   }
@@ -78,7 +79,7 @@ MapSelectionBox::MapSelectionBox(const Point2i &_size, bool _display_only) :
   if (!display_only) {
     previews_box->AddWidget(bt_map_minus);
   } else {
-    previews_box->AddWidget(new NullWidget(*bt_map_minus));
+    previews_box->AddWidget(new NullWidget(bt_map_minus->GetSize()));
     delete bt_map_minus;
   }
 
@@ -101,7 +102,7 @@ MapSelectionBox::MapSelectionBox(const Point2i &_size, bool _display_only) :
   if (!display_only) {
     previews_box->AddWidget(bt_map_plus);
   }else {
-    previews_box->AddWidget(new NullWidget(*bt_map_plus));
+    previews_box->AddWidget(new NullWidget(bt_map_plus->GetSize()));
     delete bt_map_plus;
   }
 
@@ -119,10 +120,6 @@ MapSelectionBox::MapSelectionBox(const Point2i &_size, bool _display_only) :
   // Load Maps' list
   uint i = MapsList::GetInstance()->GetActiveMapIndex();
 
-  // If network game skip random generated maps
-  if (Network::GetInstance()->IsServer() && i != MapsList::GetInstance()->lst.size()) {
-    for (; MapsList::GetInstance()->lst[i]->IsRandomGenerated(); i = (i + 1) % MapsList::GetInstance()->lst.size()) {} ;
-  }
   ChangeMap(i);
 }
 
@@ -145,9 +142,7 @@ void MapSelectionBox::ChangeMap(uint index)
 
   // Callback other network players
   if (Network::GetInstance()->IsServer()) {
-    if (index != MapsList::GetInstance()->lst.size()
-	&& MapsList::GetInstance()->lst[index]->IsRandomGenerated()) // Cant select random generated maps in network mode
-      return;
+
     selected_map_index = index;
     // We need to do it here to send the right map to still not connected clients
     // in distant_cpu::distant_cpu
@@ -209,12 +204,12 @@ void MapSelectionBox::UpdateMapInfo(PictureWidget * widget, uint index, bool sel
     return;
   }
 
-  if((display_only && !selected) || (MapsList::GetInstance()->lst[index]->IsRandomGenerated() && Network::GetInstance()->IsServer()))
+  if (display_only && !selected)
     widget->Disable();
   else
     widget->Enable();
   // If selected update general information
-  if(selected) {
+  if (selected) {
     map_name_label->SetText(MapsList::GetInstance()->lst[index]->ReadFullMapName());
     map_author_label->SetText(MapsList::GetInstance()->lst[index]->ReadAuthorInfo());
   }
diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index 676bed4..a99a2a9 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -35,7 +35,8 @@
 static const int MENU_DELAY = 100;  // 10 fps, much sufficient for menu
 
 Menu::Menu(const std::string& bg, t_action _actions) :
-  actions(_actions)
+  actions(_actions),
+  selected_widget(NULL)
 {
   close_menu = false ;
   AppWormux * app = AppWormux::GetInstance();
@@ -140,13 +141,13 @@ void Menu::key_cancel()
 
 void Menu::key_up()
 {
-  widgets.SetKeyboardFocusOnPreviousWidget();
+  widgets.SetFocusOnPreviousWidget();
   RedrawMenu();
 }
 
 void Menu::key_down()
 {
-  widgets.SetKeyboardFocusOnNextWidget();
+  widgets.SetFocusOnNextWidget();
   RedrawMenu();
 }
 
@@ -158,6 +159,11 @@ void Menu::key_right()
 {
 }
 
+void Menu::key_tab()
+{
+  widgets.SetFocusOnNextWidget();
+}
+
 void Menu::DisplayError(const std::string &msg)
 {
   play_error_sound();
@@ -171,13 +177,13 @@ void Menu::DisplayError(const std::string &msg)
 
 void Menu::DrawBackground()
 {
-  background->ScaleSize(AppWormux::GetInstance()->video->window.GetSize());
-  background->Blit(AppWormux::GetInstance()->video->window, 0, 0);
+  background->ScaleSize(GetMainWindow().GetSize());
+  background->Blit(GetMainWindow(), 0, 0);
 }
 
 void Menu::RedrawBackground(const Rectanglei& rect)
 {
-  background->Blit(AppWormux::GetInstance()->video->window, rect, rect.GetPosition());
+  background->Blit(GetMainWindow(), rect, rect.GetPosition());
 }
 
 void Menu::RedrawMenu()
@@ -245,6 +251,9 @@ void Menu::Run (bool skip_menu)
 	    case SDLK_RIGHT:
 	      key_right();
 	      break;
+	    case SDLK_TAB:
+	      key_tab();
+	      break;
 	    case SDLK_F10:
 	      AppWormux::GetInstance()->video->ToggleFullscreen();
 	      break;
@@ -290,7 +299,8 @@ void Menu::Display(const Point2i& mousePosition)
     SDL_Delay(delay);
 }
 
-void Menu::SetActionButtonsXY(int x, int y){
+void Menu::SetActionButtonsXY(int x, int y)
+{
   if (actions_buttons != NULL) {
     actions_buttons->SetPosition(x, y);
   }
diff --git a/src/menu/menu.h b/src/menu/menu.h
index 7b4665a..0d18c77 100644
--- a/src/menu/menu.h
+++ b/src/menu/menu.h
@@ -59,8 +59,12 @@ public:
 
    void DisplayError(const std::string &msg);
 
+   // for receiving message from network
+   virtual void ReceiveMsgCallback(const std::string& /*msg*/) {};
+
 private:
    Sprite *background;
+   Widget *selected_widget;
 
    bool BasicOnClickUp(const Point2i &mousePosition);
 
@@ -83,6 +87,7 @@ protected:
    virtual void key_down();
    virtual void key_left();
    virtual void key_right();
+   virtual void key_tab();
    virtual bool signal_ok() = 0;
    virtual bool signal_cancel() = 0;
 
diff --git a/src/menu/network_connection_menu.cpp b/src/menu/network_connection_menu.cpp
index 52298a4..5e00d20 100644
--- a/src/menu/network_connection_menu.cpp
+++ b/src/menu/network_connection_menu.cpp
@@ -29,14 +29,14 @@
 #include "gui/button.h"
 #include "gui/box.h"
 #include "gui/check_box.h"
-#include "gui/msg_box.h"
 #include "gui/list_box.h"
+#include "gui/msg_box.h"
+#include "gui/null_widget.h"
 #include "gui/picture_widget.h"
 #include "gui/tabs.h"
 #include "gui/text_box.h"
 #include "include/app.h"
 #include "network/net_error_msg.h"
-#include "network/index_server.h"
 #include "team/teams_list.h"
 #include "tool/i18n.h"
 #include "tool/resource_manager.h"
@@ -53,20 +53,17 @@ public:
     , port(p)
     , ip_address(ip)
   {
-    AddWidget(new PictureWidget(Point2i(16, 16),
-                                (pwd) ? "menu/disabled_back" : "menu/enabled", true));
+    if (pwd) {
+      AddWidget(new PictureWidget(Point2i(16, 16), "menu/password_lock", true));
+    } else {
+      AddWidget(new NullWidget(Point2i(16, 16)));
+    }
     AddWidget(new Label(ip, 100));
     AddWidget(new Label(p, 40));
     AddWidget(new Label(dns, 340));
     AddWidget(new Label(name, 200));
     Pack();
   }
-  void Draw(const Point2i &mousePosition) const
-  {
-    HBox::Draw(mousePosition);
-    for (std::list<Widget*>::const_iterator it = widget_list.begin(); it != widget_list.end(); ++it)
-      (*it)->Draw(mousePosition);
-  }
 };
 
 class GameListBox : public BaseListBox
@@ -83,64 +80,20 @@ public:
   const std::string& GetPort() { return ((GameInfoBox*)m_items[selected_item])->port; }
 };
 
-NetworkConnectionMenu::NetworkConnectionMenu() :
+NetworkConnectionMenu::NetworkConnectionMenu(network_menu_action_t action) :
   Menu("menu/bg_network", vOkCancel)
 {
   Profile *res = resource_manager.LoadXMLProfile( "graphism.xml",false);
   Point2i def_size(300, 20);
 
-  uint max_width = AppWormux::GetInstance()->video->window.GetWidth()-50;
+  uint max_width = GetMainWindow().GetWidth()-50;
 
   /* Tabs */
   tabs = new MultiTabs(Point2i(max_width,
-			       AppWormux::GetInstance()->video->window.GetHeight()-180));
+                               GetMainWindow().GetHeight()-180));
   tabs->SetPosition(25, 25);
 
-  /* server connection related widgets */
-  Box * srv_connection_box = new VBox(W_UNDEF, false, false);
-  srv_connection_box->SetBorder(Point2i(0,0));
-
-  // Server port
-  Box * srv_tmp_box = new HBox(W_UNDEF, false, false);
-  srv_tmp_box->SetMargin(0);
-  srv_tmp_box->SetBorder(Point2i(0,0));
-
-  srv_tmp_box->AddWidget(new Label(_("Port:"), def_size.x/2));
-  srv_port_number = new TextBox(Config::GetInstance()->GetNetworkPort(), def_size.x/2);
-  srv_tmp_box->AddWidget(srv_port_number);
-
-  srv_connection_box->AddWidget(srv_tmp_box);
-
-  // Game name
-  srv_tmp_box = new HBox(W_UNDEF, false, false);
-  srv_tmp_box->SetMargin(0);
-  srv_tmp_box->SetBorder(Point2i(0,0));
-
-  srv_tmp_box->AddWidget(new Label(_("Game name:"), def_size.x/2));
-  srv_game_name = new TextBox("Wormux party", def_size.x/2);
-  srv_game_name->SetMaxNbChars(15);
-  srv_tmp_box->AddWidget(srv_game_name);
-
-  srv_connection_box->AddWidget(srv_tmp_box);
-
-  // Server password
-  srv_tmp_box = new HBox(W_UNDEF, false, false);
-  srv_tmp_box->SetMargin(0);
-  srv_tmp_box->SetBorder(Point2i(0,0));
-
-  srv_tmp_box->AddWidget(new Label(_("Password:"), def_size.x/2));
-  srv_game_pwd = new PasswordBox("", def_size.x/2);
-  srv_game_pwd->SetMaxNbChars(15);
-  srv_tmp_box->AddWidget(srv_game_pwd);
-
-  srv_connection_box->AddWidget(srv_tmp_box);
-
-  // Available on internet ?
-  srv_internet_server = new CheckBox(_("Server available on Internet"), def_size.x, true);
-  srv_connection_box->AddWidget(srv_internet_server);
-
-  tabs->AddNewTab("TAB_server", _("Host a game"), srv_connection_box);
-
+  // #############################
   /* client connection related widgets */
   Box * cl_connection_box = new VBox(W_UNDEF, false, false);
   cl_connection_box->SetBorder(Point2i(0,0));
@@ -152,7 +105,9 @@ NetworkConnectionMenu::NetworkConnectionMenu() :
 
   cl_refresh_net_games = new Button(res, "menu/refresh_small", false);
   cl_tmp_box->AddWidget(cl_refresh_net_games);
-  cl_tmp_box->AddWidget(new Label(_("Public battles"), def_size.x, Font::FONT_MEDIUM, Font::FONT_BOLD, c_red));
+  refresh_net_games_label = new Label(_("Public battles"), def_size.x,
+                                  Font::FONT_MEDIUM, Font::FONT_BOLD, c_red);
+  cl_tmp_box->AddWidget(refresh_net_games_label);
   cl_connection_box->AddWidget(cl_tmp_box);
 
   cl_net_games_lst = new GameListBox( Point2i(def_size.x, 30), false);
@@ -166,11 +121,13 @@ NetworkConnectionMenu::NetworkConnectionMenu() :
   cl_tmp_box->AddWidget(new Label(_("Password:"), def_size.x/2));
   cl_net_server_pwd = new PasswordBox("", def_size.x/2);
   cl_tmp_box->AddWidget(cl_net_server_pwd);
+
   cl_connection_box->AddWidget(cl_tmp_box);
 
-  // #####################################
+  // #############################
   // Manual connection
-  cl_connection_box->AddWidget(new Label(_("Manual connection"), def_size.x, Font::FONT_MEDIUM, Font::FONT_BOLD, c_red));
+  cl_connection_box->AddWidget(new Label(_("Manual connection"), def_size.x,
+                                         Font::FONT_MEDIUM, Font::FONT_BOLD, c_red));
 
   // Server address
   cl_tmp_box = new HBox(W_UNDEF, false, false);
@@ -178,7 +135,7 @@ NetworkConnectionMenu::NetworkConnectionMenu() :
   cl_tmp_box->SetBorder(Point2i(0,0));
 
   cl_tmp_box->AddWidget(new Label(_("Server address:"), def_size.x/2));
-  cl_server_address = new TextBox(Config::GetInstance()->GetNetworkHost(), def_size.x/2);
+  cl_server_address = new TextBox(Config::GetInstance()->GetNetworkClientHost(), def_size.x/2);
   cl_tmp_box->AddWidget(cl_server_address);
 
   cl_connection_box->AddWidget(cl_tmp_box);
@@ -189,7 +146,7 @@ NetworkConnectionMenu::NetworkConnectionMenu() :
   cl_tmp_box->SetBorder(Point2i(0,0));
 
   cl_tmp_box->AddWidget(new Label(_("Port:"), def_size.x/2));
-  cl_port_number = new TextBox(Config::GetInstance()->GetNetworkPort(), def_size.x/2);
+  cl_port_number = new TextBox(Config::GetInstance()->GetNetworkClientPort(), def_size.x/2);
   cl_tmp_box->AddWidget(cl_port_number);
 
   cl_connection_box->AddWidget(cl_tmp_box);
@@ -206,19 +163,68 @@ NetworkConnectionMenu::NetworkConnectionMenu() :
   cl_connection_box->AddWidget(cl_tmp_box);
   tabs->AddNewTab("TAB_client", _("Connect to game"), cl_connection_box);
 
+  // #############################
+  /* server connection related widgets */
+  Box * srv_connection_box = new VBox(W_UNDEF, false, false);
+  srv_connection_box->SetBorder(Point2i(0,0));
+
+  // Server port
+  Box * srv_tmp_box = new HBox(W_UNDEF, false, false);
+  srv_tmp_box->SetMargin(0);
+  srv_tmp_box->SetBorder(Point2i(0,0));
+
+  srv_tmp_box->AddWidget(new Label(_("Port:"), def_size.x/2));
+  srv_port_number = new TextBox(Config::GetInstance()->GetNetworkServerPort(), def_size.x/2);
+  srv_tmp_box->AddWidget(srv_port_number);
+
+  srv_connection_box->AddWidget(srv_tmp_box);
+
+  // Game name
+  srv_tmp_box = new HBox(W_UNDEF, false, false);
+  srv_tmp_box->SetMargin(0);
+  srv_tmp_box->SetBorder(Point2i(0,0));
+
+  srv_tmp_box->AddWidget(new Label(_("Game name:"), def_size.x/2));
+  srv_game_name = new TextBox(Config::GetInstance()->GetNetworkServerGameName(), def_size.x/2);
+  srv_game_name->SetMaxNbChars(15);
+  srv_tmp_box->AddWidget(srv_game_name);
+
+  srv_connection_box->AddWidget(srv_tmp_box);
+
+  // Server password
+  srv_tmp_box = new HBox(W_UNDEF, false, false);
+  srv_tmp_box->SetMargin(0);
+  srv_tmp_box->SetBorder(Point2i(0,0));
+
+  srv_tmp_box->AddWidget(new Label(_("Password:"), def_size.x/2));
+  srv_game_pwd = new PasswordBox("", def_size.x/2);
+  srv_game_pwd->SetMaxNbChars(15);
+  srv_tmp_box->AddWidget(srv_game_pwd);
+
+  srv_connection_box->AddWidget(srv_tmp_box);
+
+  // Available on internet ?
+  srv_internet_server = new CheckBox(_("Server available on Internet"), def_size.x,
+				     Config::GetInstance()->GetNetworkServerPublic());
+  srv_connection_box->AddWidget(srv_internet_server);
+
+  tabs->AddNewTab("TAB_server", _("Host a game"), srv_connection_box);
+
+  // #############################
   widgets.AddWidget(tabs);
   widgets.Pack();
 
   // Optimize height of public net games table
   uint net_games_lst_width = tabs->GetSizeX() - 2*(cl_connection_box->GetPositionX()-tabs->GetPositionX());
   uint net_games_lst_height = cl_net_games_lst->GetSizeY() +
-    (tabs->GetPositionY() + tabs->GetSizeY()) - (cl_connection_box->GetPositionY() + cl_connection_box->GetSizeY()) - 10;
+    (tabs->GetPositionY() + tabs->GetSizeY()) -
+    (cl_connection_box->GetPositionY() + cl_connection_box->GetSizeY()) - 10;
   cl_net_games_lst->SetSize(net_games_lst_width, net_games_lst_height);
 
   // Warning about experimental networking
   Point2i msg_box_pos(25, tabs->GetPositionY() + tabs->GetSizeY() + 10);
   Point2i msg_box_size(max_width,
-		       AppWormux::GetInstance()->video->window.GetHeight() - 50 - msg_box_pos.y);
+                       GetMainWindow().GetHeight() - 50 - msg_box_pos.y);
 
   msg_box = new MsgBox(msg_box_size, Font::FONT_SMALL, Font::FONT_NORMAL);
   msg_box->SetPosition(msg_box_pos);
@@ -232,6 +238,17 @@ NetworkConnectionMenu::NetworkConnectionMenu() :
   msg_box->NewMessage(""); // Skip a line
 
   resource_manager.UnLoadXMLProfile(res);
+
+  switch (action) {
+  case NET_HOST:
+    tabs->SelectTab(1);
+    break;
+  case NET_CONNECT:
+    tabs->SelectTab(0);
+    break;
+  default:
+    break;
+  }
 }
 
 NetworkConnectionMenu::~NetworkConnectionMenu()
@@ -242,10 +259,8 @@ void NetworkConnectionMenu::OnClickUp(const Point2i &mousePosition, int button)
 {
   Widget* w = widgets.ClickUp(mousePosition, button);
 
-  if (w == cl_refresh_net_games)
+  if (w == cl_refresh_net_games || w == refresh_net_games_label)
     RefreshList();
-  else if (w == cl_net_games_lst)
-    printf("%s\n", cl_net_games_lst->GetAddress().c_str());
 }
 
 void NetworkConnectionMenu::OnClick(const Point2i &mousePosition, int button)
@@ -253,32 +268,43 @@ void NetworkConnectionMenu::OnClick(const Point2i &mousePosition, int button)
   widgets.Click(mousePosition, button);
 }
 
-void NetworkConnectionMenu::RefreshList()
+std::list<GameServerInfo> NetworkConnectionMenu::GetList()
 {
-
-  // Save the currently selected address
-  //int current = cl_net_games_lst->GetSelectedItem();
-
-  // Empty the list:
-  while (cl_net_games_lst->Size() != 0)
-  {
-    cl_net_games_lst->Select(0);
-    cl_net_games_lst->RemoveSelected();
-  }
+  std::list<GameServerInfo> lst;
 
   // Connect to the index server
   connection_state_t conn = IndexServer::GetInstance()->Connect();
   if (conn != CONNECTED) {
-    DisplayNetError(conn);
-    msg_box->NewMessage(_("Error: Unable to contact index server to search an internet game"), c_red);
-    return;
+    if (conn != CONN_WRONG_VERSION) {
+      DisplayNetError(conn);
+    }
+    msg_box->NewMessage(_("Error: Unable to contact the index server to search for an internet game"), c_red);
+    return lst;
   }
 
-  std::list<GameServerInfo> lst = IndexServer::GetInstance()->GetHostList();
+  lst = IndexServer::GetInstance()->GetHostList();
+  IndexServer::GetInstance()->Disconnect();
 
-  if (lst.size() == 0) {
+  if (lst.empty()) {
     Menu::DisplayError(_("Sorry, currently, no game is waiting for players"));
-    IndexServer::GetInstance()->Disconnect();
+  }
+  return lst;
+}
+
+void NetworkConnectionMenu::RefreshList()
+{
+  // Save the currently selected address
+  int current = cl_net_games_lst->GetSelectedItem();
+  if (current == -1) current = 0;
+
+  // Empty the list:
+  while (cl_net_games_lst->Size() != 0) {
+    cl_net_games_lst->Select(0);
+    cl_net_games_lst->RemoveSelected();
+  }
+
+  std::list<GameServerInfo> lst = GetList();
+  if (lst.empty()) {
     return;
   }
 
@@ -286,11 +312,9 @@ void NetworkConnectionMenu::RefreshList()
     cl_net_games_lst->AddItem(false, it->passworded, it->ip_address,
                               it->port, it->dns_address, it->game_name);
   }
-  /* if (current != -1 && cl_net_games_lst->Size() != 0)
-     cl_net_games_lst->Select( current ); */
+  if (cl_net_games_lst->Size() != 0)
+    cl_net_games_lst->Select( current );
   cl_net_games_lst->NeedRedrawing();
-
-  IndexServer::GetInstance()->Disconnect();
 }
 
 void NetworkConnectionMenu::Draw(const Point2i &/*mousePosition*/){}
@@ -301,9 +325,9 @@ void NetworkConnectionMenu::DisplayNetError(connection_state_t conn)
 }
 
 bool NetworkConnectionMenu::HostingServer(const std::string& port,
-					  const std::string& game_name,
+                                          const std::string& game_name,
                                           const std::string& password,
-					  bool internet)
+                                          bool internet)
 {
   bool r = false;
 
@@ -311,25 +335,23 @@ bool NetworkConnectionMenu::HostingServer(const std::string& port,
     IndexServer::GetInstance()->SetHiddenServer();
 
   connection_state_t conn = IndexServer::GetInstance()->Connect();
-  if (conn != CONNECTED)
-    {
-      DisplayNetError(conn);
-      msg_box->NewMessage(_("Error: Unable to contact index server to host a game"), c_red);
-      goto out;
-    }
+  if (conn != CONNECTED) {
+    DisplayNetError(conn);
+    msg_box->NewMessage(_("Error: Unable to contact the index server to host a game"), c_red);
+    goto out;
+  }
 
   conn = Network::GetInstance()->ServerStart(port, password);
-  if( conn != CONNECTED)
-    {
-      DisplayNetError(conn);
-      goto out;
-    }
+  if (conn != CONNECTED) {
+    DisplayNetError(conn);
+    goto out;
+  }
 
   r = IndexServer::GetInstance()->SendServerStatus(game_name, password != "");
   if (false == r) {
     DisplayNetError(CONN_BAD_PORT);
-    msg_box->NewMessage(_("Error: Your server is not reachable from the internet. Check your firewall configuration")
-			, c_red);
+    msg_box->NewMessage(Format(_("Error: Your server is not reachable from the internet. Check your firewall configuration: TCP Port %s must accept connection from the outside. If you are not directly connected to the internet, check your router configuration: TCP Port %s must be forwarded on your computer."), port.c_str(), port.c_str()),
+                        c_red);
     goto out;
   }
 
@@ -344,8 +366,8 @@ bool NetworkConnectionMenu::HostingServer(const std::string& port,
 }
 
 bool NetworkConnectionMenu::ConnectToClient(const std::string& srv_address,
-					    const std::string& port,
-					    const std::string& passwd)
+                                            const std::string& port,
+                                            const std::string& passwd)
 {
   bool r = true;
 
@@ -355,8 +377,7 @@ bool NetworkConnectionMenu::ConnectToClient(const std::string& srv_address,
 
     // translators: %s:%s will expand to something like "example.org:9999"
     msg_box->NewMessage(Format(_("Error: Unable to connect to %s:%s"),
-			       srv_address.c_str(), port.c_str()),
-			c_red);
+                               srv_address.c_str(), port.c_str()), c_red);
     r = false;
   }
   return r;
@@ -365,6 +386,7 @@ bool NetworkConnectionMenu::ConnectToClient(const std::string& srv_address,
 bool NetworkConnectionMenu::signal_ok()
 {
   bool r = false;
+  std::list<GameServerInfo> lst;
 
   // Hack: force loading of teams before creating threads.
   GetTeamsList();
@@ -375,36 +397,38 @@ bool NetworkConnectionMenu::signal_ok()
   if (id == "TAB_server") {
     // Hosting your own server
     r = HostingServer(srv_port_number->GetText(),
-		      srv_game_name->GetText(),
-		      srv_game_pwd->GetPassword(),
-		      srv_internet_server->GetValue());
+                        srv_game_name->GetText(),
+                        srv_game_pwd->GetPassword(),
+                        srv_internet_server->GetValue());
     if (!r)
       goto out;
-  } else if (id == "TAB_client") {
-
-    if (cl_net_games_lst->GetSelectedItem() != -1)
-      {
-	// Connect to an internet game!
-	r = ConnectToClient(cl_net_games_lst->GetAddress(),
-			    cl_net_games_lst->GetPort(),
-			    cl_net_server_pwd->GetPassword());
-	if (!r)
-	  goto out;
-      }
-    else if (!cl_server_address->GetText().empty())
-      {
-	// Direct connexion to a server
-	r = ConnectToClient(cl_server_address->GetText(),
-                              cl_port_number->GetText(),
-                              cl_server_pwd->GetPassword());
-	if (!r)
-	  goto out;
-
-	// Remember the parameters
-	Config::GetInstance()->SetNetworkHost(cl_server_address->GetText());
-	Config::GetInstance()->SetNetworkPort(cl_port_number->GetText());
-      }
-    else
+
+    // Remember the parameters
+    Config::GetInstance()->SetNetworkServerPort(srv_port_number->GetText());
+    Config::GetInstance()->SetNetworkServerGameName(srv_game_name->GetText());
+    Config::GetInstance()->SetNetworkServerPublic(srv_internet_server->GetValue());
+
+  } else if (id == "TAB_client") { // Direct connexion to a server
+
+    if (cl_net_games_lst->GetSelectedItem() != -1) {
+      // Connect to an internet game!
+      r = ConnectToClient(cl_net_games_lst->GetAddress(),
+			  cl_net_games_lst->GetPort(),
+			  cl_net_server_pwd->GetPassword());
+      if (!r)
+        goto out;
+
+    } else if (!cl_server_address->GetText().empty()) {
+      r = ConnectToClient(cl_server_address->GetText(),
+                          cl_port_number->GetText(),
+                          cl_server_pwd->GetPassword());
+      if (!r)
+        goto out;
+
+      // Remember the parameters
+      Config::GetInstance()->SetNetworkClientHost(cl_server_address->GetText());
+      Config::GetInstance()->SetNetworkClientPort(cl_port_number->GetText());
+    } else
       goto out;
   }
 
@@ -434,4 +458,3 @@ bool NetworkConnectionMenu::signal_cancel()
   Network::Disconnect();
   return true;
 }
-
diff --git a/src/menu/network_connection_menu.h b/src/menu/network_connection_menu.h
index 60a478f..78d03ff 100644
--- a/src/menu/network_connection_menu.h
+++ b/src/menu/network_connection_menu.h
@@ -26,6 +26,7 @@
 #include <list>
 #include "menu.h"
 #include "network/network.h"
+#include "network/index_server.h" // for GameServerInfo
 
 // Forward declarations
 class Button;
@@ -38,6 +39,13 @@ class GameListBox;
 
 class NetworkConnectionMenu : public Menu
 {
+public:
+  typedef enum {
+    NET_NOTHING,
+    NET_HOST,
+    NET_CONNECT
+  } network_menu_action_t;
+
 private:
   /* If you need this, implement it (correctly)*/
   NetworkConnectionMenu(const NetworkConnectionMenu&);
@@ -52,6 +60,7 @@ private:
   CheckBox* srv_internet_server;
 
   Button* cl_refresh_net_games;
+  Label* refresh_net_games_label;
   GameListBox* cl_net_games_lst;
   PasswordBox* cl_net_server_pwd;
 
@@ -70,6 +79,7 @@ private:
   bool signal_ok();
   bool signal_cancel();
 
+  std::list<GameServerInfo> GetList();
   void RefreshList();
   bool HostingServer(const std::string& port,
 		     const std::string& game_name,
@@ -80,8 +90,8 @@ private:
 		       const std::string& passwd);
 
 public:
-   NetworkConnectionMenu();
-   ~NetworkConnectionMenu();
+  NetworkConnectionMenu(network_menu_action_t action);
+  ~NetworkConnectionMenu();
 };
 
 #endif
diff --git a/src/menu/network_menu.cpp b/src/menu/network_menu.cpp
index d95da61..ef1471a 100644
--- a/src/menu/network_menu.cpp
+++ b/src/menu/network_menu.cpp
@@ -27,10 +27,12 @@
 #include "game/game_mode.h"
 #include "graphic/video.h"
 #include "gui/button.h"
+#include "gui/check_box.h"
 #include "gui/label.h"
 #include "gui/msg_box.h"
 #include "gui/picture_widget.h"
 #include "gui/spin_button.h"
+#include "gui/talk_box.h"
 #include "gui/text_box.h"
 #include "include/action_handler.h"
 #include "include/app.h"
@@ -60,7 +62,7 @@ NetworkMenu::NetworkMenu() :
   Profile *res = resource_manager.LoadXMLProfile( "graphism.xml",false);
   Point2i pointZero(W_UNDEF, W_UNDEF);
 
-  Surface& window = AppWormux::GetInstance()->video->window;
+  Surface& window = GetMainWindow();
 
   // Calculate main box size
   uint mainBoxWidth = window.GetWidth() - 2*MARGIN_SIDE;
@@ -91,17 +93,17 @@ NetworkMenu::NetworkMenu() :
   // ##  GAME OPTIONS
   // ################################################
 
-  options_box = new HBox(OPTIONS_BOX_H, true);
-  options_box->AddWidget(new PictureWidget(Point2i(39, 128), "menu/mode_label"));
+  Box* bottom_box = new HBox(OPTIONS_BOX_H, false, true);
+  bottom_box->SetNoBorder();
 
-  Box* tmp_box = new VBox(200, false);
+  Box* options_box = new VBox(200, true);
 
-  mode = new Label("", 0, Font::FONT_MEDIUM, Font::FONT_NORMAL);
+  Label* mode = new Label("", 0, Font::FONT_MEDIUM, Font::FONT_BOLD, primary_red_color);
 
   if (Network::GetInstance()->IsClient()) {
     // Client Mode
     mode->SetText(_("Client mode"));
-    tmp_box->AddWidget(mode);
+    options_box->AddWidget(mode);
 
     player_number = NULL;
     connected_players = NULL;
@@ -110,54 +112,43 @@ NetworkMenu::NetworkMenu() :
 
     // Server Mode
     mode->SetText(_("Server mode"));
-    tmp_box->AddWidget(mode);
+    options_box->AddWidget(mode);
 
     player_number = new SpinButton(_("Max number of players:"), W_UNDEF,
                                    GameMode::GetInstance()->max_teams, 1, 2,
                                    GameMode::GetInstance()->max_teams);
     team_box->SetMaxNbLocalPlayers(GameMode::GetInstance()->max_teams - 1);
-    tmp_box->AddWidget(player_number);
+    options_box->AddWidget(player_number);
 
     connected_players = new Label(Format(ngettext("%i player connected", "%i players connected", 0), 0),
 				  0, Font::FONT_SMALL, Font::FONT_NORMAL);
-    tmp_box->AddWidget(connected_players);
+    options_box->AddWidget(connected_players);
 
     initialized_players = new Label(Format(ngettext("%i player ready", "%i players ready", 0), 0),
                                     0, Font::FONT_SMALL, Font::FONT_NORMAL);
-    tmp_box->AddWidget(initialized_players);
+    options_box->AddWidget(initialized_players);
   }
 
-  options_box->AddWidget(tmp_box);
-  options_box->SetPosition(MARGIN_SIDE, map_box->GetPositionY()+map_box->GetSizeY()+ MARGIN_SIDE);
-  widgets.AddWidget(options_box);
-  widgets.Pack();
+  play_in_loop = new CheckBox(_("Play several times"), W_UNDEF, true);
+  options_box->AddWidget(play_in_loop);
+
+  options_box->Pack();
+  bottom_box->AddWidget(options_box);
 
   // ################################################
   // ##  CHAT BOX
   // ################################################
-  VBox* chat_box = new VBox(mainBoxWidth - options_box->GetSizeX() - MARGIN_SIDE, false);
-  chat_box->SetBorder(Point2i(0,0));
 
-  msg_box = new MsgBox(Point2i(400, OPTIONS_BOX_H - 20), Font::FONT_SMALL, Font::FONT_NORMAL);
+  msg_box = new TalkBox(Point2i(mainBoxWidth - options_box->GetSizeX() - MARGIN_SIDE, OPTIONS_BOX_H),
+                        Font::FONT_SMALL, Font::FONT_NORMAL);
   msg_box->NewMessage(_("Join #wormux on irc.freenode.net to find some opponents."));
+  msg_box->SetPosition(options_box->GetPositionX() + options_box->GetSizeX() + MARGIN_SIDE,
+                       options_box->GetPositionY());
 
-  chat_box->SetPosition(options_box->GetPositionX() + options_box->GetSizeX() + MARGIN_SIDE,
-		  options_box->GetPositionY());
-  chat_box->AddWidget(msg_box);
-
-  HBox* tmp2_box = new HBox(16, false);
-  tmp2_box->SetMargin(4);
-  tmp2_box->SetBorder(Point2i(0,0));
-  line_to_send_tbox = new TextBox(" ", chat_box->GetSizeX()-20,
-                                  Font::FONT_SMALL, Font::FONT_NORMAL);
-  tmp2_box->AddWidget(line_to_send_tbox);
-
-  send_txt_bt = new Button(res, "menu/send_txt", true);
-  tmp2_box->AddWidget(send_txt_bt);
+  bottom_box->AddWidget(msg_box);
+  bottom_box->SetPosition(MARGIN_SIDE, map_box->GetPositionY()+map_box->GetSizeY()+ MARGIN_SIDE);
 
-  chat_box->AddWidget(tmp2_box);
-
-  widgets.AddWidget(chat_box);
+  widgets.AddWidget(bottom_box);
   widgets.Pack();
 
   resource_manager.UnLoadXMLProfile(res);
@@ -176,10 +167,6 @@ void NetworkMenu::OnClickUp(const Point2i &mousePosition, int button)
     Network::GetInstanceServer()->SetMaxNumberOfPlayers(player_number->GetValue());
     team_box->SetMaxNbLocalPlayers(player_number->GetValue()-1);
   }
-  else if (w == send_txt_bt)
-  {
-    SendChatMsg();
-  }
 }
 
 void NetworkMenu::OnClick(const Point2i &mousePosition, int button)
@@ -187,13 +174,6 @@ void NetworkMenu::OnClick(const Point2i &mousePosition, int button)
   widgets.Click(mousePosition, button);
 }
 
-void NetworkMenu::SendChatMsg()
-{
-  std::string empty = "";
-  Network::GetInstance()->SendChatMessage(line_to_send_tbox->GetText());
-  line_to_send_tbox->SetText(empty);
-}
-
 void NetworkMenu::SaveOptions()
 {
   // map
@@ -206,6 +186,20 @@ void NetworkMenu::SaveOptions()
 //  Config::GetInstance()->Save();
 }
 
+void NetworkMenu::PrepareForNewGame()
+{
+  msg_box->Clear();
+  b_ok->SetVisible(true);
+
+  Network::GetInstance()->SetState(Network::NETWORK_NEXT_GAME);
+
+  if (Network::GetInstance()->IsClient()) {
+    Network::GetInstance()->SendNetworkState();
+  }
+
+  RedrawMenu();
+}
+
 bool NetworkMenu::signal_ok()
 {
   if (Network::GetInstance()->IsClient())
@@ -266,7 +260,18 @@ bool NetworkMenu::signal_ok()
     // Starting the game :-)
     SaveOptions();
     play_ok_sound();
+
+    if (Network::GetInstance()->IsServer())
+      IndexServer::GetInstance()->Disconnect();
+
     Game::GetInstance()->Start();
+
+    if (Network::GetInstance()->IsConnected() && !Network::GetInstance()->cpu.empty()
+	&& play_in_loop->GetValue()) {
+      PrepareForNewGame();
+      return false;
+    }
+
     Network::GetInstance()->network_menu = NULL;
   }
 
@@ -281,9 +286,9 @@ bool NetworkMenu::signal_ok()
 void NetworkMenu::key_ok()
 {
   // return was pressed while chat texbox still had focus (player wants to send his msg)
-  if (line_to_send_tbox->HasFocus())
+  if (msg_box->TextHasFocus())
   {
-    SendChatMsg();
+    msg_box->SendChatMsg();
     return;
   }
 
@@ -355,12 +360,12 @@ void NetworkMenu::AddTeamCallback(const std::string& team_id)
 //  msg_box->NewMessage(team_id + " selected");
 }
 
-void NetworkMenu::UpdateTeamCallback(const std::string& team_id)
+void NetworkMenu::UpdateTeamCallback(const std::string& old_team_id, const std::string& team_id)
 {
   if ( close_menu )
     return;
 
-  team_box->UpdateTeamCallback(team_id);
+  team_box->UpdateTeamCallback(old_team_id, team_id);
 }
 
 void NetworkMenu::ChangeMapCallback()
@@ -389,6 +394,8 @@ void NetworkMenu::WaitingForServer()
 
   msg_box->NewMessage(_("Waiting for server, all you can do is cancel or chat!"), c_red);
 
+  widgets.SetFocusOn(msg_box->GetTextBox());
+
   int x=0, y=0;
   SDL_GetMouseState( &x, &y );
   Point2i mousePosition(x, y);
@@ -410,9 +417,9 @@ void NetworkMenu::WaitingForServer()
           case SDLK_ESCAPE:
             Menu::mouse_cancel();
             break;
-          case SDLK_RETURN:
+	  case SDLK_RETURN:
           case SDLK_KP_ENTER:
-            SendChatMsg();
+            msg_box->SendChatMsg();
             break;
           case SDLK_F10:
             AppWormux::GetInstance()->video->ToggleFullscreen();
@@ -424,14 +431,10 @@ void NetworkMenu::WaitingForServer()
       } else if (event.type == SDL_MOUSEBUTTONUP) {
         if (b_cancel->Contains(mousePosition))
           Menu::mouse_cancel();
-
-        if (send_txt_bt->Contains(mousePosition))
-          SendChatMsg();
       }
     }
 
     Menu::Display(mousePosition);
-    widgets.SetMouseFocusOn(line_to_send_tbox);
 
   } while (Network::GetInstance()->GetState() == Network::NETWORK_MENU_OK &&
            Network::GetInstance()->IsConnected());
diff --git a/src/menu/network_menu.h b/src/menu/network_menu.h
index b8c503a..5923282 100644
--- a/src/menu/network_menu.h
+++ b/src/menu/network_menu.h
@@ -27,9 +27,9 @@
 class Team;
 class SpinButton;
 class NetworkTeamsSelectionBox;
-class MsgBox;
+class TalkBox;
 class MapSelectionBox;
-class TextBox;
+class CheckBox;
 
 class NetworkMenu : public Menu
 {
@@ -40,15 +40,12 @@ class NetworkMenu : public Menu
 
   /* Options controllers */
   SpinButton* player_number;
-  Box* options_box;
-  Label* mode;
   Label* connected_players;
   Label* initialized_players;
+  CheckBox* play_in_loop;
 
-  /* Chat controllers */
-  MsgBox* msg_box;
-  TextBox* line_to_send_tbox;
-  Button* send_txt_bt;
+  /* Chat controller */
+  TalkBox* msg_box;
 
   /* Team controllers */
   NetworkTeamsSelectionBox *team_box;
@@ -56,11 +53,11 @@ class NetworkMenu : public Menu
   /* Map controllers */
   MapSelectionBox *map_box;
 
+  void PrepareForNewGame();
   void SaveOptions();
   void OnClick(const Point2i &mousePosition, int button);
   void OnClickUp(const Point2i &mousePosition, int button);
   void Draw(const Point2i &mousePosition);
-  void SendChatMsg();
   void WaitingForServer();
 
   void key_ok();
@@ -72,7 +69,7 @@ public:
   ~NetworkMenu();
 
   void AddTeamCallback(const std::string& team_id);
-  void UpdateTeamCallback(const std::string& team_id);
+  void UpdateTeamCallback(const std::string& old_team_id, const std::string& team_id);
   void DelTeamCallback(const std::string& team_id);
   void ChangeMapCallback();
 
diff --git a/src/menu/network_teams_selection_box.cpp b/src/menu/network_teams_selection_box.cpp
index 3f3f64c..d29d775 100644
--- a/src/menu/network_teams_selection_box.cpp
+++ b/src/menu/network_teams_selection_box.cpp
@@ -21,6 +21,7 @@
 
 #include "menu/network_teams_selection_box.h"
 #include "menu/team_box.h"
+#include "game/config.h"
 #include "gui/label.h"
 #include "gui/picture_widget.h"
 #include "gui/spin_button.h"
@@ -82,9 +83,21 @@ Widget* NetworkTeamsSelectionBox::Click(const Point2i &/*mousePosition*/, uint /
   return NULL;
 }
 
+void NetworkTeamsSelectionBox::SetDefaultPlayerName(Team& team)
+{
+#ifdef WIN32
+  // The username might be in NLS !
+  char* name = LocaleToUTF8(getenv("USERNAME"));
+  team.SetPlayerName(name);
+  delete[] name;
+#else
+  team.SetPlayerName(getenv("USER"));
+#endif
+}
+
 void NetworkTeamsSelectionBox::PrevTeam(uint i)
 {
-  if (teams_selections.at(i)->GetTeam() == NULL) return;
+  ASSERT(teams_selections.at(i)->GetTeam() != NULL);
 
   bool to_continue;
   Team* tmp;
@@ -116,25 +129,19 @@ void NetworkTeamsSelectionBox::PrevTeam(uint i)
 
       // We have found a team which is not selected
       if (tmp != NULL && !to_continue) {
-        SetLocalTeam(i, *tmp, true);
+        SetLocalTeam(i, *tmp);
       }
-    } while ( index != previous_index && to_continue);
+    } while (index != previous_index && to_continue);
 }
 
-void NetworkTeamsSelectionBox::NextTeam(uint i,
-                                        bool check_null_prev_team)
+void NetworkTeamsSelectionBox::NextTeam(uint i)
 {
-  if (check_null_prev_team &&
-      teams_selections.at(i)->GetTeam() == NULL)
-    return;
-
   bool to_continue;
   Team* tmp;
   int previous_index = -1, index;
 
-  if (check_null_prev_team) {
+  if (teams_selections.at(i)->GetTeam() != NULL)
     GetTeamsList().FindById(teams_selections.at(i)->GetTeam()->GetId(), previous_index);
-  }
 
   index = previous_index+1;
 
@@ -160,7 +167,9 @@ void NetworkTeamsSelectionBox::NextTeam(uint i,
 
       // We have found a team which is not selected
       if (tmp != NULL && !to_continue) {
-        SetLocalTeam(i, *tmp, check_null_prev_team);
+	if (teams_selections.at(i)->GetTeam() == NULL)
+	  SetDefaultPlayerName(*tmp);
+	SetLocalTeam(i, *tmp);
       }
     } while ( index != previous_index && to_continue);
 }
@@ -193,40 +202,70 @@ void NetworkTeamsSelectionBox::SetNbLocalTeams(uint nb_teams, uint previous_nb)
 
 void NetworkTeamsSelectionBox::AddLocalTeam(uint i)
 {
-  // we should find an available team
-  NextTeam(i, false);
+  int pos;
+  bool selected = false;
+  std::list<ConfigTeam>::const_iterator
+    it = Config::GetInstance()->AccessNetworkTeamsList().begin(),
+    end = Config::GetInstance()->AccessNetworkTeamsList().end();
+
+  // Check if previous team used in network are available
+  for (; it != end && !selected; ++it) {
+    ConfigTeam the_team_cfg = (*it);
+    Team *the_team = GetTeamsList().FindById(the_team_cfg.id, pos);
+
+    if (the_team != NULL) {
+
+      // Check if that team is already selected
+      for (uint j = 0; j < MAX_NB_TEAMS; j++) {
+        if (the_team == teams_selections.at(j)->GetTeam()) {
+          the_team = NULL;
+          break;
+        }
+      }
+
+      // We have found a team which is not selected
+      if (the_team != NULL) {
+	the_team->SetPlayerName(the_team_cfg.player_name);
+	the_team->SetNbCharacters(the_team_cfg.nb_characters);
+	selected = true;
+        SetLocalTeam(i, *the_team);
+      }
+
+    } else {
+      std::string msg = Format(_("Can't find team %s!"), the_team_cfg.id.c_str());
+      std::cerr << msg << std::endl;
+    }
+  }
+
+  if (!selected) {
+    NextTeam(i);
+  }
 }
 
 void NetworkTeamsSelectionBox::RemoveLocalTeam(uint i)
 {
-  if ( teams_selections.at(i)->GetTeam() != NULL ) {
-    ActionHandler::GetInstance()->NewAction (new Action(Action::ACTION_MENU_DEL_TEAM,
-                                                        teams_selections.at(i)->GetTeam()->GetId()));
-    ActionHandler::GetInstance()->ExecActions();
-  }
+  ASSERT(teams_selections.at(i)->GetTeam() != NULL);
+
+  ActionHandler::GetInstance()->NewAction(new Action(Action::ACTION_MENU_DEL_TEAM,
+						     teams_selections.at(i)->GetTeam()->GetId()));
+  ActionHandler::GetInstance()->ExecActions();
 }
 
-void NetworkTeamsSelectionBox::SetLocalTeam(uint i, Team& team, bool remove_previous_team)
+void NetworkTeamsSelectionBox::SetLocalTeam(uint i, Team& team)
 {
-  if (remove_previous_team) {
-    RemoveLocalTeam(i);
-  }
-
   team.SetLocal();
-#ifdef WIN32
-  // The username might be in NLS !
-  char* name = LocaleToUTF8(getenv("USERNAME"));
-  team.SetPlayerName(name);
-  delete[] name;
-#else
-  team.SetPlayerName(getenv("USER"));
-#endif
 
-  Action* a = new Action(Action::ACTION_MENU_ADD_TEAM, team.GetId());
-  a->Push(team.GetPlayerName());
-  a->Push(int(team.GetNbCharacters()));
-  ActionHandler::GetInstance()->NewAction(a);
-  ActionHandler::GetInstance()->ExecActions();
+  if (teams_selections.at(i)->GetTeam() != NULL) {
+
+    teams_selections.at(i)->SetTeam(team, false);
+
+  } else {
+    Action* a = new Action(Action::ACTION_MENU_ADD_TEAM, team.GetId());
+    a->Push(team.GetPlayerName());
+    a->Push(int(team.GetNbCharacters()));
+    ActionHandler::GetInstance()->NewAction(a);
+    ActionHandler::GetInstance()->ExecActions();
+  }
 }
 
 void NetworkTeamsSelectionBox::AddTeamCallback(const std::string& team_id)
@@ -253,17 +292,17 @@ void NetworkTeamsSelectionBox::AddTeamCallback(const std::string& team_id)
   local_teams_nb->SetValue(nb_local_teams);
 }
 
-void NetworkTeamsSelectionBox::UpdateTeamCallback(const std::string& team_id)
+void NetworkTeamsSelectionBox::UpdateTeamCallback(const std::string& old_team_id,
+						  const std::string& team_id)
 {
   for (uint i=0; i < teams_selections.size(); i++) {
     if (teams_selections.at(i)->GetTeam() != NULL &&
-        teams_selections.at(i)->GetTeam()->GetId() == team_id) {
+        teams_selections.at(i)->GetTeam()->GetId() == old_team_id) {
       int index = 0;
       Team * tmp = GetTeamsList().FindById(team_id, index);
 
       // Force refresh of information
       teams_selections.at(i)->SetTeam(*tmp, true);
-      std::cout << "Update " << team_id << std::endl;
       break;
     }
   }
@@ -316,6 +355,8 @@ void NetworkTeamsSelectionBox::ValidTeamsSelection()
     }
     GetTeamsList().ChangeSelection (selection);
   }
+
+  Config::GetInstance()->SetNetworkLocalTeams();
 }
 
 void NetworkTeamsSelectionBox::SetMaxNbLocalPlayers(uint nb)
diff --git a/src/menu/network_teams_selection_box.h b/src/menu/network_teams_selection_box.h
index 32d6557..af68075 100644
--- a/src/menu/network_teams_selection_box.h
+++ b/src/menu/network_teams_selection_box.h
@@ -38,10 +38,12 @@ class NetworkTeamsSelectionBox : public TeamsSelectionBox
   void SetNbLocalTeams(uint nb_teams, uint previous_nb);
   void AddLocalTeam(uint i);
   void RemoveLocalTeam(uint i);
-  void SetLocalTeam(uint i, Team& team, bool remove_previous_team);
+  void SetLocalTeam(uint i, Team& team);
+
+  void SetDefaultPlayerName(Team& team);
 
   void PrevTeam(uint i);
-  void NextTeam(uint i, bool check_null_prev_team = true);
+  void NextTeam(uint i);
 
  public:
   NetworkTeamsSelectionBox(const Point2i &size);
@@ -51,7 +53,7 @@ class NetworkTeamsSelectionBox : public TeamsSelectionBox
   virtual Widget* ClickUp(const Point2i &mousePosition, uint button);
 
   void AddTeamCallback(const std::string& team_id);
-  void UpdateTeamCallback(const std::string& team_id);
+  void UpdateTeamCallback(const std::string& old_team_id, const std::string& team_id);
   void DelTeamCallback(const std::string& team_id);
 
   void SetMaxNbLocalPlayers(uint nb);
diff --git a/src/menu/options_menu.cpp b/src/menu/options_menu.cpp
index 823d31b..b45c815 100644
--- a/src/menu/options_menu.cpp
+++ b/src/menu/options_menu.cpp
@@ -25,6 +25,7 @@
 #include "include/app.h"
 #include "include/constant.h"
 #include "game/game_mode.h"
+#include "game/game.h"
 #include "game/config.h"
 #include "graphic/video.h"
 #include "graphic/font.h"
@@ -32,23 +33,28 @@
 #include "gui/button.h"
 #include "gui/label.h"
 #include "gui/box.h"
+#include "gui/big/button_pic.h"
 #include "gui/list_box.h"
 #include "gui/combo_box.h"
 #include "gui/check_box.h"
 #include "gui/picture_widget.h"
 #include "gui/picture_text_cbox.h"
 #include "gui/spin_button_picture.h"
-#include "gui/list_box_w_label.h"
 #include "gui/tabs.h"
+#include "gui/text_box.h"
 #include "gui/question.h"
 #include "map/maps_list.h"
+#include "map/wind.h"
 #include "network/download.h"
 #include "sound/jukebox.h"
 #include "team/teams_list.h"
+#include "team/custom_team.h"
+#include "team/custom_teams_list.h"
 #include "tool/i18n.h"
 #include "tool/string_tools.h"
 #include "tool/resource_manager.h"
 #include <sstream>
+#include <string>
 
 OptionMenu::OptionMenu() :
   Menu("menu/bg_option")
@@ -83,11 +89,13 @@ OptionMenu::OptionMenu() :
 
   opt_scroll_border_size = new SpinButtonWithPicture(_("Scroll border size"), "menu/scroll_on_border",
 						     option_size,
-						     50, 2, 2, 80);
+						     50, 5, 5, 80);
   graphic_options->AddWidget(opt_scroll_border_size);
 
+#ifndef __APPLE__
   full_screen = new PictureTextCBox(_("Fullscreen?"), "menu/fullscreen", option_size);
   graphic_options->AddWidget(full_screen);
+#endif
 
   opt_max_fps = new SpinButtonWithPicture(_("Maximum FPS"), "menu/fps",
 					  option_size,
@@ -124,6 +132,62 @@ OptionMenu::OptionMenu() :
 
   tabs->AddNewTab("unused", _("Language"), language_options);
 
+  /* Team editor */
+
+  Box * teams_editor = new VBox(max_width, false, true);
+  Box * teams_editor_sup = new GridBox(max_width, option_size, true);
+  Box * teams_editor_inf = new VBox(max_width, true,false);
+
+  add_team = new ButtonPic(_("Add custom team"), "menu/add_custom_team",Point2i(100,100));
+  teams_editor_sup->AddWidget(add_team);
+
+  delete_team = new ButtonPic(_("Delete custom team"), "menu/del_custom_team",Point2i(100,100));
+  teams_editor_sup->AddWidget(delete_team);
+
+  lbox_teams = new ListBox(option_size,false);
+  teams_editor_sup->AddWidget(lbox_teams);
+
+  std::string s = _("Player name");
+  s +=" : ";
+
+  team_name = new Label(s, 0, Font::FONT_MEDIUM, Font::FONT_NORMAL);
+  teams_editor_inf->AddWidget(team_name);
+
+
+  tbox_team_name = new TextBox("", 100,
+                            Font::FONT_MEDIUM, Font::FONT_NORMAL);
+  teams_editor_inf->AddWidget(tbox_team_name);
+
+  Point2i names_size(140, 50);
+
+  // bug #12193 : Missed assertion in game option (custom team editor) while playing
+  if(Game::GetInstance()->IsGameFinished()) {
+    Box * teams_editor_names = new GridBox(max_width, names_size, false);
+    s = _("Character");
+    for(unsigned i=0; i < 10 ; i++) {
+      std::ostringstream oss;
+      oss << i+1;
+      tbox_character_name_list.push_back(new TextBox("",100,Font::FONT_MEDIUM, Font::FONT_NORMAL));
+      Label * lab = new Label(s+oss.str()+" : ",0, Font::FONT_MEDIUM, Font::FONT_NORMAL);
+
+      Box * name_box = new VBox(max_width, true, true);
+
+      name_box->AddWidget(lab);
+      name_box->AddWidget(tbox_character_name_list[i]);
+
+      teams_editor_names->AddWidget(name_box);
+    }
+
+    teams_editor_inf->AddWidget(teams_editor_names);
+
+    teams_editor_inf->Pack();
+    teams_editor->AddWidget(teams_editor_sup);
+    teams_editor->AddWidget(teams_editor_inf);
+    tabs->AddNewTab("unused", _("Teams editor"), teams_editor);
+    selected_team = NULL;
+    ReloadTeamList();
+  }
+
   /* Misc options */
   Box * misc_options = new GridBox(max_width, option_size, false);
   opt_updates = new PictureTextCBox(_("Check updates online?"),
@@ -175,6 +239,9 @@ OptionMenu::OptionMenu() :
 				 option_size, sound_freqs, current_sound_freq);
   sound_options->AddWidget(cbox_sound_freq);
 
+  warn_cbox = new PictureTextCBox(_("New player warning?"), "menu/warn_on_new_player", option_size);
+  sound_options->AddWidget(warn_cbox);
+
   tabs->AddNewTab("unused", _("Sound"), sound_options);
 
   // Values initialization
@@ -184,9 +251,12 @@ OptionMenu::OptionMenu() :
   opt_display_name->SetValue(config->GetDisplayNameCharacter());
   opt_scroll_on_border->SetValue(config->GetScrollOnBorder());
   opt_scroll_border_size->SetValue(config->GetScrollBorderSize());
+#ifndef __APPLE__
   full_screen->SetValue(app->video->IsFullScreen());
+#endif
   music_cbox->SetValue(config->GetSoundMusic());
   effects_cbox->SetValue(config->GetSoundEffects());
+  warn_cbox->SetValue(config->GetWarnOnNewPlayer());
 
   // Setting language selection
   lbox_languages->AddItem(config->GetLanguage() == "",    _("(system language)"),  "");
@@ -228,10 +298,12 @@ OptionMenu::OptionMenu() :
 
   widgets.AddWidget(tabs);
   widgets.Pack();
+
 }
 
 OptionMenu::~OptionMenu()
 {
+
 }
 
 void OptionMenu::OnClickUp(const Point2i &mousePosition, int button)
@@ -242,12 +314,25 @@ void OptionMenu::OnClickUp(const Point2i &mousePosition, int button)
   // make use of their newer values in near-realtime!
   if (w == volume_music)
     Config::GetInstance()->SetVolumeMusic(toVolume(volume_music->GetValue()));
-  else if (w == volume_effects)
+  else if (w == volume_effects) {
     Config::GetInstance()->SetVolumeEffects(toVolume(volume_effects->GetValue()));
-  else if (w == music_cbox)
+    JukeBox::GetInstance()->Play("share", "menu/clic");
+  }
+  else if (w == music_cbox) {
     JukeBox::GetInstance()->ActiveMusic(music_cbox->GetValue());
-  else if (w == effects_cbox)
+  }
+  else if (w == effects_cbox) {
     JukeBox::GetInstance()->ActiveEffects(effects_cbox->GetValue());
+  }
+  else if (w == lbox_teams) {
+    SelectTeam();
+  }
+  else if (w ==add_team){
+    AddTeam();
+  }
+  else if (w ==delete_team){
+    DeleteTeam();
+  }
 }
 
 void OptionMenu::OnClick(const Point2i &/*mousePosition*/, int /*button*/)
@@ -257,10 +342,14 @@ void OptionMenu::OnClick(const Point2i &/*mousePosition*/, int /*button*/)
 
 void OptionMenu::SaveOptions()
 {
+
   Config * config = Config::GetInstance();
 
   // Graphic options
   config->SetDisplayWindParticles(opt_display_wind_particles->GetValue());
+  // bug #11826 : Segmentation fault while exiting the menu.
+  if(!Game::GetInstance()->IsGameFinished())
+    wind.Reset();
   config->SetDisplayEnergyCharacter(opt_display_energy->GetValue());
   config->SetDisplayNameCharacter(opt_display_name->GetValue());
   config->SetScrollOnBorder(opt_scroll_on_border->GetValue());
@@ -281,7 +370,9 @@ void OptionMenu::SaveOptions()
 
   int w, h;
   sscanf(s_mode.c_str(),"%dx%d", &w, &h);
+#ifndef __APPLE__
   app->video->SetConfig(w, h, full_screen->GetValue());
+#endif
 
   uint x = app->video->window.GetWidth() / 2;
   uint y = app->video->window.GetHeight() - 50;
@@ -296,11 +387,19 @@ void OptionMenu::SaveOptions()
   std::string sfreq = cbox_sound_freq->GetValue();
   long freq;
   if (str2long(sfreq,freq)) JukeBox::GetInstance()->SetFrequency(freq);
+  config->SetWarnOnNewPlayer(warn_cbox->GetValue());
 
   JukeBox::GetInstance()->Init(); // commit modification on sound options
 
   //Save options in XML
   config->Save();
+
+  //Team editor
+  if((!lbox_teams->IsSelectedItem()) && (tbox_team_name->GetText().size()>0))
+  {
+    AddTeam();
+  }
+  SaveTeam();
 }
 
 bool OptionMenu::signal_ok()
@@ -356,3 +455,125 @@ uint OptionMenu::fromVolume(uint vol)
   uint max = Config::GetMaxVolume();
   return (vol*100 + max/2) / max;
 }
+
+
+// Team editor function
+
+void OptionMenu::AddTeam()
+{
+    SaveTeam();
+    CustomTeam *new_team = new CustomTeam();
+    new_team->NewTeam();
+    new_team->Save();
+    if((!lbox_teams->IsSelectedItem()) && (tbox_team_name->GetText().size()>0))
+    {
+      selected_team = new_team;
+      SaveTeam();
+    }
+    selected_team = new_team;
+    ReloadTeamList();
+    lbox_teams->NeedRedrawing();
+}
+
+void OptionMenu::DeleteTeam()
+{
+  if(selected_team !=NULL)
+  {
+    selected_team->Delete();
+    selected_team = NULL;
+    if(lbox_teams->IsSelectedItem())
+    {
+      lbox_teams->Deselect();
+
+    }
+    ReloadTeamList();
+    LoadTeam();
+    lbox_teams->NeedRedrawing();
+  }
+
+}
+
+void OptionMenu::LoadTeam()
+{
+
+    if(selected_team != NULL)
+    {
+      tbox_team_name->SetText(selected_team->GetName());
+      std::vector<std::string> character_names = selected_team->GetCharactersNameList();
+
+      for(unsigned i=0; i< character_names.size() && i<tbox_character_name_list.size(); i++)
+      {
+        tbox_character_name_list[i]->SetText(character_names[i]);
+      }
+
+    }else{
+      tbox_team_name->SetText("");
+
+      for(unsigned i=0; i< tbox_character_name_list.size(); i++)
+      {
+        tbox_character_name_list[i]->SetText("");
+
+      }
+    }
+}
+
+void OptionMenu::ReloadTeamList()
+{
+  lbox_teams->ClearItems();
+  std::string selected_team_name ="";
+  if(selected_team != NULL){
+    selected_team_name = selected_team->GetName();
+  }
+
+  GetCustomTeamsList().LoadList();
+  std::vector<CustomTeam *> custom_team_list = GetCustomTeamsList().GetList();
+
+  for(unsigned i=0; i< custom_team_list.size() ; i++)
+  {
+      if( custom_team_list[i]->GetName() == selected_team_name){
+          selected_team = custom_team_list[i];
+          LoadTeam();
+      }
+
+      lbox_teams->AddItem((selected_team == custom_team_list[i]),   custom_team_list[i]->GetName(),  custom_team_list[i]->GetName());
+
+  }
+}
+
+
+bool OptionMenu::SaveTeam(){
+if(selected_team !=NULL)
+  {
+    bool is_name_changed = (selected_team->GetName().compare(tbox_team_name->GetText()) != 0);
+    selected_team->SetName(tbox_team_name->GetText());
+    for(unsigned i=0; i<tbox_character_name_list.size(); i++)
+      {
+        selected_team->SetCharacterName(i,tbox_character_name_list[i]->GetText());
+      }
+    selected_team->Save();
+    return is_name_changed;
+  }
+
+    return false;
+}
+
+void OptionMenu::SelectTeam()
+{
+  if(lbox_teams->IsSelectedItem())
+  {
+    bool is_changed_name = SaveTeam();
+    std::string s_selected_team = lbox_teams->ReadValue();
+    selected_team = GetCustomTeamsList().GetByName(s_selected_team);
+    LoadTeam();
+    if(is_changed_name)
+    {
+        ReloadTeamList();
+    }
+
+  }
+}
+
+void OptionMenu::key_tab()
+{
+  Menu::key_tab();
+}
diff --git a/src/menu/options_menu.h b/src/menu/options_menu.h
index 8c3acd6..389d56a 100644
--- a/src/menu/options_menu.h
+++ b/src/menu/options_menu.h
@@ -23,22 +23,28 @@
 #define OPTIONS_MENU_H
 
 #include "menu.h"
+#include <vector>
 
+
+class ButtonPic;
 class ListBox;
 class CheckBox;
 class ComboBox;
+class CustomTeam;
 class SpinButtonWithPicture;
+class TextBox;
+
 
 class OptionMenu : public Menu
 {
-public:
+ public:
    OptionMenu();
    ~OptionMenu();
    static void CheckUpdates();
 
-private:
+ private:
 
-  /* If you need this, implement it (correctly)*/
+   /* If you need this, implement it (correctly)*/
    OptionMenu(const OptionMenu&);
    OptionMenu operator=(const OptionMenu&);
    /********************************************/
@@ -51,7 +57,9 @@ private:
    CheckBox *opt_display_name;
    CheckBox *opt_scroll_on_border;
    SpinButtonWithPicture * opt_scroll_border_size;
+#ifndef __APPLE__
    CheckBox *full_screen;
+#endif
    SpinButtonWithPicture *opt_max_fps;
 
    /* Sound options controllers */
@@ -62,6 +70,7 @@ private:
    SpinButtonWithPicture *volume_effects;
    CheckBox *music_cbox;
    CheckBox *effects_cbox;
+   CheckBox *warn_cbox;
 
    /* Misc options controllers */
    CheckBox *opt_updates;
@@ -73,8 +82,26 @@ private:
    static uint fromVolume(uint vol);
    static uint toVolume(uint level);
 
+   /* Teams controllers */
+
+   ListBox *lbox_teams;
+   ButtonPic *add_team;
+   ButtonPic *delete_team;
+   CustomTeam  *selected_team;
+   TextBox *tbox_team_name;
+   Label *team_name;
+   std::vector<TextBox *> tbox_character_name_list;
+
+   void AddTeam();
+   void DeleteTeam();
+   void LoadTeam();
+   void ReloadTeamList();
+   bool SaveTeam();
+   void SelectTeam();
+
    bool signal_ok();
    bool signal_cancel();
+   void key_tab();
 };
 
 #endif
diff --git a/src/menu/pause_menu.cpp b/src/menu/pause_menu.cpp
index 1f2b67e..e948245 100644
--- a/src/menu/pause_menu.cpp
+++ b/src/menu/pause_menu.cpp
@@ -41,12 +41,12 @@ PauseMenu::PauseMenu(bool& _exit_game)  :
   Menu("interface/quit_screen", vNo),
   exit_game(_exit_game)
 {
-  uint center_x = AppWormux::GetInstance()->video->window.GetWidth()/2;
-  uint center_y = AppWormux::GetInstance()->video->window.GetHeight()/2;
+  uint center_x = GetMainWindow().GetWidth()/2;
+  uint center_y = GetMainWindow().GetHeight()/2;
 
   Point2i size(100,100);
 
-  Box* box = new GridBox(AppWormux::GetInstance()->video->window.GetWidth()/2, size, true);
+  Box* box = new GridBox(GetMainWindow().GetWidth()/2, size, true);
 
   bt_continue_play = new ButtonPic(_("Back to battle"),
 				   "menu/ico_back_to_battle", size);
diff --git a/src/menu/results_menu.cpp b/src/menu/results_menu.cpp
index 163c856..e3009ee 100644
--- a/src/menu/results_menu.cpp
+++ b/src/menu/results_menu.cpp
@@ -25,14 +25,21 @@
 #include "character/character.h"
 #include "character/damage_stats.h"
 #include "game/time.h"
+#include "graphic/font.h"
 #include "graphic/sprite.h"
+#include "graphic/text.h"
 #include "graphic/video.h"
+#include "gui/box.h"
 #include "gui/button.h"
 #include "gui/label.h"
-#include "gui/box.h"
+#include "gui/list_box.h"
+#include "gui/null_widget.h"
 #include "gui/picture_widget.h"
 #include "gui/tabs.h"
+#include "gui/talk_box.h"
 #include "include/app.h"
+#include "include/action_handler.h"
+#include "network/network.h"
 #include "sound/jukebox.h"
 #include "team/results.h"
 #include "team/team.h"
@@ -41,7 +48,6 @@
 #include "tool/math_tools.h"
 #include "tool/resource_manager.h"
 
-#define DEF_MARGIN     16
 #define DEF_BORDER      8
 #define DEF_SIZE       32
 #define LINE_THICKNESS  2
@@ -49,87 +55,132 @@
 #define GRAPH_BORDER        20
 #define GRAPH_START_Y       400
 
-const Point2i BorderSize(DEF_BORDER, DEF_BORDER);
-const Vector2<double> Zoom(1.7321, 1.7321);
-const Point2i DefSize(DEF_SIZE, DEF_SIZE);
+static const Point2i BorderSize(DEF_BORDER, DEF_BORDER);
+static const Point2i DefSize(DEF_SIZE, DEF_SIZE);
 
 class ResultBox : public HBox
 {
-private:
-  Label *name_lbl;
-  Label *score_lbl;
-  PictureWidget *team_picture;
-public:
-  ResultBox(const std::string& type_name,
-            Font::font_size_t font_size,
-            Font::font_style_t font_style,
-            const Point2i& type_size,
-            const Point2i& name_size,
-            const Point2i& score_size);
-  // Hopefully no need for ~ResultBox() as it automatically
-  // destroy child widgets by inheriting from HBox
-  void SetIntResult(const std::string& name, int score, const Surface& team_logo);
-  void SetDoubleResult(const std::string& name, double score, const Surface& team_logo);
-  void SetNoResult();
-};
-
-ResultBox::ResultBox(const std::string& type_name,
-                     Font::font_size_t font_size,
-                     Font::font_style_t font_style,
-                     const Point2i& type_size,
-                     const Point2i& name_size,
-                     const Point2i& score_size)
-  : HBox(W_UNDEF, false, false)
-{
-  margin = DEF_MARGIN;
-  border.SetValues(DEF_BORDER, DEF_BORDER);
-
-  AddWidget(new Label(type_name, type_size.x, font_size, font_style));
-
-  name_lbl = new Label("", name_size.x, font_size, font_style);
-  AddWidget(name_lbl);
-
-  score_lbl = new Label("", score_size.x, font_size, font_style);
-  AddWidget(score_lbl);
-
-  team_picture = new PictureWidget(Point2i(48, 48) );
-  AddWidget(team_picture);
-}
+  void SetWidgets(uint size, const std::string& type, const char* buffer, const Character* player)
+  {
+    margin = DEF_BORDER;
+    border = BorderSize;
+    size -= 4*DEF_BORDER + 40;
+    // Should resize more depending on font size
+    Font::font_size_t font = (size > 400) ? Font::FONT_BIG : Font::FONT_MEDIUM;
+    //printf("Size=%u\n", size);
 
-void ResultBox::SetIntResult(const std::string& name, int score, const Surface& team_logo)
-{
-  char buffer[16];
-  std::string copy_name(name);
+    AddWidget(new Label(type, (size*TypeW)/TotalW, font, Font::FONT_NORMAL));
 
-  snprintf(buffer, 16, "%i", score);
+    AddWidget(new Label((player) ? player->GetName() : _("Nobody!"),
+                        (size*NameW)/TotalW, font, Font::FONT_NORMAL));
 
-  std::string score_str(buffer);
+    std::string score_str(buffer);
+    AddWidget(new Label(score_str, (size*ScoreW)/TotalW, font, Font::FONT_NORMAL));
 
-  name_lbl->SetText(copy_name);
-  score_lbl->SetText(score_str);
-  team_picture->SetSurface(team_logo);
-}
+    if (player)
+    {
+      PictureWidget *team_picture = new PictureWidget(DefSize);
+      team_picture->SetSurface(player->GetTeam().GetFlag());
+      AddWidget(team_picture);
+    }
+    else
+    {
+      AddWidget(new NullWidget(DefSize));
+    }
+  }
+public:
+  // Label widthes and font sizes should be inferred from the resolution
+  static const uint TypeW  = 180;
+  static const uint NameW  = 160;
+  static const uint ScoreW = 50;
+  static const uint TotalW = TypeW + NameW + ScoreW;
+
+  ResultBox(uint size, const std::string& type)
+    : HBox(W_UNDEF, false, false)
+  {
+    SetWidgets(size, type, "?", NULL);
+  }
+  ResultBox(uint size, const std::string& type, uint score, const Character* player)
+    : HBox(W_UNDEF, false, false)
+  {
+    char buffer[16];
+    snprintf(buffer, 16, "%i", score);
+    SetWidgets(size, type, buffer, player);
+  }
+  ResultBox(uint size, const std::string& type, double score, const Character* player)
+    : HBox(W_UNDEF, false, false)
+  {
+    char buffer[16];
+    if (score+0.05<100.0) snprintf(buffer, 16, "%.1f", score);
+    else                  snprintf(buffer, 16, "%.0f", score);
+    SetWidgets(size, type, buffer, player);
+  }
+  void Draw(const Point2i &mousePosition) const
+  {
+    HBox::Draw(mousePosition);
+    for (std::list<Widget*>::const_iterator it = widget_list.begin(); it != widget_list.end(); ++it)
+      (*it)->Draw(mousePosition);
+  }
+};
 
-void ResultBox::SetDoubleResult(const std::string& name, double score, const Surface& team_logo)
+class ResultListBox : public BaseListBox
 {
-  char buffer[16];
-  std::string copy_name(name);
-
-  snprintf(buffer, 16, "%.1f", score);
-
-  std::string score_str(buffer);
-
-  name_lbl->SetText(copy_name);
-  score_lbl->SetText(score_str);
-  team_picture->SetSurface(team_logo);
-}
+public:
+  ResultListBox(const TeamResults* res, const Point2i &size, bool force = true)
+    : BaseListBox(size, force)
+  {
+    ResultBox       *box;
+    const Character *player = res->getMostViolent();
+
+    //Most violent
+    if (player)
+      box = new ResultBox(size.x, _("Most violent"), player->GetDamageStats()->GetMostDamage(), player);
+    else
+      box = new ResultBox(size.x, _("Most violent"));
+    AddWidgetItem(false, box);
+
+    //Most useful
+    player = res->getMostUseful();
+    if (player)
+      box = new ResultBox(size.x, _("Most useful"), player->GetDamageStats()->GetOthersDamage(), player);
+    else
+      box = new ResultBox(size.x, _("Most useful"));
+    AddWidgetItem(false, box);
+
+    //Most useless
+    player = res->getMostUseless();
+    if (player)
+      box = new ResultBox(size.x, _("Most useless"), player->GetDamageStats()->GetOthersDamage(), player);
+    else
+      box = new ResultBox(size.x, _("Most useless"));
+    AddWidgetItem(false, box);
+
+    // Biggest sold-out
+    player = res->getBiggestTraitor();
+    if (player)
+      box = new ResultBox(size.x, _("Most sold-out"), player->GetDamageStats()->GetFriendlyFireDamage(), player);
+    else
+      box = new ResultBox(size.x, _("Most sold-out"));
+    AddWidgetItem(false, box);
+
+    // Most clumsy
+    player = res->getMostClumsy();
+    if (player)
+      box = new ResultBox(size.x, _("Clumsiest"), player->GetDamageStats()->GetItselfDamage(), player);
+    else
+      box = new ResultBox(size.x, _("Clumsiest"));
+    AddWidgetItem(false, box);
+
+    // Most accurate
+    player = res->getMostAccurate();
+    if (player)
+      box = new ResultBox(size.x, _("Most accurate"), player->GetDamageStats()->GetAccuracy(), player);
+    else
+      box = new ResultBox(size.x, _("Most accurate"));
+    AddWidgetItem(false, box);
+  }
+};
 
-void ResultBox::SetNoResult()
-{
-  name_lbl->SetText(_("Nobody!"));
-  score_lbl->SetText("0");
-  team_picture->SetNoSurface();
-}
 
 //=========================================================
 
@@ -175,6 +226,7 @@ public:
 			     int x, int y,
 			     double duration_scale,
 			     double energy_scale,
+                             uint   max_duration,
 			     const Color& color) const;
   virtual void DrawGraph(int x, int y, int w, int h) const;
 
@@ -188,13 +240,15 @@ CanvasTeamsGraph::CanvasTeamsGraph(const Point2i& size,
 
 void CanvasTeamsGraph::Draw(const Point2i& /*mousePosition*/) const
 {
-  DrawGraph(position.x, position.y, size.x, size.y);
+  DrawGraph(position.x+DEF_BORDER, position.y+DEF_BORDER,
+            size.x-2*DEF_BORDER, size.y-2*DEF_BORDER);
 }
 
 void CanvasTeamsGraph::DrawTeamGraph(const Team *team,
 				     int x, int y,
 				     double duration_scale,
 				     double energy_scale,
+                                     uint   max_duration,
 				     const Color& color) const
 {
   EnergyList::const_iterator it = team->energy.energy_list.begin(),
@@ -207,7 +261,7 @@ void CanvasTeamsGraph::DrawTeamGraph(const Team *team,
 
   int sx = x+lround((*it)->GetDuration()*duration_scale)+LINE_THICKNESS,
     sy = y-lround((*it)->GetValue()*energy_scale);
-  Surface &surface = AppWormux::GetInstance()->video->window;
+  Surface &surface = GetMainWindow();
   MSG_DEBUG("menu", "   First point: (%u,%u) -> (%i,%i)\n",
             (*it)->GetDuration(), (*it)->GetValue(), sx, sy);
 
@@ -229,49 +283,74 @@ void CanvasTeamsGraph::DrawTeamGraph(const Team *team,
     sy = ey;
     ++it;
   } while (it != end);
+
+  // Missing point
+  --it;
+  if ((*it)->GetDuration() < max_duration)
+  {
+    surface.BoxColor(Rectanglei(sx, sy, x+lround(max_duration*duration_scale)-sx, LINE_THICKNESS), color);
+  }
 }
 
 void CanvasTeamsGraph::DrawGraph(int x, int y, int w, int h) const
 {
   // Value to determine normalization
   uint   max_value      = 0;
-  double duration_scale = w / (1.1*Time::GetInstance()->Read());
+  uint   max_duration   = 0;
+  uint   graph_h        = h-32;
+  uint   graph_w        = w-32;
+  uint   graph_x        = x+32;
   std::vector<TeamResults*>::const_iterator it;
 
   for (it=results.begin(); it!=results.end(); ++it)
   {
     const Team* team = (*it)->getTeam();
     if (team)
+    {
       if (team->energy.energy_list.GetMaxValue() > max_value)
-      {
         max_value = team->energy.energy_list.GetMaxValue();
-        MSG_DEBUG("menu", "New maximum value: %u\n", max_value);
-      }
+      if (team->energy.energy_list.GetDuration() > max_duration)
+        max_duration = team->energy.energy_list.GetDuration();
+    }
   }
 
   // Draw here the graph and stuff
-  Surface &surface = AppWormux::GetInstance()->video->window;
-  surface.BoxColor(Rectanglei(x, y, LINE_THICKNESS, h), black_color);
-  surface.BoxColor(Rectanglei(x, y+h, w, LINE_THICKNESS), black_color);
+  Surface &surface = GetMainWindow();
+  surface.BoxColor(Rectanglei(graph_x, y, LINE_THICKNESS, graph_h), black_color);
+  surface.BoxColor(Rectanglei(graph_x, y+graph_h, graph_w, LINE_THICKNESS), black_color);
+  //DrawTmpBoxText(Font::GetInstance()->, Point2i(w/2, y+graph_h+8), _("Time"), 0);
+  surface.Blit(Font::GetInstance(Font::FONT_MEDIUM, Font::FONT_BOLD)->CreateSurface(_("Time"), black_color),
+               Point2i(graph_x+graph_w/2, y+graph_h+8));
+  surface.Blit(Font::GetInstance(Font::FONT_MEDIUM, Font::FONT_BOLD)->CreateSurface(_("Energy"), black_color).RotoZoom(M_PI/2, 1.0, 1.0, false),
+               Point2i(x+4, graph_h/2));
+  char buffer[16];
+  snprintf(buffer, 16, "%.1f", max_duration/1000.0);
+  surface.Blit(Font::GetInstance(Font::FONT_MEDIUM, Font::FONT_BOLD)->CreateSurface(buffer, black_color),
+               Point2i(x+graph_w-20, y+graph_h+8));
 
   // Draw each team graph
-  double energy_scale = h / (1.1*max_value);
+  double energy_scale = graph_h / (1.05*max_value);
+  double duration_scale = graph_w / (1.05*max_duration);
   MSG_DEBUG("menu", "Scaling: %.1f (duration; %u) and %.1f\n",
             duration_scale, Time::GetInstance()->ReadDuration(), energy_scale);
-#if 1
+
+  uint               index   = 0;
   static const Color clist[] =
-    { white_color, primary_red_color, c_yellow, c_grey, green_color, black_color };
-  uint   current_color = 0;
+    { black_color, primary_red_color, gray_color, primary_green_color, black_color, primary_blue_color };
   for (it=results.begin(); it!=results.end(); ++it)
   {
     const Team* team = (*it)->getTeam();
     if (team)
     {
-      DrawTeamGraph(team, x, y+h, duration_scale, energy_scale, clist[current_color]);
-      current_color++;
+      // Legend line
+      surface.BoxColor(Rectanglei(x+w-112, y+12+index*40,
+                                  56, LINE_THICKNESS), clist[index]);
+      // Legend icon
+      surface.Blit(team->GetFlag(), Point2i(x+w-48, y+12+index*40-20));
+      DrawTeamGraph(team, graph_x, y+graph_h, duration_scale, energy_scale, max_duration, clist[index]);
+      index++;
     }
   }
-#endif
 }
 
 //=========================================================
@@ -282,15 +361,10 @@ ResultsMenu::ResultsMenu(std::vector<TeamResults*>& v, bool disconnected)
   , first_team(NULL)
   , second_team(NULL)
   , third_team(NULL)
-  , index(-1)
-  , max_height(DEF_SIZE+3*DEF_BORDER)
-  , team_size(360, 40)
-  , type_size(200, 40)
-  , name_size(150, 40)
-  , score_size(40, 40)
+  , msg_box(NULL)
   , winner_box(NULL)
 {
-  Profile *res = resource_manager.LoadXMLProfile( "graphism.xml",false);
+  Profile *res = resource_manager.LoadXMLProfile("graphism.xml", false);
   uint x = 20;
   uint y = 20;
 
@@ -321,75 +395,46 @@ ResultsMenu::ResultsMenu(std::vector<TeamResults*>& v, bool disconnected)
 
   // Load the podium img
   podium_img = resource_manager.LoadImage(res, "menu/podium");
+  resource_manager.UnLoadXMLProfile(res);
 
   x+=260;
+  const Point2i& wsize = GetMainWindow().GetSize();
 
-  tabs = new MultiTabs(Point2i(520, 550));
-
-  Box* statistics_box = new VBox(510, false);
+  Point2i tab_size = wsize - Point2i(x+16, y+70);
 
-  //Team selection
-  team_box = new HBox(max_height, false);
-  team_box->SetMargin(DEF_MARGIN);
-  team_box->SetBorder(Point2i(DEF_BORDER, DEF_BORDER));
+  VBox* tmp_box = new VBox(tab_size.x, false, false);
+  tmp_box->SetNoBorder();
 
-  bt_prev_team = new Button(res, "menu/really_big_minus");
-  team_box->AddWidget(bt_prev_team);
-
-  team_logo = new PictureWidget(Point2i(48, 48) );
-  team_box->AddWidget(team_logo);
-
-  team_name = new Label("", team_size.x-48, Font::FONT_BIG, Font::FONT_NORMAL);
-  team_box->AddWidget(team_name);
-
-  bt_next_team = new Button(res, "menu/really_big_plus");
-  team_box->AddWidget(bt_next_team);
-
-  statistics_box->AddWidget(team_box);
-
-  most_violent = new ResultBox(_("Most violent"), Font::FONT_BIG, Font::FONT_NORMAL,
-                               type_size, name_size, score_size);
-  statistics_box->AddWidget(most_violent);
-
-  most_useful = new ResultBox(_("Most useful"), Font::FONT_BIG, Font::FONT_NORMAL,
-			      type_size, name_size, score_size);
-  statistics_box->AddWidget(most_useful);
-
-  most_useless = new ResultBox(_("Most useless"), Font::FONT_BIG, Font::FONT_NORMAL,
-                               type_size, name_size, score_size);
-  statistics_box->AddWidget(most_useless);
-
-  biggest_traitor = new ResultBox(_("Most sold-out"), Font::FONT_BIG, Font::FONT_NORMAL,
-                                  type_size, name_size, score_size);
-  statistics_box->AddWidget(biggest_traitor);
-
-  most_clumsy = new ResultBox(_("Most clumsy"), Font::FONT_BIG, Font::FONT_NORMAL,
-                              type_size, name_size, score_size);
-  statistics_box->AddWidget(most_clumsy);
-
-  most_accurate = new ResultBox(_("Most accurate"), Font::FONT_BIG, Font::FONT_NORMAL,
-                                type_size, name_size, score_size);
-  statistics_box->AddWidget(most_accurate);
-
-  statistics_box->SetPosition(x, y);
+  // Are we in network ? yes, so display a talkbox
+  if (Network::IsConnected()) {
+    msg_box = new TalkBox(Point2i(tab_size.x, 120), Font::FONT_SMALL, Font::FONT_NORMAL);
+    tab_size.y -= 125;
+  }
 
-  resource_manager.UnLoadXMLProfile(res);
+  tabs = new MultiTabs(tab_size);
 
-  tabs->AddNewTab("TAB_team", _("Team stats"), statistics_box);
+  // Create tabs for each team result
+  stats = new MultiTabs(tab_size - 2*BorderSize);
+  stats->SetMaxVisibleTabs(1);
+  for (uint i=0; i<v.size(); i++)
+  {
+    const Team* team = v[i]->getTeam();
+    const char* name = (team) ? team->GetName().c_str() : _("All teams");
+    stats->AddNewTab(name, name, new ResultListBox(v[i], tab_size - 4*BorderSize));
+  }
+  tabs->AddNewTab("TAB_team", _("Team stats"), stats);
 
-  // Label for graph axes
-//   widgets.AddWidget(new Label(_("Time"), ,
-//                               Font::FONT_SMALL, Font::FONT_BOLD, black_color, true, false));
+  tabs->AddNewTab("TAB_canvas", _("Team graphs"),
+                  new CanvasTeamsGraph(tab_size - 2*BorderSize, results));
 
-  Widget * canvas = new CanvasTeamsGraph(
- 					 Point2i(AppWormux::GetInstance()->video->window.GetWidth()/2-GRAPH_BORDER,
- 						 AppWormux::GetInstance()->video->window.GetHeight()-GRAPH_BORDER-GRAPH_START_Y),
- 					 results);
+  tmp_box->AddWidget(tabs);
 
-  tabs->AddNewTab("TAB_canvas", _("Team graphs"), canvas);
-  tabs->SetPosition(x, y);
+  if (msg_box != NULL) {
+    tmp_box->AddWidget(msg_box);
+  }
+  tmp_box->SetPosition(x, y);
 
-  widgets.AddWidget(tabs);
+  widgets.AddWidget(tmp_box);
   widgets.Pack();
 }
 
@@ -418,12 +463,12 @@ void ResultsMenu::DrawTeamOnPodium(const Team& team, const Point2i& podium_posit
   Surface team_character(team.GetFlag());
   //team_character.Flip(); ==> Why does it not work ?
 
-  AppWormux::GetInstance()->video->window.Blit(team_character, position);
+  GetMainWindow().Blit(team_character, position);
 }
 
 void ResultsMenu::DrawPodium(const Point2i& position) const
 {
-  AppWormux::GetInstance()->video->window.Blit(podium_img, position);
+  GetMainWindow().Blit(podium_img, position);
 
   if (first_team)
     DrawTeamOnPodium(*first_team, position, Point2i(60,8));
@@ -435,109 +480,41 @@ void ResultsMenu::DrawPodium(const Point2i& position) const
     DrawTeamOnPodium(*third_team, position, Point2i(98,42));
 }
 
-void ResultsMenu::SetResult(int i)
+void ResultsMenu::OnClickUp(const Point2i &mousePosition, int button)
 {
-  if (index == i)
-    return;
-
-  const Character* player = NULL;
-  const TeamResults* res = NULL;
-  std::string name;
-
-  DrawBackground();
-  b_ok->NeedRedrawing();
-
-  if (winner_box)
-    winner_box->NeedRedrawing();
-
-  DrawPodium(Point2i(70,250));
-
-  index = i;
-  if (index < 0)
-    index = results.size()-1;
-  else if (index > (int)results.size()-1)
-    index = 0;
-
-  res = results.at(index);
-
-  //Team header
-  if (res->getTeam() == NULL) {
-    name = _("All teams");
-    team_logo->SetNoSurface();
-  } else {
-    name = res->getTeam()->GetName()+" - "+res->getTeam()->GetPlayerName();
-    team_logo->SetSurface(res->getTeam()->GetFlag());
-  }
-
-  team_name->SetText(name);
-
-  //Most violent
-  player = res->getMostViolent();
-  if (player)
-    most_violent->SetIntResult(player->GetName(), player->GetDamageStats()->GetMostDamage(), player->GetTeam().GetFlag());
-  else
-    most_violent->SetNoResult();
-
-  //Most useful
-  player = res->getMostUseful();
-  if (player)
-    most_useful->SetIntResult(player->GetName(), player->GetDamageStats()->GetOthersDamage(), player->GetTeam().GetFlag());
-  else
-    most_useful->SetNoResult();
-
-  //Most useless
-  player = res->getMostUseless();
-  if (player)
-    most_useless->SetIntResult(player->GetName(), player->GetDamageStats()->GetOthersDamage(), player->GetTeam().GetFlag());
-  else
-    most_useless->SetNoResult();
-
-  // Biggest sold-out
-  player = res->getBiggestTraitor();
-  if (player)
-    biggest_traitor->SetIntResult(player->GetName(), player->GetDamageStats()->GetFriendlyFireDamage(), player->GetTeam().GetFlag());
-  else
-    biggest_traitor->SetNoResult();
-
-  // Most clumsy
-  player = res->getMostClumsy();
-  if (player)
-    most_clumsy->SetIntResult(player->GetName(), player->GetDamageStats()->GetItselfDamage(), player->GetTeam().GetFlag());
-  else
-    most_clumsy->SetNoResult();
-
-  // Most accurate
-  player = res->getMostAccurate();
-  if (player)
-    most_accurate->SetDoubleResult(player->GetName(), player->GetDamageStats()->GetAccuracy(), player->GetTeam(). GetFlag());
-  else
-    most_accurate->SetNoResult();
-
-  tabs->NeedRedrawing();
+  widgets.ClickUp(mousePosition, button);
 }
 
-void ResultsMenu::OnClickUp(const Point2i &mousePosition, int button)
+void ResultsMenu::OnClick(const Point2i &mousePosition, int button)
 {
-  Widget* w = widgets.ClickUp(mousePosition, button);
-
-  if (button == SDL_BUTTON_LEFT && w == bt_prev_team)
-    SetResult(index-1);
-  else if (button == SDL_BUTTON_LEFT && w == bt_next_team)
-    SetResult(index+1);
-  else if ( button == SDL_BUTTON_WHEELDOWN || w == statistics_box )
-    SetResult(index-1);
-  else if (button == SDL_BUTTON_WHEELUP || w == statistics_box )
-    SetResult(index+1);
+  // Do nothing if user has not released the button
+  widgets.Click(mousePosition, button);
 }
 
-void ResultsMenu::OnClick(const Point2i &/*mousePosition*/, int /*button*/)
+void ResultsMenu::key_ok()
 {
-  // Do nothing if user has not released the button
+  // return was pressed while chat texbox still had focus (player wants to send his msg)
+  if (msg_box != NULL && msg_box->TextHasFocus())
+  {
+    msg_box->SendChatMsg();
+    return;
+  }
+  Menu::key_ok();
 }
 
 void ResultsMenu::Draw(const Point2i &/*mousePosition*/)
 {
-  if (index == -1)
-    SetResult(results.size()-1);
+  DrawPodium(Point2i(70,250));
+
+  if (Network::IsConnected()) {
+    ActionHandler * action_handler = ActionHandler::GetInstance();
+    action_handler->ExecActions();
+  }
 }
 
+void ResultsMenu::ReceiveMsgCallback(const std::string& msg)
+{
+  if (msg_box) {
+    msg_box->NewMessage(msg);
+  }
+}
diff --git a/src/menu/results_menu.h b/src/menu/results_menu.h
index d0ae92d..13c2615 100644
--- a/src/menu/results_menu.h
+++ b/src/menu/results_menu.h
@@ -31,6 +31,7 @@ class PictureWidget;
 class TeamResults;
 class Team;
 class MultiTabs;
+class TalkBox;
 
 class ResultsMenu : public Menu
 {
@@ -42,38 +43,20 @@ class ResultsMenu : public Menu
     const Team *first_team, *second_team, *third_team;
     int     index;
 
-    MultiTabs * tabs;
+    MultiTabs *tabs;
+    MultiTabs *stats;
 
-    // Box sizes
-    int     max_height;
-    Point2i team_size;
-    Point2i type_size;
-    Point2i name_size;
-    Point2i score_size;
-
-    /* Team controllers */
-    Button  *bt_prev_team;
-    Button  *bt_next_team;
-    PictureWidget *team_logo;
-    Label   *team_name;
-    Box    *team_box;
+    /* Chat controller */
+    TalkBox* msg_box;
 
     Box    *winner_box;
-    Box    *statistics_box;
-    ResultBox* most_violent;
-    ResultBox* most_useful;
-    ResultBox* most_useless;
-    ResultBox* biggest_traitor;
-    ResultBox* most_clumsy;
-    ResultBox* most_accurate;
-
     Surface podium_img;
 
+    void key_ok();
     bool signal_ok() { return true;};
     bool signal_cancel() { return true;};
 
     void ComputeTeamsOrder();
-    void SetResult(int i);
     void OnClick(const Point2i &mousePosition, int button);
     void OnClickUp(const Point2i &mousePosition, int button);
     void DrawPodium(const Point2i &position) const;
@@ -83,6 +66,8 @@ class ResultsMenu : public Menu
  public:
     ResultsMenu(std::vector<TeamResults*>& v, bool disconnected = false);
     ~ResultsMenu();
+
+    void ReceiveMsgCallback(const std::string& msg);
 };
 
 #endif //RESULTS_MENU_H
diff --git a/src/menu/skin_menu.cpp b/src/menu/skin_menu.cpp
new file mode 100644
index 0000000..3c9df66
--- /dev/null
+++ b/src/menu/skin_menu.cpp
@@ -0,0 +1,181 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Skin menu, to visualize them easily
+ *****************************************************************************/
+
+#include <assert.h>
+#include "character/body_list.h"
+#include "character/body.h"
+#include "character/clothe.h"
+#include "graphic/video.h"
+#include "gui/box.h"
+#include "gui/list_box_w_label.h"
+#include "gui/spin_button.h"
+#include "include/app.h"
+#include "game/config.h"
+#include "team/team.h"
+#include "team/teams_list.h"
+#include "tool/file_tools.h"
+#include "tool/i18n.h"
+#include "menu/skin_menu.h"
+
+static const uint BORDER        = 20;
+static const uint CHECKBOX_SIZE = 50;
+static const uint SKIN_SIZE     = 100;
+
+SkinMenu::SkinMenu(const char* name)
+ : Menu("menu/bg_option")
+ , frame(NULL)
+ , body(NULL)
+{
+  uint size = GetMainWindow().GetHeight()
+            - (2*BORDER+CHECKBOX_SIZE+SKIN_SIZE);
+  Box  *box = new HBox(size);
+
+  position = 2*BORDER + size;
+
+  teams = new ListBoxWithLabel("Teams", Point2i(120, -1)); box->AddWidget(teams);
+  clothe_list = new ListBoxWithLabel("Clothes", Point2i(130, -1)); box->AddWidget(clothe_list);
+  movement_list = new ListBoxWithLabel("Movements", Point2i(240, -1)); box->AddWidget(movement_list);
+
+  // Load Wormux teams - use TeamList::full_list if you don't mind the whole loading
+  const Config * config = Config::GetConstInstance();
+  bool  found = false;
+  std::string dirname = config->GetDataDir() + "team" PATH_SEPARATOR;
+  FolderSearch *f = OpenFolder(dirname);
+  if (f) {
+    const char *tname;
+    while ((tname = FolderSearchNext(f)) != NULL)
+    {
+      if (tname[0] != '.')
+      {
+        bool match = name && !strcmp(name, tname);
+        teams->AddItem(match, tname, tname);
+        printf("Adding %s\n", tname);
+        if (match)
+          found = true;
+      }
+    }
+    CloseFolder(f);
+  } else {
+    Error (Format(_("Cannot open teams directory (%s)!"), dirname.c_str()));
+  }
+
+  box->SetPosition(BORDER, BORDER);
+  widgets.AddWidget(box);
+  widgets.Pack();
+
+  if (name && !found)
+    Error("Team not found!");
+}
+
+SkinMenu::~SkinMenu()
+{
+}
+
+void SkinMenu::LoadBody(const std::string& name)
+{
+  printf("Should load %s\n", name.c_str());
+  body_list.FreeMem();
+  body = body_list.GetBody(name);
+
+  clothe_list->ClearItems();
+  for (std::map<std::string, Clothe*>::const_iterator it = body->clothes_lst.begin();
+       it != body->clothes_lst.end(); ++it)
+  {
+    clothe_list->AddItem(false, (*it).first, (*it).first);
+  }
+
+  movement_list->ClearItems();
+  for (std::map<std::string, Movement*>::const_iterator it = body->mvt_lst.begin();
+       it != body->mvt_lst.end(); ++it)
+  {
+    movement_list->AddItem(false, (*it).first, (*it).first);
+  }
+}
+
+void SkinMenu::Display()
+{
+  if (body)
+  {
+    if (frame)
+    {
+      // Will also delete it
+      widgets.RemoveWidget(frame);
+      frame = NULL;
+    }
+
+    uint count = body->GetFrameCount()-1;
+    if (count)
+    {
+      frame = new SpinButton("Frame", 90, 0, 1, 0, count);
+      frame->SetPosition(Point2i(BORDER+50, position));
+      widgets.AddWidget(frame);
+      widgets.Pack();
+    }
+    RedrawBackground(Rectanglei(Point2i(BORDER-10, position-10), Point2i(160,60)));
+    body->Draw(Point2i(BORDER, position));
+  }
+}
+
+void SkinMenu::OnClick(const Point2i &mousePosition, int button)
+{
+  widgets.Click(mousePosition, button);
+}
+
+void SkinMenu::OnClickUp(const Point2i &mousePosition, int button)
+{
+  Widget* w = widgets.ClickUp(mousePosition, button);
+
+  // Now that the click has been processed by the underlying widgets,
+  // make use of their newer values in near-realtime!
+  if (w == teams)
+  {
+    LoadBody(teams->ReadValue());
+  }
+  else if (w == clothe_list)
+  {
+    if (body)
+    {
+      body->SetClothe(clothe_list->ReadValue());
+      if (movement_list->GetSelectedItem() != -1)
+        Display();
+    }
+  }
+  else if (w == movement_list)
+  {
+    if (body)
+    {
+      // Unfortunately, those movements make it crash:
+      // black, breathe, drowned
+      body->SetMovement(movement_list->ReadValue());
+      if (clothe_list->GetSelectedItem() != -1)
+        Display();
+    }
+  }
+  else if (frame && w == frame)
+  {
+    if (body)
+    {
+      body->SetFrame(frame->GetValue());
+      RedrawBackground(Rectanglei(Point2i(BORDER-10, position-10), Point2i(60,60)));
+      body->Draw(Point2i(BORDER, position));
+    }
+  }
+}
diff --git a/src/menu/skin_menu.h b/src/menu/skin_menu.h
new file mode 100644
index 0000000..3ec20f8
--- /dev/null
+++ b/src/menu/skin_menu.h
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Skin menu, to visualize them easily
+ *****************************************************************************/
+
+#ifndef SKIN_MENU_H
+#define SKIN_MENU_H
+
+#include "menu.h"
+
+class ListBoxWithLabel;
+class Body;
+class SpinButton;
+
+class SkinMenu : public Menu
+{
+  ListBoxWithLabel *teams;
+  ListBoxWithLabel *clothe_list;
+  ListBoxWithLabel *movement_list;
+  SpinButton       *frame;
+  Body             *body;
+  uint             position;
+
+  void  LoadBody(const std::string& name);
+  void  Display();
+
+public:
+  SkinMenu(const char* name = NULL);
+  ~SkinMenu();
+
+  void OnClick(const Point2i &mousePosition, int button);
+  void OnClickUp(const Point2i &mousePosition, int button);
+  void Draw(const Point2i&) { };
+
+  bool signal_ok() { return true; };
+  bool signal_cancel() { return true; };
+};
+
+#endif /* SKIN_MENU_H */
diff --git a/src/menu/team_box.cpp b/src/menu/team_box.cpp
index 6e14ebe..fead83f 100644
--- a/src/menu/team_box.cpp
+++ b/src/menu/team_box.cpp
@@ -19,6 +19,7 @@
  *  Teams selection box
  *****************************************************************************/
 
+#include "gui/button.h"
 #include "gui/label.h"
 #include "gui/picture_widget.h"
 #include "gui/spin_button.h"
@@ -27,7 +28,10 @@
 #include "include/action_handler.h"
 #include "network/network.h"
 #include "team/team.h"
+#include "team/custom_team.h"
+#include "team/custom_teams_list.h"
 #include "tool/i18n.h"
+#include "tool/resource_manager.h"
 
 TeamBox::TeamBox(const std::string& _player_name, const Point2i& _size) :
   HBox(W_UNDEF, false, false)
@@ -37,25 +41,48 @@ TeamBox::TeamBox(const std::string& _player_name, const Point2i& _size) :
   SetMargin(2);
   SetNoBorder();
 
+  Profile *res = resource_manager.LoadXMLProfile( "graphism.xml", false);
+
   team_logo = new PictureWidget(Point2i(48, 48));
   AddWidget(team_logo);
 
   Box * tmp_box = new VBox(W_UNDEF, false, false);
   tmp_box->SetMargin(2);
   tmp_box->SetNoBorder();
-  previous_name = "team";
-  team_name = new Label(previous_name, _size.x - 50,
+  previous_player_name = "team";
+  team_name = new Label(previous_player_name, _size.x - 50,
                         Font::FONT_MEDIUM, Font::FONT_BOLD,
                         dark_gray_color, false, false);
 
   Box * tmp_player_box = new HBox(W_UNDEF, false, false);
   tmp_player_box->SetMargin(0);
   tmp_player_box->SetNoBorder();
-  tmp_player_box->AddWidget(new Label(_("Head commander"), _size.GetX()-50-100,
-                                      Font::FONT_SMALL, Font::FONT_NORMAL, dark_gray_color, false, false));
+
+  custom_team_list = GetCustomTeamsList().GetList();
+  custom_team_current_id = 0;
+
   player_name = new TextBox(_player_name, 100,
                             Font::FONT_SMALL, Font::FONT_NORMAL);
-  tmp_player_box->AddWidget(player_name);
+
+  if(custom_team_list.size()==0){
+  tmp_player_box->AddWidget(new Label(_("Head commander"), _size.GetX()-50-100,
+                                      Font::FONT_SMALL, Font::FONT_NORMAL, dark_gray_color, false, false));
+
+    tmp_player_box->AddWidget(player_name);
+  }
+  else
+  {
+    tmp_player_box->AddWidget(new Label(_("Head commander"), _size.GetX()-60-100,
+                                      Font::FONT_SMALL, Font::FONT_NORMAL, dark_gray_color, false, false));
+
+    next_custom_team = new Button(res, "menu/plus");
+
+    previous_custom_team = new Button(res, "menu/minus");
+
+    tmp_player_box->AddWidget(previous_custom_team);
+    tmp_player_box->AddWidget(player_name);
+    tmp_player_box->AddWidget(next_custom_team);
+  }
 
   nb_characters = new SpinButton(_("Number of characters"), _size.GetX()-50,
                                  6,1,1,10,
@@ -65,27 +92,8 @@ TeamBox::TeamBox(const std::string& _player_name, const Point2i& _size) :
   tmp_box->AddWidget(tmp_player_box);
   tmp_box->AddWidget(nb_characters);
 
-  AddWidget(tmp_box);
-}
-
-void TeamBox::SetTeam(Team& _team, bool read_team_values)
-{
-  associated_team=&_team;
 
-  if (!_team.IsLocal() && !_team.IsLocalAI()) {
-    // translators: this is the team listing and will expand in a context like "OOo team - Remote"
-    team_name->SetText(Format(_("%s Team - Remote"), _team.GetName().c_str()));
-  } else {
-    team_name->SetText(Format(_("%s Team"), _team.GetName().c_str()));
-  }
-  team_logo->SetSurface(_team.GetFlag());
-
-  if (read_team_values) {
-    player_name->SetText(_team.GetPlayerName());
-    nb_characters->SetValue(_team.GetNbCharacters());
-  }
-
-  NeedRedrawing();
+  AddWidget(tmp_box);
 }
 
 void TeamBox::ClearTeam()
@@ -100,6 +108,19 @@ Team* TeamBox::GetTeam() const
   return associated_team;
 }
 
+CustomTeam* TeamBox::GetCustomTeam()
+{
+  std::cout<<"TeamBox::GetCustomTeam"<<std::endl;
+  if( custom_team_list.size() == 0)
+  {
+    return NULL;
+  }
+  else
+  {
+    return GetCustomTeamsList().GetByName(player_name->GetText());
+  }
+}
+
 void TeamBox::Update(const Point2i &mousePosition,
                      const Point2i &lastMousePosition)
 {
@@ -114,8 +135,8 @@ void TeamBox::Update(const Point2i &mousePosition,
     RedrawBackground(*this);
   }
 
-  if (associated_team != NULL && previous_name != player_name->GetText()) {
-    previous_name = player_name->GetText();
+  if (associated_team != NULL && previous_player_name != player_name->GetText()) {
+    previous_player_name = player_name->GetText();
     if (Network::GetInstance()->IsConnected()) {
       ValidOptions();
     }
@@ -142,6 +163,35 @@ Widget* TeamBox::ClickUp(const Point2i &mousePosition, uint button)
     if (w == player_name) {
       return w;
     }
+    if(custom_team_list.size()>0)
+    {
+      if (w == next_custom_team)
+      {
+        player_name->SetText(custom_team_list[custom_team_current_id]->GetName());
+
+        if(custom_team_current_id == custom_team_list.size()-1)
+        {
+          custom_team_current_id = 0;
+        }
+        else
+        {
+          custom_team_current_id++;
+        }
+      }
+      if (w == previous_custom_team)
+      {
+        player_name->SetText(custom_team_list[custom_team_current_id]->GetName());
+
+        if(custom_team_current_id == 0)
+        {
+          custom_team_current_id = custom_team_list.size()-1;
+        }
+        else
+        {
+          custom_team_current_id--;
+        }
+      }
+    }
   }
   return NULL;
 }
@@ -151,7 +201,35 @@ Widget* TeamBox::Click(const Point2i &/*mousePosition*/, uint /*button*/)
   return NULL;
 }
 
-void TeamBox::ValidOptions() const
+void TeamBox::SetTeam(Team& _team, bool read_team_values)
+{
+  Team* old_team = associated_team;
+
+  associated_team = &_team;
+
+  if (_team.IsRemote()) {
+    team_name->SetFont(dark_gray_color, Font::FONT_MEDIUM, Font::FONT_BOLD, false, false);
+
+    // translators: this is the team listing and will expand in a context like "OOo team - Remote"
+    team_name->SetText(Format(_("%s Team - Remote"), _team.GetName().c_str()));
+  } else {
+    team_name->SetFont(primary_red_color, Font::FONT_MEDIUM, Font::FONT_BOLD, true, false);
+    team_name->SetText(Format(_("%s Team"), _team.GetName().c_str()));
+  }
+  team_logo->SetSurface(_team.GetFlag());
+
+  if (read_team_values) {
+    player_name->SetText(_team.GetPlayerName());
+    nb_characters->SetValue(_team.GetNbCharacters());
+  } else if (old_team) {
+    UpdateTeam(old_team->GetId());
+  }
+  previous_player_name = player_name->GetText();
+
+  NeedRedrawing();
+}
+
+void TeamBox::UpdateTeam(const std::string& old_team_id) const
 {
   // set the number of characters
   associated_team->SetNbCharacters(uint(nb_characters->GetValue()));
@@ -162,15 +240,10 @@ void TeamBox::ValidOptions() const
   // change only for local teams...
   if (associated_team->IsLocal() || associated_team->IsLocalAI()) {
 
-    // player or AI ?
-    if (player_name->GetText() == "AI-stupid")
-      associated_team->SetLocalAI();
-    else
-      associated_team->SetLocal();
-
     // send team configuration to the remote clients
     if (Network::GetInstance()->IsConnected()) {
-      Action* a = new Action(Action::ACTION_MENU_UPDATE_TEAM, associated_team->GetId());
+      Action* a = new Action(Action::ACTION_MENU_UPDATE_TEAM, old_team_id);
+      a->Push(associated_team->GetId());
       a->Push(associated_team->GetPlayerName());
       a->Push(int(associated_team->GetNbCharacters()));
       ActionHandler::GetInstance()->NewAction (a);
@@ -178,6 +251,11 @@ void TeamBox::ValidOptions() const
   }
 }
 
+void TeamBox::ValidOptions() const
+{
+  UpdateTeam(associated_team->GetId());
+}
+
 bool TeamBox::IsLocal() const
 {
   if (associated_team != NULL && associated_team->IsLocal()) {
diff --git a/src/menu/team_box.h b/src/menu/team_box.h
index 95408fd..a01484f 100644
--- a/src/menu/team_box.h
+++ b/src/menu/team_box.h
@@ -23,14 +23,18 @@
 #define TEAM_BOX_H
 
 #include <string>
+#include <vector>
 #include "gui/box.h"
 
+class Button;
+class CustomTeam;
 class Team;
 class SpinButton;
 class Label;
 class PictureWidget;
 class TextBox;
 
+
 class TeamBox : public HBox
 {
  private:
@@ -40,20 +44,30 @@ class TeamBox : public HBox
   /**********************************************/
 
   bool is_local; // local/remote team
-  std::string previous_name; // only for network
+  std::string previous_player_name; // only for network
 
   Team * associated_team;
   PictureWidget *team_logo;
   Label * team_name;
   TextBox * player_name;
+  Button * next_custom_team;
+  Button * previous_custom_team;
   SpinButton * nb_characters;
 
+  std::vector<CustomTeam *> custom_team_list;
+  unsigned custom_team_current_id;
+
+
+  void UpdateTeam(const std::string& old_team_id) const;
+
  public:
   TeamBox(const std::string& player_name, const Point2i &size);
 
   void SetTeam(Team& _team, bool read_team_values=false);
   void ClearTeam();
   Team* GetTeam() const;
+  CustomTeam *GetCustomTeam();
+
   void ValidOptions() const;
 
   bool IsLocal() const;
diff --git a/src/menu/teams_selection_box.cpp b/src/menu/teams_selection_box.cpp
index d1563ed..6cb4b28 100644
--- a/src/menu/teams_selection_box.cpp
+++ b/src/menu/teams_selection_box.cpp
@@ -31,6 +31,8 @@
 #include "team/team.h"
 #include "tool/i18n.h"
 
+#include <iostream>
+
 TeamsSelectionBox::TeamsSelectionBox(const Point2i &_size, bool network) :
   HBox(_size.y, network)
 {
@@ -245,24 +247,34 @@ void TeamsSelectionBox::SetNbTeams(uint nb_teams)
 
 void TeamsSelectionBox::ValidTeamsSelection()
 {
+  std::cout<<"TeamsSelectionBox::ValidTeamsSelection"<<std::endl;
   uint nb_teams=0;
   for (uint i=0; i < teams_selections.size(); i++) {
     if (teams_selections.at(i)->GetTeam() != NULL)
+    {
       nb_teams++;
+      teams_selections.at(i)->GetTeam()->AttachCustomTeam(teams_selections.at(i)->GetCustomTeam());
+    }
   }
 
   if (nb_teams >= 2) {
     std::list<uint> selection;
 
     for (uint i=0; i < teams_selections.size(); i++) {
+
       if (teams_selections.at(i)->GetTeam() != NULL) {
+
         int index = -1;
         teams_selections.at(i)->ValidOptions();
         GetTeamsList().FindById(teams_selections.at(i)->GetTeam()->GetId(), index);
         if (index > -1)
+        {
           selection.push_back(uint(index));
+
+        }
       }
     }
     GetTeamsList().ChangeSelection (selection);
+
   }
 }
diff --git a/src/msvc/getopt.c b/src/msvc/getopt.c
index 77cadb3..2598228 100644
--- a/src/msvc/getopt.c
+++ b/src/msvc/getopt.c
@@ -1,3 +1,5 @@
+#ifndef __APPLE__
+
 /* Getopt for GNU.
    NOTE: getopt is now part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to drepper at gnu.org
@@ -1067,3 +1069,4 @@ main (argc, argv)
 }
 
 #endif /* TEST */
+#endif
\ No newline at end of file
diff --git a/src/network/admin_commands.cpp b/src/network/admin_commands.cpp
index 832e329..b874392 100644
--- a/src/network/admin_commands.cpp
+++ b/src/network/admin_commands.cpp
@@ -20,40 +20,53 @@
  *****************************************************************************/
 
 #include <string>
+#include "include/app.h"
 #include "network/admin_commands.h"
 #include "network/distant_cpu.h"
 #include "network/network.h"
 #include "tool/i18n.h"
-#include "game/game.h"
+
+static void PrintHelp()
+{
+  std::string msg = "help: " + std::string(_("Displays this message"));
+  AppWormux::GetInstance()->ReceiveMsgCallback(msg);
+  msg = "kick <nickname>: " + std::string(_("Kicks the players designated by <nickname> out of the game"));
+  AppWormux::GetInstance()->ReceiveMsgCallback(msg);
+}
 
 void ProcessCommand(const std::string & cmd)
 {
-  std::string msg;
   if(cmd == "/help")
   {
-    msg = "help: " + std::string(_("Displays this message"));
-    Game::GetInstance()->chatsession.NewMessage(msg);
-    msg = "kick <nickname>: " + std::string(_("Kicks the players designated by <nickname> out of the game"));
-    Game::GetInstance()->chatsession.NewMessage(msg);
+    PrintHelp();
   }
   else
-  if(cmd.substr(0, 6) == "/kick ")
   {
-    std::string nick = cmd.substr(6, cmd.size() - 6);
-    for(std::list<DistantComputer*>::iterator cpu = Network::GetInstance()->cpu.begin();
-        cpu != Network::GetInstance()->cpu.end();
-	++cpu)
+    std::string msg;
+    if(cmd.substr(0, 6) == "/kick ")
     {
-      if((*cpu)->nickname == nick)
+      std::string nick = cmd.substr(6, cmd.size() - 6);
+      for(std::list<DistantComputer*>::iterator cpu = Network::GetInstance()->cpu.begin();
+          cpu != Network::GetInstance()->cpu.end();
+	  ++cpu)
       {
-        (*cpu)->force_disconnect = true;
-        msg = std::string(Format("%s kicked", nick.c_str()));
-        Game::GetInstance()->chatsession.NewMessage(msg);
-	break;
+        if((*cpu)->GetNickname() == nick)
+        {
+          (*cpu)->force_disconnect = true;
+          msg = std::string(Format("%s kicked", nick.c_str()));
+          AppWormux::GetInstance()->ReceiveMsgCallback(msg);
+	  return;
+        }
+        printf("Nick: %s\n", (*cpu)->GetNickname().c_str());
       }
+      msg = std::string(Format("%s: no such nickame", nick.c_str()));
+      AppWormux::GetInstance()->ReceiveMsgCallback(msg);
+    }
+    else
+    {
+      AppWormux::GetInstance()->ReceiveMsgCallback(_("Unknown command"));
+      PrintHelp();
     }
   }
-  else
-    Game::GetInstance()->chatsession.NewMessage(_("Unknown command"));
 }
 
diff --git a/src/network/chat.cpp b/src/network/chat.cpp
index 1edee07..7f5cb48 100644
--- a/src/network/chat.cpp
+++ b/src/network/chat.cpp
@@ -21,13 +21,15 @@
  *****************************************************************************/
 
 #include <SDL_events.h>
+#include "game/time.h"
+#include "graphic/text.h"
+#include "graphic/text_list.h"
+#include "include/action.h"
+#include "include/action_handler.h"
 #include "include/app.h"
-#include "network/admin_commands.h"
 #include "network/chat.h"
-#include "graphic/text_list.h"
+#include "network/admin_commands.h"
 #include "network/network.h"
-#include "graphic/text.h"
-#include "game/time.h"
 #include "tool/i18n.h"
 #include "tool/text_handling.h"
 
@@ -88,7 +90,8 @@ void Chat::ShowInput()
   }
 }
 
-bool Chat::CheckInput() const {
+bool Chat::CheckInput() const
+{
   return check_input;
 }
 
@@ -102,6 +105,17 @@ void Chat::NewMessage(const std::string &msg)
   chat.AddText(msg, MAXLINES);
 }
 
+void Chat::SendMessage(const std::string &msg)
+{
+  if (msg.size() == 0)
+    return;
+
+  Action* a = new Action(Action::ACTION_CHAT_MESSAGE);
+  a->Push(Network::GetInstance()->GetNickname());
+  a->Push(msg);
+  ActionHandler::GetInstance()->NewAction(a);
+}
+
 void Chat::HandleKey(const SDL_Event& event)
 {
   SDL_KeyboardEvent kbd_event = event.key;
@@ -113,16 +127,17 @@ void Chat::HandleKey(const SDL_Event& event)
   } else {
 
     switch (key.sym){
-      
+
     case SDLK_RETURN:
     case SDLK_KP_ENTER:
       check_input = false; //Hide input widget
       if ( txt[0] == '/' )
 	ProcessCommand(txt);
-      else
-	if (txt != "" )
-	  Network::GetInstance()->SendChatMessage(txt); //Send 'txt' to other players
+      else if (txt != "" )
+	SendMessage(txt);
+
       input->Set("");
+      cursor_pos = 0;
       break;
 
     default:
diff --git a/src/network/chat.h b/src/network/chat.h
index a374387..0739e56 100644
--- a/src/network/chat.h
+++ b/src/network/chat.h
@@ -58,6 +58,8 @@ class Chat
   void Clear();
   void NewMessage(const std::string& msg);
   void HandleKey(const SDL_Event& event);
+
+  static void SendMessage(const std::string& msg);
 };
 
 #endif
diff --git a/src/network/chatlogger.cpp b/src/network/chatlogger.cpp
index c70bf1c..ee02108 100644
--- a/src/network/chatlogger.cpp
+++ b/src/network/chatlogger.cpp
@@ -4,20 +4,14 @@
 #include "include/base.h"
 #include "tool/error.h"
 #include "tool/i18n.h"
+#ifdef DEBUG
+#include "tool/random.h"
+#endif
 #include "network/chatlogger.h"
 #include "game/config.h"
 #include <time.h>
-#ifdef DEBUG
-#  include <stdlib.h>
-#endif
-#ifdef _WIN32
-#  define random rand  // random more secure but unavailable under Windows
-#endif
-
-// the year that time has as base; although time(2)
-// says the reference is 1970, tests show is 1900. WHY?
-#define TIME_BASE_YEAR 1900 //FIXME: find out why this is not 1970
 
+#define TIME_BASE_YEAR 1900
 
 ChatLogger::ChatLogger() :
         logdir(Config::GetInstance()->GetChatLogDir()),
@@ -49,7 +43,7 @@ ChatLogger::ChatLogger() :
 #ifndef DEBUG
     logfile = Format ( "%s.log" , timestamp.c_str() );
 #else // DEBUG
-    logfile = Format ( "%s-%c.log" , timestamp.c_str(), (char)((random() % 10)+'a') );
+    logfile = Format ( "%s-%c.log" , timestamp.c_str(), (char)(RandomLocal().GetInt(0,10)+'a') );
 #endif // DEBUG
   }
 
@@ -58,15 +52,11 @@ ChatLogger::ChatLogger() :
 
   std::string fn = logdir + logfile ;
 
-
   m_logfilename.open(fn.c_str(), std::ios::out | std::ios::app);
-  if(!m_logfilename)
-  {
-    std::string err = Format(_("Couldn't open file %s"), fn.c_str());
-    throw err;
-  }
-
-  this->LogMessage(timestamp);
+  if(m_logfilename.fail())
+    Error(Format(_("Couldn't open file %s"), fn.c_str()));
+  else
+    this->LogMessage(timestamp);
 }
 
 ChatLogger::~ChatLogger()
@@ -80,6 +70,9 @@ void ChatLogger::LogMessage(const std::string &msg)
   struct tm lt, *plt;
   std::string timestamp;
 
+  if (m_logfilename.fail())
+    return;
+
   if ( ((time_t) -1) == time(&t) )
   {
     timestamp = std::string (_("(unknown time)")) ;
diff --git a/src/network/chatlogger.h b/src/network/chatlogger.h
index 9b70d03..ce948b2 100644
--- a/src/network/chatlogger.h
+++ b/src/network/chatlogger.h
@@ -7,18 +7,18 @@
 
 class ChatLogger: public Singleton<ChatLogger>
 {
+  std::string logdir;
+  std::string logfile;
+  std::ofstream m_logfilename;
+ protected:
+  friend class Singleton<ChatLogger>;
  public:
   ChatLogger();
   ~ChatLogger();
+
   void LogMessage(const std::string& msg);
   static void LogMessageIfOpen(const std::string& msg);
   static void CloseIfOpen(void);
- protected:
-  friend class Singleton<ChatLogger>;
-
-  std::string logdir;
-  std::string logfile;
-  std::ofstream m_logfilename;
 };
 
 #endif //CHATLOGGER_H
diff --git a/src/network/distant_cpu.cpp b/src/network/distant_cpu.cpp
index 2a4a670..5e07fb6 100644
--- a/src/network/distant_cpu.cpp
+++ b/src/network/distant_cpu.cpp
@@ -35,13 +35,15 @@
 #include "tool/debug.h"
 //-----------------------------------------------------------------------------
 
+static const int MAX_PACKET_SIZE = 250*1024;
+
 DistantComputer::DistantComputer(TCPsocket new_sock) :
   sock_lock(SDL_CreateMutex()),
   sock(new_sock),
   owned_teams(),
   state(DistantComputer::STATE_ERROR),
-  force_disconnect(false),
-  nickname("this is not initialized")
+  nickname("this is not initialized"),
+  force_disconnect(false)
 {
   packet_size = 0;
   packet_received = 0;
@@ -59,7 +61,7 @@ DistantComputer::DistantComputer(TCPsocket new_sock) :
 
     Action a(Action::ACTION_MENU_SET_MAP);
     MapsList::GetInstance()->FillActionMenuSetMap(a);
-    a.WritePacket(pack, size);
+    a.WriteToPacket(pack, size);
     SendDatas(pack, size);
     free(pack);
 
@@ -73,7 +75,7 @@ DistantComputer::DistantComputer(TCPsocket new_sock) :
       Action b(Action::ACTION_MENU_ADD_TEAM, (*team)->GetId());
       b.Push((*team)->GetPlayerName());
       b.Push((int)(*team)->GetNbCharacters());
-      b.WritePacket(pack, size);
+      b.WriteToPacket(pack, size);
       SendDatas(pack, size);
       free(pack);
     }
@@ -130,7 +132,18 @@ int DistantComputer::ReceiveDatas(char* & buf)
       return -1;
     }
 
+    if (packet_size > MAX_PACKET_SIZE)
+    {
+        MSG_DEBUG("network", "packet is too big");
+        return -1;
+    }
+
     packet = (char*)malloc(packet_size);
+    if (!packet)
+    {
+        MSG_DEBUG("network", "memory allocated failed");
+        return -1;
+    }
   }
 
 
@@ -202,61 +215,62 @@ std::string DistantComputer::GetAddress()
   return address;
 }
 
-void DistantComputer::ManageTeam(Action* team)
+void DistantComputer::SetNickname(const std::string& _nickname)
 {
-  std::string name = team->PopString();
-  if(team->GetType() == Action::ACTION_MENU_ADD_TEAM)
-  {
-    owned_teams.push_back(name);
+  nickname = _nickname;
+}
 
-    int index = 0;
-    Team * tmp = GetTeamsList().FindById(name, index);
-    if (tmp != NULL)
-    {
-      tmp->SetRemote();
+const std::string& DistantComputer::GetNickname() const
+{
+  return nickname;
+}
 
-      Action* copy = new Action(Action::ACTION_MENU_ADD_TEAM, name);
-      copy->Push( team->PopString() );
-      copy->Push( team->PopInt() );
-      ActionHandler::GetInstance()->NewAction(copy, false);
-    }
-    else
-    {
-      std::cerr << "Team "<< name << "does not exist!" << std::endl;
-      ASSERT(false);
-    }
-  }
-  else if(team->GetType() == Action::ACTION_MENU_DEL_TEAM)
-  {
-    std::list<std::string>::iterator it;
-    it = find(owned_teams.begin(), owned_teams.end(), name);
-    NET_ASSERT(it != owned_teams.end())
-    {
-      force_disconnect = true;
-      return;
-    }
-    if (it != owned_teams.end())
-    {
-      owned_teams.erase(it);
-      ActionHandler::GetInstance()->NewAction(new Action(Action::ACTION_MENU_DEL_TEAM, name), false);
-    }
+bool DistantComputer::AddTeam(const std::string& team_id)
+{
+  int index = 0;
+  Team * the_team = GetTeamsList().FindById(team_id, index);
+
+  if (the_team) {
+    owned_teams.push_back(team_id);
+    return true;
   }
-  else
-    ASSERT(false);
+
+  force_disconnect = true;
+
+  std::cerr << "Team "<< team_id << "does not exist!" << std::endl;
+  ASSERT(false);
+  return false;
 }
 
-void DistantComputer::SendChatMessage(Action* a) const
+bool DistantComputer::RemoveTeam(const std::string& team_id)
 {
-  std::string txt = a->PopString();
-  if (txt == "") return;
-  if(Network::GetInstance()->IsServer())
-  {
-    ActionHandler::GetInstance()->NewAction(new Action(Action::ACTION_CHAT_MESSAGE, nickname + "> "+txt));
-  }
-  else
-  {
-    ActionHandler::GetInstance()->NewAction(new Action(Action::ACTION_CHAT_MESSAGE, txt), false);
+  std::list<std::string>::iterator it;
+  it = find(owned_teams.begin(), owned_teams.end(), team_id);
+  printf("size of owned teams: %d\n", (int)owned_teams.size());
+
+  if (it != owned_teams.end()) {
+    owned_teams.erase(it);
+    return true;
   }
+
+  force_disconnect = true;
+
+  ASSERT(false);
+  return false;
+}
+
+bool DistantComputer::UpdateTeam(const std::string& old_team_id, const std::string& team_id)
+{
+  if (old_team_id == team_id) // nothing to do !
+    return true;
+
+  if (!RemoveTeam(old_team_id))
+    return false;
+
+  if (!AddTeam(team_id))
+    return false;
+
+  return true;
 }
 
 void DistantComputer::SetState(DistantComputer::state_t _state)
diff --git a/src/network/distant_cpu.h b/src/network/distant_cpu.h
index acde61f..6879e60 100644
--- a/src/network/distant_cpu.h
+++ b/src/network/distant_cpu.h
@@ -38,7 +38,8 @@ class DistantComputer
     STATE_ERROR,
     STATE_INITIALIZED,
     STATE_READY,
-    STATE_CHECKED
+    STATE_CHECKED,
+    STATE_NEXT_GAME
   } state_t;
 
  private:
@@ -56,6 +57,8 @@ class DistantComputer
   int packet_size;
   int packet_received;
   char* packet;
+  std::string nickname;
+
 public:
   bool force_disconnect;
 
@@ -67,10 +70,13 @@ public:
   void SendDatas(char* paket, int size);
 
   std::string GetAddress();
-  std::string nickname;
 
-  void ManageTeam(Action* team);
-  void SendChatMessage(Action* a) const;
+  void SetNickname(const std::string& nickname);
+  const std::string& GetNickname() const;
+
+  bool AddTeam(const std::string& team_id);
+  bool RemoveTeam(const std::string& team_id);
+  bool UpdateTeam(const std::string& old_team_id, const std::string& team_id);
 
   void SetState(DistantComputer::state_t _state);
   DistantComputer::state_t GetState() const;
diff --git a/src/network/download.cpp b/src/network/download.cpp
index d1f37ca..3cffe1f 100644
--- a/src/network/download.cpp
+++ b/src/network/download.cpp
@@ -74,7 +74,7 @@ static ssize_t getline(std::string& line, std::ifstream& file)
 
 std::string Downloader::GetLatestVersion()
 {
-  static const char url[] = "http://kurosu.free.fr/last";
+  static const char url[] = "http://www.wormux.org/last";
   const std::string last_file = Config::GetInstance()->GetPersonalDataDir() + "last";
   if( !Get(url, last_file.c_str()) )
   {
diff --git a/src/network/index_server.cpp b/src/network/index_server.cpp
index 20db883..4f9a5c3 100644
--- a/src/network/index_server.cpp
+++ b/src/network/index_server.cpp
@@ -25,12 +25,13 @@
 #include "network/download.h"
 #include "game/config.h"
 #include "graphic/video.h"
+#include "include/app.h"
+#include "include/constant.h"
 #include "network/index_server.h"
 #include "network/index_svr_msg.h"
 #include "network/network.h"
-#include "include/app.h"
-#include "include/constant.h"
 #include "tool/debug.h"
+#include "tool/i18n.h"
 #include "tool/random.h"
 
 IndexServer::IndexServer():
@@ -56,6 +57,8 @@ IndexServer::~IndexServer()
 /*************  Connection  /  Disconnection  ******************/
 connection_state_t IndexServer::Connect()
 {
+  connection_state_t r = CONN_REJECTED;
+
   MSG_DEBUG("index_server", "Connecting..");
   ASSERT(!connected);
 
@@ -72,7 +75,7 @@ connection_state_t IndexServer::Connect()
 
   // If it's still empty, then something went wrong when downloading it
   if( server_lst.size() == 0 )
-    return CONN_REJECTED;
+    return CONN_BAD_HOST;
 
   std::string addr;
   int port;
@@ -82,54 +85,84 @@ connection_state_t IndexServer::Connect()
   // Until we find one running
   while (GetServerAddress(addr, port, nb_servers_tried))
   {
-    if( ConnectTo( addr, port) )
-      return CONNECTED;
+    r = Network::CheckHost(addr, port);
+    if (r != CONNECTED)
+      continue;
+
+    // CheckHost opens and closes a connection to the server, so before reconnecting
+    // wait a bit, so the connection really gets closed ..
+    SDL_Delay(500);
+
+    r = ConnectTo(addr, port);
+    if (r == CONNECTED)
+      return r;
   }
 
   // Undo what was done
   Disconnect();
 
-  return CONN_REJECTED;
+  return r;
 }
 
-bool IndexServer::ConnectTo(const std::string & address, const int & port)
+connection_state_t IndexServer::ConnectTo(const std::string & address, const int & port)
 {
+  connection_state_t status = CONN_REJECTED;
+  int r;
+
   MSG_DEBUG("index_server", "Connecting to %s %i", address.c_str(), port);
-  AppWormux::GetInstance()->video->Flip();
 
   Network::Init(); // To get SDL_net initialized
 
   MSG_DEBUG("index_server", "Opening connection");
 
-  if( SDLNet_ResolveHost(&ip, address.c_str() , port) == -1 )
-  {
+  if (SDLNet_ResolveHost(&ip, address.c_str() , port) == -1 ) {
     printf("SDLNet_ResolveHost: %s\n", SDLNet_GetError());
-    return false;
+    status = CONN_BAD_HOST;
+    goto err;
   }
 
   socket = SDLNet_TCP_Open(&ip);
-  if(!socket)
-  {
+  if (!socket) {
     printf("SDLNet_TCP_Open: %s\n", SDLNet_GetError());
-    return false;
+    status = CONN_REJECTED;
+    goto err;
   }
 
   sock_set = SDLNet_AllocSocketSet(1);
-  if(!sock_set)
-  {
+  if (!sock_set) {
     printf("SDLNet_AllocSocketSet: %s\n", SDLNet_GetError());
-    return false;
+    status = CONN_REJECTED;
+    goto err_alloc_socket_set;
+  }
+
+  r = SDLNet_TCP_AddSocket(sock_set, socket);
+  if (r != 1) {
+    printf("SDLNet_TCP_AddSocket: %s\n", SDLNet_GetError());
+    status = CONN_REJECTED;
+    goto err_add_socket;
   }
-  SDLNet_TCP_AddSocket(sock_set, socket);
 
-  connected = true;
+  connected = true; // we need it before HandShake
+  status = HandShake();
+  if (status != CONNECTED)
+    goto err_handshake;
 
-  return HandShake();
+  return status;
+
+ err_handshake:
+  connected = false;
+  SDLNet_TCP_DelSocket(sock_set, socket);
+ err_add_socket:
+  SDLNet_FreeSocketSet(sock_set);
+ err_alloc_socket_set:
+  SDLNet_TCP_Close(socket);
+ err:
+  return status;
 }
 
 void IndexServer::Disconnect()
 {
-  if( hidden_server )
+  if (hidden_server)
   {
     hidden_server = false;
     return;
@@ -164,7 +197,7 @@ bool IndexServer::GetServerAddress( std::string & address, int & port, uint & nb
     {
       // First try :
       // Randomly select a server in the list
-      int nbr = randomObj.GetLong( 0, server_lst.size()-1 );
+      int nbr = RandomLocal().GetLong( 0, server_lst.size()-1 );
       first_server = server_lst.begin();
       while(nbr--)
 	++first_server;
@@ -209,17 +242,20 @@ void IndexServer::Batch(const std::string &str)
   used += Network::Batch(buffer+used, str);
 }
 
-void IndexServer::SendMsg()
+bool IndexServer::SendMsg()
 {
-  Network::SendBatch(socket, buffer, used);
+  bool r = Network::SendBatch(socket, buffer, used);
   used = 0;
+  return r;
 }
 
 int IndexServer::ReceiveInt()
 {
   //somehow we can get here while being disconnected... this should not be
-  if (!connected)
+  if (!connected) {
+    MSG_DEBUG("index_server", "Not connected!!\n");
     return -1;
+  }
 
   int r, nbr;
   r = Network::ReceiveInt(sock_set, socket, nbr);
@@ -233,7 +269,7 @@ int IndexServer::ReceiveInt()
   return nbr;
 }
 
-std::string IndexServer::ReceiveStr()
+std::string IndexServer::ReceiveStr(size_t maxlen)
 {
   if (!connected)
     return "";
@@ -241,7 +277,7 @@ std::string IndexServer::ReceiveStr()
   int r;
   std::string str("");
 
-  r = Network::ReceiveStr(sock_set, socket, str);
+  r = Network::ReceiveStr(sock_set, socket, str, maxlen);
   if (r == -2) {
     Disconnect();
   }
@@ -249,26 +285,59 @@ std::string IndexServer::ReceiveStr()
   return str;
 }
 
-bool IndexServer::HandShake()
+connection_state_t IndexServer::HandShake()
 {
+  connection_state_t status = CONN_REJECTED;
+  bool r;
+  int msg;
+  std::string sign;
+
+  MSG_DEBUG("index_server", "Beginning handshake...");
+
   NewMsg(TS_MSG_VERSION);
   Batch(Constants::WORMUX_VERSION);
-  SendMsg();
 
-  int msg = ReceiveInt();
-  if(msg == -1)
-    return false;
-  std::string sign;
+  MSG_DEBUG("index_server", "Sending information...");
 
-  if(msg == TS_MSG_VERSION)
-    sign = ReceiveStr();
+  r = SendMsg();
+  if (!r)
+    goto error;
 
-  if(msg != TS_MSG_VERSION || sign != "MassMurder!")
-  {
-    Disconnect();
-    return false;
+  MSG_DEBUG("index_server", "Receiving...");
+
+  msg = ReceiveInt();
+  MSG_DEBUG("index_server", "Received: %d", msg);
+
+  if (msg == -1 || msg != TS_MSG_VERSION)
+    goto error;
+
+  MSG_DEBUG("index_server", "Receiving...");
+  sign = ReceiveStr(20);
+
+  MSG_DEBUG("index_server", "Received: %s", sign.c_str());
+
+  if (sign == "Bad version") {
+    status = CONN_WRONG_VERSION;
+    sign = ReceiveStr(20);
+    AppWormux::DisplayError(Format(_("Sorry, your version is not supported anymore. "
+				     "Supported version are %s. "
+				     "You can download a updated version "
+				     "on http://www.wormux.org/wiki/download.php"),
+				   sign.c_str()));
+    goto error;
   }
-  return true;
+
+  if (sign != "MassMurder!")
+    goto error;
+
+  MSG_DEBUG("index_server", "Handshake : OK");
+
+  status = CONNECTED;
+  return status;
+
+ error:
+  MSG_DEBUG("index_server", "Handshake : ERROR!");
+  return status;
 }
 
 bool IndexServer::SendServerStatus(const std::string& game_name, bool pwd)
@@ -287,7 +356,7 @@ bool IndexServer::SendServerStatus(const std::string& game_name, bool pwd)
   Batch(Network::GetInstance()->GetPort());
   SendMsg();
 
-  ack = ReceiveStr();
+  ack = ReceiveStr(5);
   if (ack == "OK")
     return true;
 
@@ -310,7 +379,7 @@ std::list<GameServerInfo> IndexServer::GetHostList()
     ip.host = ReceiveInt();
     ip.port = ReceiveInt();
     game_server_info.passworded = !!ReceiveInt();
-    game_server_info.game_name = ReceiveStr();
+    game_server_info.game_name = ReceiveStr(40);
 
     const char* dns_addr = SDLNet_ResolveIP(&ip);
     char port[10];
diff --git a/src/network/index_server.h b/src/network/index_server.h
index 4648d00..ad5987c 100644
--- a/src/network/index_server.h
+++ b/src/network/index_server.h
@@ -74,17 +74,17 @@ class IndexServer : public Singleton<IndexServer>
   void NewMsg(IndexServerMsg msg_id);
   void Batch(const int &nbr);
   void Batch(const std::string &str);
-  void SendMsg();
+  bool SendMsg();
   int ReceiveInt();
-  std::string ReceiveStr();
+  std::string ReceiveStr(size_t maxlen);
 
   // Gives the address of a server in the list
   bool GetServerAddress(std::string & address, int & port, uint& nb_tries);
   // Connect to a server
-  bool ConnectTo(const std::string & address, const int & port);
+  connection_state_t ConnectTo(const std::string & address, const int & port);
 
   // Perform a handshake with the server
-  bool HandShake();
+  connection_state_t HandShake();
 public:
   IndexServer();
   ~IndexServer();
diff --git a/src/network/network.cpp b/src/network/network.cpp
index b7e27d4..18c93e7 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -58,8 +58,12 @@
 #  include <arpa/nameser.h>
 #  include <resolv.h>
 #  include <errno.h>
+#  include <unistd.h>
 #endif
 
+#include "team/team.h"
+#include "team/teams_list.h"
+
 //-----------------------------------------------------------------------------
 
 int  Network::num_objects = 0;
@@ -98,16 +102,7 @@ Network::Network(const std::string& passwd):
   cpu(),
   sync_lock(false)
 {
-  const char *nick = NULL;
-#ifdef WIN32
-  char  buffer[32];
-  DWORD size = 32;
-  if (GetUserName(buffer, &size))
-    nick = buffer;
-#else
-  nick = getenv("USER");
-#endif
-  nickname = (nick) ? nick : _("Unnamed");
+  nickname = GetDefaultNickname();
   sdlnet_initialized = false;
   num_objects++;
 }
@@ -135,6 +130,34 @@ Network::~Network()
 
 //-----------------------------------------------------------------------------
 
+std::string Network::GetDefaultNickname() const
+{
+  std::string s_nick;
+  const char *nick = NULL;
+#ifdef WIN32
+  char  buffer[32];
+  DWORD size = 32;
+  if (GetUserName(buffer, &size))
+    nick = buffer;
+#else
+  nick = getenv("USER");
+#endif
+  s_nick = (nick) ? nick : _("Unnamed");
+  return s_nick;
+}
+
+void Network::SetNickname(const std::string& _nickname)
+{
+  nickname = _nickname;
+}
+
+const std::string& Network::GetNickname() const
+{
+  return nickname;
+}
+
+//-----------------------------------------------------------------------------
+
 bool Network::ThreadToContinue() const
 {
   return !stop_thread;
@@ -154,7 +177,7 @@ void Network::ReceiveActions()
 
   while (ThreadToContinue()) // While the connection is up
   {
-    if (state == NETWORK_PLAYING && cpu.size() == 0)
+    if (state == NETWORK_PLAYING && cpu.empty())
     {
       // If while playing everybody disconnected, just quit
       break;
@@ -165,15 +188,6 @@ void Network::ReceiveActions()
     {
       WaitActionSleep();
 
-      if (cpu.empty()) {
-        if (IsClient()) {
-          fprintf(stderr, "you are alone!\n");
-	  stop_thread = true;
-        }
-        // Even for server, as Visual Studio in debug mode has trouble with that loop
-	continue;
-      }
-
       // Check forced disconnections
       for (dst_cpu = cpu.begin();
            ThreadToContinue() && dst_cpu != cpu.end();
@@ -182,10 +196,21 @@ void Network::ReceiveActions()
         if((*dst_cpu)->force_disconnect)
         {
           dst_cpu = CloseConnection(dst_cpu);
-          continue;
+          if (cpu.empty())
+            break; // Let it be handled afterwards
         }
       }
 
+      // List is now maybe empty
+      if (cpu.empty()) {
+        if (IsClient()) {
+          fprintf(stderr, "you are alone!\n");
+	  stop_thread = true;
+          return; // We really don't need to go through the loops
+        }
+        // Even for server, as Visual Studio in debug mode has trouble with that loop
+	continue;
+      }
       int num_ready = SDLNet_CheckSockets(socket_set, 100);
       // Means something is available
       if (num_ready>0)
@@ -209,8 +234,14 @@ void Network::ReceiveActions()
         if( packet_size == -1) { // An error occured during the reception
           dst_cpu = CloseConnection(dst_cpu);
           // Please Visual Studio that in debug mode has trouble with continuing
-          if (cpu.empty())
+          if (cpu.empty()) {
+            if (IsClient()) {
+              fprintf(stderr, "you are alone!\n");
+	      stop_thread = true;
+              return; // We really don't need to go through the loops
+            }
             break;
+          }
           continue;
         } else
         if (packet_size == 0) // We didn't receive the full packet yet
@@ -226,9 +257,6 @@ void Network::ReceiveActions()
 #endif
 
         Action* a = new Action(packet, (*dst_cpu));
-#ifdef DEBUG
-        MSG_DEBUG("network.crc", "CRC : received %d, computed %d", a->GetCRC(), a->ComputeCRC());
-#endif
         if(!a->CheckCRC()) {
           MSG_DEBUG("network.crc_bad","!!! Bad CRC for action received !!!");
           delete a;
@@ -238,6 +266,15 @@ void Network::ReceiveActions()
           HandleAction(a, *dst_cpu);
         }
         free(packet);
+
+        if (cpu.empty()) {
+          if (IsClient()) {
+            fprintf(stderr, "you are alone!\n");
+            stop_thread = true;
+            return; // We really don't need to go through the loops
+          }
+          break;
+        }
       }
     }
   }
@@ -312,7 +349,8 @@ typedef int SOCKET;
 # define closesocket(fd) close(fd)
 #endif
 
-connection_state_t Network::GetError() const
+// static method
+connection_state_t Network::GetError()
 {
 #ifdef WIN32
   int code = WSAGetLastError();
@@ -338,7 +376,8 @@ connection_state_t Network::GetError() const
 #endif
 }
 
-connection_state_t Network::CheckHost(const std::string &host, int prt) const
+// static method
+connection_state_t Network::CheckHost(const std::string &host, int prt)
 {
   MSG_DEBUG("network", "Checking connection to %s:%i", host.c_str(), prt);
 
@@ -394,14 +433,14 @@ connection_state_t Network::CheckHost(const std::string &host, int prt) const
 //-----------------------------------------------------------------------------
 
 // Send Messages
-void Network::SendAction(const Action* a) const
+void Network::SendAction(const Action& a) const
 {
   MSG_DEBUG("network.traffic","Send action %s",
-            ActionHandler::GetInstance()->GetActionName(a->GetType()).c_str());
+            ActionHandler::GetInstance()->GetActionName(a.GetType()).c_str());
 
   int size;
   char* packet;
-  a->WritePacket(packet, size);
+  a.WriteToPacket(packet, size);
 
   ASSERT(packet != NULL);
   SendPacket(packet, size);
@@ -519,7 +558,7 @@ void Network::SendNetworkState() const
 {
   Action a(Action::ACTION_NETWORK_CHANGE_STATE);
   a.Push(state);
-  SendAction(&a);
+  SendAction(a);
 }
 
 void Network::SetTurnMaster(bool master)
@@ -539,20 +578,31 @@ bool Network::IsTurnMaster() const
 // Static methods usefull to communicate without action
 // (index server, handshake, ...)
 
-void Network::Send(TCPsocket& socket, const int& nbr)
+bool Network::Send(TCPsocket& socket, const int& nbr)
 {
   char packet[4];
   // this is not cute, but we don't want an int -> uint conversion here
   Uint32 u_nbr = *((const Uint32*)&nbr);
 
   SDLNet_Write32(u_nbr, packet);
-  SDLNet_TCP_Send(socket, packet, sizeof(packet));
+  int len = SDLNet_TCP_Send(socket, packet, sizeof(packet));
+  if (len < int(sizeof(packet)))
+    return false;
+
+  return true;
 }
 
-void Network::Send(TCPsocket& socket, const std::string &str)
+bool Network::Send(TCPsocket& socket, const std::string &str)
 {
-  Send(socket, str.size());
-  SDLNet_TCP_Send(socket, (void*)str.c_str(), str.size());
+  bool r = Send(socket, str.size());
+  if (!r)
+    return false;
+
+  int len = SDLNet_TCP_Send(socket, (void*)str.c_str(), str.size());
+  if (len < int(str.size()))
+    return false;
+
+  return true;
 }
 
 uint Network::Batch(void* buffer, const int& nbr)
@@ -575,10 +625,16 @@ uint Network::Batch(void* buffer, const std::string &str)
 
 // A batch consists in a msg id, a size, and the batch itself.
 // Size wasn't known yet, so write it now.
-void Network::SendBatch(TCPsocket& socket, void* data, size_t len)
+bool Network::SendBatch(TCPsocket& socket, void* data, size_t len)
 {
   SDLNet_Write32(len, (void*)( ((char*)data)+4 ) );
-  SDLNet_TCP_Send(socket, data, len);
+
+  int size = SDLNet_TCP_Send(socket, data, len);
+  if (size < int(len)) {
+    MSG_DEBUG("network", "size = %d", size);
+    return false;
+  }
+  return true;
 }
 
 int Network::ReceiveInt(SDLNet_SocketSet& sock_set, TCPsocket& socket, int& nbr)
@@ -611,7 +667,7 @@ int Network::ReceiveInt(SDLNet_SocketSet& sock_set, TCPsocket& socket, int& nbr)
   return r;
 }
 
-int Network::ReceiveStr(SDLNet_SocketSet& sock_set, TCPsocket& socket, std::string &_str)
+int Network::ReceiveStr(SDLNet_SocketSet& sock_set, TCPsocket& socket, std::string &_str, size_t maxlen)
 {
   int r;
   uint size = 0;
@@ -627,6 +683,11 @@ int Network::ReceiveStr(SDLNet_SocketSet& sock_set, TCPsocket& socket, std::stri
     goto out;
   }
 
+  if (size > maxlen) {
+    r = -1;
+    goto out;
+  }
+
   if (SDLNet_CheckSockets(sock_set, 5000) == 0) {
     r = -1;
     goto out;
diff --git a/src/network/network.h b/src/network/network.h
index 671f231..9c65a0e 100644
--- a/src/network/network.h
+++ b/src/network/network.h
@@ -60,6 +60,7 @@ typedef enum
   CONN_REJECTED,
   CONN_TIMEOUT,
   CONN_WRONG_PASSWORD,
+  CONN_WRONG_VERSION
 } connection_state_t;
 
 class Network : public Singleton<Network>
@@ -71,7 +72,8 @@ public:
       NETWORK_MENU_OK,
       NETWORK_LOADING_DATA,
       NETWORK_READY_TO_PLAY,
-      NETWORK_PLAYING
+      NETWORK_PLAYING,
+      NETWORK_NEXT_GAME
     } network_state_t;
 
 private:
@@ -81,7 +83,7 @@ private:
   friend class DistantComputer;
 
   std::string password;
-  connection_state_t GetError() const;
+  static connection_state_t GetError();
 
   static bool sdlnet_initialized;
   static int  num_objects;
@@ -89,6 +91,9 @@ private:
   static bool stop_thread;
   bool turn_master_player;
 
+  std::string nickname; //Clients: Send to Server at connect
+                        //Server: Send in chat messages
+
   void ReceiveActions();
 
 protected:
@@ -119,8 +124,6 @@ public:
 
   std::list<DistantComputer*> cpu; // list of the connected computer
   bool sync_lock;
-  std::string nickname; //Clients: Send to Server at connect
-                        //Server: Send in chat messages
 
   virtual ~Network();
 
@@ -137,11 +140,14 @@ public:
   uint GetPort() const;
   const std::string& GetPassword() const { return password; }
 
+  void SetNickname(const std::string& nickname);
+  const std::string& GetNickname() const;
+  std::string GetDefaultNickname() const;
+
   // Action handling
   void SendPacket(char* packet, int size) const;
-  virtual void SendAction(const Action* action) const;
+  virtual void SendAction(const Action& action) const;
 
-  virtual void SendChatMessage(const std::string& txt) = 0;
   virtual std::list<DistantComputer*>::iterator CloseConnection(std::list<DistantComputer*>::iterator closed) = 0;
 
   // Start a client
@@ -153,7 +159,7 @@ public:
 					const std::string& password);
 
   // Manage network state
-  connection_state_t CheckHost(const std::string &host, int prt) const;
+  static connection_state_t CheckHost(const std::string &host, int prt);
   void SetState(Network::network_state_t state);
   Network::network_state_t GetState() const;
   void SendNetworkState() const;
@@ -161,15 +167,15 @@ public:
   void SetTurnMaster(bool master);
   bool IsTurnMaster() const;
 
-  static void Send(TCPsocket& socket, const int& nbr);
-  static void Send(TCPsocket& socket, const std::string &str);
+  static bool Send(TCPsocket& socket, const int& nbr);
+  static bool Send(TCPsocket& socket, const std::string &str);
 
   static uint Batch(void* buffer, const int& nbr);
   static uint Batch(void* buffer, const std::string &str);
-  static void SendBatch(TCPsocket& socket, void* data, size_t len);
+  static bool SendBatch(TCPsocket& socket, void* data, size_t len);
 
   static int ReceiveInt(SDLNet_SocketSet& sock_set, TCPsocket& socket, int& nbr);
-  static int ReceiveStr(SDLNet_SocketSet& sock_set, TCPsocket& socket, std::string &str);
+  static int ReceiveStr(SDLNet_SocketSet& sock_set, TCPsocket& socket, std::string &str, size_t maxlen);
 };
 
 //-----------------------------------------------------------------------------
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index a26f105..d9abd82 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -23,9 +23,9 @@
 //-----------------------------------------------------------------------------
 #include <SDL_thread.h>
 #include "include/action_handler.h"
+#include "include/app.h"
 #include "include/constant.h"
 #include "game/game_mode.h"
-#include "menu/network_menu.h"
 #include "network/distant_cpu.h"
 #include "network/net_error_msg.h"
 #include "tool/debug.h"
@@ -53,14 +53,6 @@ NetworkClient::~NetworkClient()
 {
 }
 
-void NetworkClient::SendChatMessage(const std::string& txt)
-{
-  if (txt == "") return;
-
-  Action a(Action::ACTION_CHAT_MESSAGE, txt);
-  SendAction(&a);
-}
-
 std::list<DistantComputer*>::iterator NetworkClient::CloseConnection(std::list<DistantComputer*>::iterator closed)
 {
   printf("Client disconnected\n");
@@ -69,32 +61,9 @@ std::list<DistantComputer*>::iterator NetworkClient::CloseConnection(std::list<D
   return cpu.erase(closed);
 }
 
-void NetworkClient::HandleAction(Action* a, DistantComputer* sender) const
+void NetworkClient::HandleAction(Action* a, DistantComputer* /*sender*/) const
 {
-  switch (a->GetType()) {
-  case Action::ACTION_NICKNAME:
-    {
-      std::string nickname = a->PopString();
-      std::cout<<"New nickname: " + nickname<< std::endl;
-      sender->nickname = nickname;
-      delete a;
-    }
-    break;
-
-  case Action::ACTION_MENU_ADD_TEAM:
-  case Action::ACTION_MENU_DEL_TEAM:
-    sender->ManageTeam(a);
-    delete a;
-    break;
-
-  case Action::ACTION_CHAT_MESSAGE:
-    sender->SendChatMessage(a);
-    delete a;
-    break;
-
-  default:
-    ActionHandler::GetInstance()->NewAction(a, false);
-  }
+  ActionHandler::GetInstance()->NewAction(a, false);
 }
 
 //-----------------------------------------------------------------------------
@@ -117,7 +86,7 @@ connection_state_t NetworkClient::HandShake(TCPsocket& server_socket)
   Network::Send(server_socket, Constants::WORMUX_VERSION);
 
   // is it ok ?
-  r = Network::ReceiveStr(tmp_socket_set, server_socket, version);
+  r = Network::ReceiveStr(tmp_socket_set, server_socket, version, 40);
 
   MSG_DEBUG("network", "Client: server version number is %s", version.c_str());
 
@@ -128,7 +97,7 @@ connection_state_t NetworkClient::HandShake(TCPsocket& server_socket)
     std::string str = Format(_("The client and server versions are incompatible "
 			       "(local=%s, server=%s). Please try another server."),
 			     Constants::WORMUX_VERSION.c_str(), version.c_str());
-    Network::GetInstance()->network_menu->DisplayError(str);
+    AppWormux::DisplayError(str);
     goto error;
   }
 
@@ -199,9 +168,10 @@ NetworkClient::ClientConnect(const std::string &host, const std::string& port)
   DistantComputer * server = new DistantComputer(socket);
 
   cpu.push_back(server);
+
   //Send nickname to server
-  Action a(Action::ACTION_NICKNAME, nickname);
-  SendAction(&a);
+  Action a(Action::ACTION_NICKNAME, GetNickname());
+  SendAction(a);
 
   //Control to net_thread_func
   thread = SDL_CreateThread(Network::ThreadRun, NULL);
diff --git a/src/network/network_client.h b/src/network/network_client.h
index 430c2fc..78b2a9e 100644
--- a/src/network/network_client.h
+++ b/src/network/network_client.h
@@ -39,8 +39,6 @@ public:
   //virtual const bool IsConnected() const { return true; }
   virtual bool IsClient() const { return true; }
 
-  virtual void SendChatMessage(const std::string& txt);
-
   std::list<DistantComputer*>::iterator CloseConnection(std::list<DistantComputer*>::iterator);
 
   // Client specific methods
diff --git a/src/network/network_local.cpp b/src/network/network_local.cpp
index 4efd9bd..fff4669 100644
--- a/src/network/network_local.cpp
+++ b/src/network/network_local.cpp
@@ -25,9 +25,7 @@ NetworkLocal::NetworkLocal() : Network("") {}
 
 NetworkLocal::~NetworkLocal() {}
 
-void NetworkLocal::SendAction(Action* /*action*/) {}
-
-void NetworkLocal::SendChatMessage(const std::string& /*txt*/) {}
+void NetworkLocal::SendAction(const Action& /*action*/) const {}
 
 std::list<DistantComputer*>::iterator NetworkLocal::CloseConnection(std::list<DistantComputer*>::iterator /*closed*/)
 {
diff --git a/src/network/network_local.h b/src/network/network_local.h
index 614a505..51eebdc 100644
--- a/src/network/network_local.h
+++ b/src/network/network_local.h
@@ -38,9 +38,8 @@ public:
   virtual bool IsConnected() const { return false; }
   virtual bool IsLocal() const { return true; }
 
-  virtual void SendAction(Action* action);
+  virtual void SendAction(const Action& action) const;
 
-  virtual void SendChatMessage(const std::string& txt);
   virtual std::list<DistantComputer*>::iterator CloseConnection(std::list<DistantComputer*>::iterator closed);
 
 };
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 7e6e5e8..96e60f2 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -52,22 +52,15 @@ NetworkServer::~NetworkServer()
   SDLNet_TCP_Close(server_socket);
 }
 
-void NetworkServer::SendChatMessage(const std::string& txt)
-{
-  if (txt == "") return;
-  ActionHandler::GetInstance()->NewAction(new Action(Action::ACTION_CHAT_MESSAGE, nickname + std::string("> ") + txt));
-}
-
 void NetworkServer::HandleAction(Action* a, DistantComputer* sender) const
 {
   // Repeat the packet to other clients:
   if (a->GetType() != Action::ACTION_NETWORK_CHANGE_STATE
-      && a->GetType() != Action::ACTION_NETWORK_CHECK_PHASE2
-      && a->GetType() != Action::ACTION_CHAT_MESSAGE)
+      && a->GetType() != Action::ACTION_NETWORK_CHECK_PHASE2)
   {
     char* packet;
     int packet_size;
-    a->WritePacket(packet, packet_size);
+    a->WriteToPacket(packet, packet_size);
 
     for (std::list<DistantComputer*>::const_iterator client = cpu.begin();
          client != cpu.end();
@@ -98,7 +91,7 @@ bool NetworkServer::HandShake(TCPsocket& client_socket)
   // 1) Receive the version number
   MSG_DEBUG("network", "Server: waiting for client version number");
 
-  r = Network::ReceiveStr(tmp_socket_set, client_socket, version);
+  r = Network::ReceiveStr(tmp_socket_set, client_socket, version, 40);
   if (r) {
     std::cerr << "Error " << r << " when receiving version number"
 	      << std::endl;
@@ -118,7 +111,7 @@ bool NetworkServer::HandShake(TCPsocket& client_socket)
   // 2) Check the password
   MSG_DEBUG("network", "Server: waiting for password");
 
-  r = Network::ReceiveStr(tmp_socket_set, client_socket, _password);
+  r = Network::ReceiveStr(tmp_socket_set, client_socket, _password, 100);
   if (r)
     goto error;
 
diff --git a/src/network/network_server.h b/src/network/network_server.h
index fb33493..59cc57e 100644
--- a/src/network/network_server.h
+++ b/src/network/network_server.h
@@ -42,8 +42,6 @@ public:
   //virtual const bool IsConnected() const { return true; }
   virtual bool IsServer() const { return true; }
 
-  virtual void SendChatMessage(const std::string& txt);
-
   // Serveur specific methods
   connection_state_t ServerStart(const std::string &port);
 
diff --git a/src/network/randomsync.cpp b/src/network/randomsync.cpp
index 6f82d71..b484967 100644
--- a/src/network/randomsync.cpp
+++ b/src/network/randomsync.cpp
@@ -24,65 +24,35 @@
 #include "network/network.h"
 #include "include/action_handler.h"
 #include "tool/debug.h"
+#include "tool/random.h"
 
-/******************************************************************************
- * From "man 3 rand"
- * POSIX.1-2001  gives the following example of an implementation of rand() and
- * srand(), possibly useful when one needs the same sequence on two different
- * machines.
- ******************************************************************************/
-
-static unsigned long next = 1;
-
-/* RAND_MAX assumed to be 32767 */
-static inline uint wormux_rand(void)
-{
-  next = next * 1103515245 + 12345;
-  return((uint)(next/65536) % 32768);
-}
-
-static inline void wormux_srand(uint seed)
+void RandomSyncGen::InitRandom()
 {
-  next = seed;
-}
-
-#define WORMUX_RAND_MAX 32767
-
-/******************************************************************************/
-
-RandomSync randomSync;
+  MSG_DEBUG("random", "Initialization...");
 
-RandomSync::RandomSync()
-{
 #ifdef DEBUG
   nb_get = 0;
 #endif
-}
-
-void RandomSync::Init()
-{
-  MSG_DEBUG("random", "Initialization...");
 
-  int seed = time(NULL);
-  SetRand(seed);
-
-  if  (Network::GetInstance()->IsServer()) {
+  if (Network::GetInstance()->IsLocal()) {
     int seed = time(NULL);
-    Action a(Action::ACTION_NETWORK_RANDOM_INIT, seed);
-    Network::GetInstance()->SendAction(&a);
+    SetRand(seed);
   }
-}
 
+  if (Network::GetInstance()->IsServer()) {
+    int seed = time(NULL);
+    SetRand(seed);
 
-void RandomSync::SetRand(uint seed)
-{
-  MSG_DEBUG("random", "SetRand: seed=%u", seed);
-  wormux_srand(seed);
+    MSG_DEBUG("random", "Server sending seed %d", seed);
+
+    Action a(Action::ACTION_NETWORK_RANDOM_INIT, seed);
+    Network::GetInstance()->SendAction(a);
+  }
 }
 
-uint RandomSync::GetRand()
+uint RandomSyncGen::GetRand()
 {
-  uint nbr = wormux_rand();
+  uint nbr = RandomGenerator::GetRand();
 #ifdef DEBUG
   nb_get++;
   MSG_DEBUG("random.get", "Get %04d: %u", nb_get, nbr);
@@ -94,58 +64,12 @@ uint RandomSync::GetRand()
   return nbr;
 }
 
-bool RandomSync::GetBool()
-{
-  double middle = WORMUX_RAND_MAX/2;
-  return (GetRand() <= middle);
-}
-
-/**
- * Get a random number between 0.0 and 1.0
- *
- * @return A number between 0.0 and 1.0
- */
-double RandomSync::GetDouble()
-{
-        return 1.0*GetRand()/(WORMUX_RAND_MAX + 1.0);
-}
-
-/**
- *  Get a random number between min and max
- */
-long RandomSync::GetLong(long min, long max)
-{
-        return min + (long)GetDouble(max - min + 1);
-}
-
-double RandomSync::GetDouble(double min, double max)
-{
-        return min + GetDouble(max - min);
-}
-
-double RandomSync::GetDouble(double max)
-{
-        return max * GetDouble();
-}
-
-/**
- * Return a random point in the given rectangle.
- *
- * @param rect The rectangle in which the returned point will be.
- * @return a random point.
- */
-Point2i RandomSync::GetPoint(const Rectanglei &rect)
+void RandomSyncGen::SetRand(uint seed)
 {
-        Point2i topPoint = rect.GetPosition();
-        Point2i bottomPoint = rect.GetBottomRightPoint();
-	long x = GetLong(topPoint.x, bottomPoint.x);
-	long y = GetLong(topPoint.y, bottomPoint.y);
-        return Point2i( x, y );
+  RandomGenerator::SetRand(seed);
 }
 
-Point2i RandomSync::GetPoint(const Point2i &pt)
+RandomSyncGen& RandomSync()
 {
-	long x = GetLong(0, pt.x - 1);
-	long y = GetLong(0, pt.y - 1);
-        return Point2i( x, y );
+  return (*RandomSyncGen::GetInstance());
 }
diff --git a/src/network/randomsync.h b/src/network/randomsync.h
index 3f4dc76..4f30925 100644
--- a/src/network/randomsync.h
+++ b/src/network/randomsync.h
@@ -21,33 +21,22 @@
 
 #ifndef RANDOMSYNC_H
 #define RANDOMSYNC_H
-#include <list>
-#include "tool/rectangle.h"
-#include "tool/point.h"
 
-class RandomSync{
+#include "include/singleton.h"
+#include "tool/random.h"
+
+class RandomSyncGen : public RandomGenerator, public Singleton<RandomSyncGen>
+{
 #ifdef DEBUG
   uint nb_get;
 #endif
 
 public:
-  RandomSync();
-  void Init();
-
-  uint GetRand(); // public only to check synchronization
-
-  bool GetBool();
-  double GetDouble();
-  double GetDouble(double max);
-  double GetDouble(double min, double max);
-  long GetLong(long min, long max);
-  Point2i GetPoint(const Rectanglei &rect);
-  Point2i GetPoint(const Point2i &pt);
-
-  //to fill the pregenerated tables
+  void InitRandom();
+  uint GetRand();
   void SetRand(uint seed);
 };
 
-extern RandomSync randomSync;
+RandomSyncGen& RandomSync();
 
 #endif
diff --git a/src/object/bonus_box.cpp b/src/object/bonus_box.cpp
index 33cc2fb..3a3cd47 100644
--- a/src/object/bonus_box.cpp
+++ b/src/object/bonus_box.cpp
@@ -60,7 +60,7 @@ void BonusBox::PickRandomWeapon()
   weapon_num = 0;
   int nb_try = 0;
   do {
-    double num = Random::GetDouble(0, total_probability);
+    double num = RandomLocal().GetDouble(0, total_probability);
     double total_bf_weapon = 0, total_after_weapon = 0;
 
     for (uint i=0; i < weapon_list.size(); i++) {
@@ -114,7 +114,7 @@ bool BonusBox::ExplodesInsteadOfBonus(Character * c)
   else if ( explosion_probability > 40.0f )
     explosion_probability = 40.0f;
 
-  float randval = randomSync.GetDouble( 1, 100 );
+  float randval = RandomSync().GetDouble( 1, 100 );
   bool exploding = randval < explosion_probability;
   MSG_DEBUG("bonus","explosion chance: %.2f%%, actual value: %.2f, %s",
     explosion_probability, randval, exploding ? "exploding!" : "not exploding");
@@ -132,13 +132,13 @@ std::vector<struct WeaponProba> BonusBox::weapon_list;
   and retrieved by weapon.GetBonusProbability() and weapon.GetBonusAmmo()
   however, this is not the way that was chosen.
 */
-void BonusBox::LoadXml(xmlNode* object)
+void BonusBox::LoadXml(const xmlNode* object)
 {
   total_probability = 0;
   struct WeaponProba w;
 
   XmlReader::ReadInt(object, "life_points", start_life_points);
-  xmlNode* node = XmlReader::GetMarker(object, "probability");
+  const xmlNode* node = XmlReader::GetMarker(object, "probability");
   std::list<Weapon*> l_weapons_list = WeaponsList::GetInstance()->GetList();
   std::list<Weapon*>::iterator
     itw = l_weapons_list.begin(),
@@ -147,14 +147,17 @@ void BonusBox::LoadXml(xmlNode* object)
   for(; itw != end; ++itw) {
     w.weapon = *itw;
 
-    if (!XmlReader::ReadDouble(node, w.weapon->GetID().c_str(), w.probability) || w.probability == 0.0) {
+    if (!XmlReader::ReadDouble(node, w.weapon->GetID().c_str(), w.probability)) {
       std::cerr << "No bonus probability defined for weapon "
 		<< w.weapon->GetID().c_str() << std::endl;
       continue;
     }
+    if (w.probability == 0.0) {
+      continue;
+    }
     total_probability += w.probability;
 
-    xmlNode* elem = XmlReader::GetMarker(node, w.weapon->GetID());
+    const xmlNode* elem = XmlReader::GetMarker(node, w.weapon->GetID());
     ASSERT(elem != NULL);
     XmlReader::ReadIntAttr (elem, "ammo", w.nb_ammos);
 
diff --git a/src/object/bonus_box.h b/src/object/bonus_box.h
index 7bd8374..8a894f7 100644
--- a/src/object/bonus_box.h
+++ b/src/object/bonus_box.h
@@ -53,7 +53,7 @@ class BonusBox : public ObjBox
     void PickRandomWeapon();
   public:
     BonusBox();
-    static void LoadXml(xmlNode*  object);
+    static void LoadXml(const xmlNode* object);
 
     void ApplyBonus(Character *);
     void Randomize();
diff --git a/src/object/medkit.cpp b/src/object/medkit.cpp
index db89960..a749f8b 100644
--- a/src/object/medkit.cpp
+++ b/src/object/medkit.cpp
@@ -78,7 +78,7 @@ void Medkit::ApplyMedkit(Team &/*equipe*/, Character &ver) const {
 // Static methods
 int Medkit::nbr_health = 24;
 
-void Medkit::LoadXml(xmlNode*  object)
+void Medkit::LoadXml(const xmlNode*  object)
 {
   XmlReader::ReadInt(object,"life_points",start_life_points);
   XmlReader::ReadInt(object,"energy_boost",nbr_health);
diff --git a/src/object/medkit.h b/src/object/medkit.h
index 2249794..f2c386d 100644
--- a/src/object/medkit.h
+++ b/src/object/medkit.h
@@ -42,7 +42,7 @@ class Medkit : public ObjBox//public PhysicalObj
   public:
     Medkit();
 
-    static void LoadXml(xmlNode * object);
+    static void LoadXml(const xmlNode * object);
     void ApplyBonus(Character *);
     void GetValueFromAction(Action *);
     void StoreValue(Action *);
diff --git a/src/object/objbox.cpp b/src/object/objbox.cpp
index 6267182..a4b21f3 100644
--- a/src/object/objbox.cpp
+++ b/src/object/objbox.cpp
@@ -120,10 +120,10 @@ void ObjBox::Draw()
   {
     Rectanglei test_rect(GetTestRect());
     test_rect.SetPosition(test_rect.GetPosition() - Camera::GetInstance()->GetPosition());
-    AppWormux::GetInstance()->video->window.RectangleColor(test_rect, primary_red_color, 1);
+    GetMainWindow().RectangleColor(test_rect, primary_red_color, 1);
 
     Rectanglei rect(GetPosition() - Camera::GetInstance()->GetPosition(), anim->GetSize());
-    AppWormux::GetInstance()->video->window.RectangleColor(rect, primary_blue_color, 1);
+    GetMainWindow().RectangleColor(rect, primary_blue_color, 1);
   }
 #endif
 }
@@ -160,7 +160,7 @@ void ObjBox::GetValueFromAction(Action * a)
 {
   PhysicalObj::GetValueFromAction(a);
   start_life_points = a->PopInt();
-  SetXY(a->PopPoint2i());
+  SetXY(a->PopPoint2d());
   SetSpeedXY(a->PopPoint2d());
 }
 
diff --git a/src/object/objbox.h b/src/object/objbox.h
index f7f060c..247a3ae 100644
--- a/src/object/objbox.h
+++ b/src/object/objbox.h
@@ -48,7 +48,7 @@ class ObjBox : public PhysicalObj //it would be nice to name this "Box", but tha
     ~ObjBox();
 
     void DropBox();
-    static void LoadXml(xmlNode*  /*object*/){};
+    static void LoadXml(const xmlNode*  /*object*/){};
 
     void Draw();
     virtual void Refresh();
diff --git a/src/object/object_cfg.cpp b/src/object/object_cfg.cpp
index f5abcb0..b4c9f0e 100644
--- a/src/object/object_cfg.cpp
+++ b/src/object/object_cfg.cpp
@@ -42,7 +42,7 @@ ObjectConfig::ObjectConfig()
 
 void ObjectConfig::LoadXml(const std::string& obj_name, const std::string &config_file)
 {
-  xmlNode* elem = NULL;
+  const xmlNode* elem = NULL;
   XmlReader doc;
 
   if (config_file == "") {
diff --git a/src/object/objects_list.h b/src/object/objects_list.h
index c279a7a..e9dcd4e 100644
--- a/src/object/objects_list.h
+++ b/src/object/objects_list.h
@@ -39,7 +39,7 @@
 // Loop for all objects that aren't out of the screen
 #define FOR_EACH_OBJECT(object) \
   FOR_ALL_OBJECTS(object) \
-  if (!(*object)->IsGhost())
+  	if (!(*object)->IsGhost())
 
 //-----------------------------------------------------------------------------
 
diff --git a/src/object/physical_obj.cpp b/src/object/physical_obj.cpp
index 35d0461..4d2055e 100644
--- a/src/object/physical_obj.cpp
+++ b/src/object/physical_obj.cpp
@@ -66,6 +66,7 @@ PhysicalObj::PhysicalObj (const std::string &name, const std::string &xml_config
   m_minimum_overlapse_time(0),
   m_ignore_movements(false),
   m_is_character(false),
+  m_is_fire(false),
   m_name(name),
   m_test_left(0),
   m_test_right(0),
@@ -95,21 +96,7 @@ PhysicalObj::~PhysicalObj ()
 
 void PhysicalObj::SetXY(const Point2i &position)
 {
-  CheckOverlapping();
-
-  if( IsOutsideWorldXY( position ) )
-  {
-    Point2d physPos(position.x, position.y);
-    SetPhysXY( physPos / PIXEL_PER_METER );
-    Ghost();
-    SignalOutOfMap();
-  }
-  else
-  {
-    Point2d physPos(position.x, position.y);
-    SetPhysXY( physPos / PIXEL_PER_METER );
-    if( FootsInVacuum() ) StartMoving();
-  }
+  SetXY(Point2d(double(position.x), double(position.y)));
 }
 
 void PhysicalObj::SetXY(const Point2d &position)
@@ -117,20 +104,23 @@ void PhysicalObj::SetXY(const Point2d &position)
   CheckOverlapping();
 
   if( IsOutsideWorldXY( Point2i(int(position.x), int(position.y)) ) )
-  {
-    SetPhysXY( position / PIXEL_PER_METER );
-    Ghost();
-    SignalOutOfMap();
-  }
+    {
+      SetPhysXY( position / PIXEL_PER_METER );
+      Ghost();
+      SignalOutOfMap();
+    }
   else
-  {
-    SetPhysXY( position / PIXEL_PER_METER );
-    if( FootsInVacuum() ) StartMoving();
-  }
+    {
+      SetPhysXY( position / PIXEL_PER_METER );
+      if( FootsInVacuum() ) StartMoving();
+    }
 }
 
-int PhysicalObj::GetX() const { return (int)round(GetPhysX() * PIXEL_PER_METER); };
-int PhysicalObj::GetY() const { return (int)round(GetPhysY() * PIXEL_PER_METER); };
+double PhysicalObj::GetXdouble() const { return round(GetPhysX() * PIXEL_PER_METER); };
+double PhysicalObj::GetYdouble() const { return round(GetPhysY() * PIXEL_PER_METER); };
+
+int PhysicalObj::GetX() const { return (int)GetXdouble(); };
+int PhysicalObj::GetY() const { return (int)GetYdouble(); };
 
 void PhysicalObj::SetSize(const Point2i &newSize){
   if( newSize == Point2i(0, 0) )
@@ -556,8 +546,11 @@ void PhysicalObj::Drown()
   if (EqualsZero(GetGravityFactor()))
     SetGravityFactor(0.1);
 
+  // If fire, do smoke...
+  if (m_is_fire)
+    world.water.Smoke(GetPosition());
   // make a splash in the water :-)
-  if (GetMass() >= 2)
+  else if (GetMass() >= 2)
     world.water.Splash(GetPosition());
 
   StopMoving();
@@ -657,8 +650,12 @@ bool PhysicalObj::IsInVacuumXY(const Point2i &position, bool check_object) const
   if( check_object && CollidedObjectXY(position) )
     return false;
 
+  int width = m_width - m_test_right - m_test_left;
+  int height = m_height -m_test_bottom - m_test_top;
+  width = (width == 0 ? 1 : width);
+  height = (height == 0 ? 1 : height);
   Rectanglei rect(position.x + m_test_left, position.y + m_test_top,
-                  m_width - m_test_right - m_test_left, m_height -m_test_bottom - m_test_top);
+                  width, height);
 
   return world.RectIsInVacuum (rect);
 }
@@ -741,7 +738,7 @@ bool PhysicalObj::IsInWater () const
 void PhysicalObj::DirectFall()
 {
   while (!IsGhost() && !IsInWater() && FootsInVacuum())
-    SetY((int)(GetY()+1.0));
+    SetY(GetYdouble()+1.0);
 }
 
 bool PhysicalObj::ContactPoint (int & contact_x, int & contact_y) const
@@ -829,15 +826,15 @@ bool PhysicalObj::PutRandomly(bool on_top_of_world, double min_dst_with_characte
     if (on_top_of_world) {
       // Give a random position for x
       if(net_sync)
-        position.x = randomSync.GetLong(0, world.GetWidth() - GetWidth());
+        position.x = RandomSync().GetLong(0, world.GetWidth() - GetWidth());
       else
-        position.x = Random::GetLong(0, world.GetWidth() - GetWidth());
+        position.x = RandomLocal().GetLong(0, world.GetWidth() - GetWidth());
       position.y = -GetHeight()+1;
     } else {
       if(net_sync)
-        position = randomSync.GetPoint(world.GetSize() - GetSize() + 1);
+        position = RandomSync().GetPoint(world.GetSize() - GetSize() + 1);
       else
-        position = Random::GetPoint(world.GetSize() - GetSize() + 1);
+        position = RandomLocal().GetPoint(world.GetSize() - GetSize() + 1);
     }
     SetXY(position);
     MSG_DEBUG("physic.position", "%s (try %u/%u) - Test in %d, %d",
diff --git a/src/object/physical_obj.h b/src/object/physical_obj.h
index e3e251c..239850b 100644
--- a/src/object/physical_obj.h
+++ b/src/object/physical_obj.h
@@ -64,6 +64,7 @@ protected:
   uint m_minimum_overlapse_time;
   bool m_ignore_movements;
   bool m_is_character;
+  bool m_is_fire;
 
   virtual void CheckOverlapping();
 
@@ -94,13 +95,15 @@ public:
   //-------- Set position and size -------
 
   // Set/Get position
-  void SetX (int x) { SetXY( Point2i(x, GetY()) ); };
-  void SetY (int y) { SetXY( Point2i(GetX(), y) ); };
+  void SetX(double x) { SetXY( Point2d(x, GetYdouble()) ); };
+  void SetY(double y) { SetXY( Point2d(GetXdouble(), y) ); };
   void SetXY(const Point2i &position);
   void SetXY(const Point2d &position);
   int GetX() const;
   int GetY() const;
-  const Point2i GetPosition() const { return Point2i(GetX(), GetY()); };
+  double GetXdouble() const;
+  double GetYdouble() const;
+  const Point2d GetPosition() const { return Point2d(GetXdouble(), GetYdouble()) ;};
 
   // Used to sync value across network
   virtual void GetValueFromAction(Action *);
@@ -116,10 +119,11 @@ public:
   void SetTestRect (uint left, uint right, uint top, uint bottom);
   const Rectanglei GetTestRect() const
   {
-    return Rectanglei(GetX()+m_test_left,
-                      GetY()+m_test_top,
-                      m_width-m_test_right-m_test_left,
-                      m_height-m_test_bottom-m_test_top);
+    int width = m_width - m_test_right - m_test_left;
+    int height = m_height - m_test_bottom - m_test_top;
+    width = (width == 0 ? 1 : width);
+    height = (height == 0 ? 1 : height);
+    return Rectanglei(GetX() + m_test_left, GetY() + m_test_top, width, height);
   }
   int GetTestWidth() const { return m_width -m_test_left -m_test_right; };
   int GetTestHeight() const { return m_height -m_test_top -m_test_bottom; };
@@ -189,10 +193,12 @@ public:
   void Drown();
   void GoOutOfWater(); // usefull for supertux.
 
-  virtual bool IsImmobile() const { return m_ignore_movements ||(!IsMoving() && !FootsInVacuum())||(m_alive == GHOST); };
+  virtual bool IsImmobile() const { return IsSleeping() || m_ignore_movements ||(!IsMoving() && !FootsInVacuum())||(m_alive == GHOST); };
+
   bool IsGhost() const { return (m_alive == GHOST); };
   bool IsDrowned() const { return (m_alive == DROWNED); };
   bool IsDead() const { return (IsGhost() || IsDrowned() || (m_alive == DEAD)); };
+  bool IsFire() const { return m_is_fire; }
 
   // Are the two object in contact ? (uses test rectangles)
   bool Overlapse(const PhysicalObj &b) const { return GetTestRect().Intersect( b.GetTestRect() ); };
diff --git a/src/object/physics.cpp b/src/object/physics.cpp
index f79dee8..ea4bc4e 100644
--- a/src/object/physics.cpp
+++ b/src/object/physics.cpp
@@ -66,6 +66,15 @@ Physics::Physics ():
 //--                         Class Parameters SET/GET                      --//
 //---------------------------------------------------------------------------//
 
+void Physics::SetPhysXY(double x, double y)
+{
+  if (m_pos_x.x0 != x || m_pos_y.x0 != y) {
+    m_pos_x.x0 = x;
+    m_pos_y.x0 = y;
+    UpdateTimeOfLastMove();
+  }
+}
+
 // Set the air resist factor
 void Physics::SetSpeedXY (Point2d vector)
 {
@@ -77,8 +86,10 @@ void Physics::SetSpeedXY (Point2d vector)
   m_pos_y.x1 = vector.y ;
   // setting to FreeFall is done in StartMoving()
 
-  if (!was_moving && IsMoving())
+  if (!was_moving && IsMoving()) {
+    UpdateTimeOfLastMove();
     StartMoving();
+  }
 }
 
 void Physics::AddSpeedXY (Point2d vector)
@@ -91,8 +102,10 @@ void Physics::AddSpeedXY (Point2d vector)
   m_pos_y.x1 += vector.y ;
   // setting to FreeFall is done in StartMoving()
 
-  if (!was_moving && IsMoving())
+  if (!was_moving && IsMoving()) {
+    UpdateTimeOfLastMove();
     StartMoving();
+  }
 }
 
 void Physics::GetSpeed(double &norm, double &angle) const
@@ -186,6 +199,7 @@ void Physics::SetExternForceXY (const Point2d& vector)
 {
   bool was_moving = IsMoving();
 
+  UpdateTimeOfLastMove();
   MSG_DEBUG ("physic.physic", "EXTERN FORCE %s.", typeid(*this).name());
 
   m_extern_force.SetValues(vector);
@@ -207,6 +221,7 @@ void Physics::SetPhysFixationPointXY(double g_x, double g_y, double dx,
   m_fix_point_dxy.x = dx ;
   m_fix_point_dxy.y = dy ;
 
+  UpdateTimeOfLastMove();
   //  printf ("Fixation (%f,%f) dxy(%f,%f)\n",  g_x, g_y, dx, dy);
 
   fix_point_x = m_pos_x.x0 + dx ;
@@ -258,6 +273,8 @@ void Physics::UnsetPhysFixationPoint()
 
   SetSpeed(speed_norm, angle);
 
+  UpdateTimeOfLastMove();
+
   m_pos_x.x2 = 0 ;
   m_pos_y.x2 = 0 ;
 
@@ -290,7 +307,7 @@ void Physics::ChangePhysRopeSize(double dl)
 
 void Physics::StartMoving()
 {
-  m_last_move = Time::GetInstance()->Read();
+  UpdateTimeOfLastMove();
 
   if (m_motion_type == NoMotion)
     m_motion_type = FreeFall ;
@@ -300,12 +317,15 @@ void Physics::StartMoving()
 
 void Physics::StopMoving()
 {
+  if(!IsMoving()) return;
+
   if (IsMoving()) MSG_DEBUG ("physic.physic", "Stops moving: %s.", typeid(*this).name());
   // Always called by PhysicalObj::StopMoving
   m_pos_x.x1 = 0 ;
   m_pos_x.x2 = 0 ;
   m_pos_y.x1 = 0 ;
   m_pos_y.x2 = 0 ;
+  UpdateTimeOfLastMove();
   if (m_motion_type != Pendulum)
     m_motion_type = NoMotion ;
 
@@ -320,6 +340,23 @@ bool Physics::IsMoving() const
          m_motion_type != NoMotion;
 }
 
+bool Physics::IsSleeping() const
+{
+  // return true if not moving since 1 sec.
+  int delta = Time::GetInstance()->Read() - m_last_move;
+  if(delta > 400) {
+    MSG_DEBUG( "physic.sleep", "%s is sleeping since %d ms.", typeid(*this).name(), delta);
+    return true;
+  }
+  MSG_DEBUG( "physic.notsleeping", "%s is not sleeping.", typeid(*this).name());
+  return false;
+}
+
+void Physics::UpdateTimeOfLastMove()
+{
+  m_last_move = Time::GetInstance()->Read();
+}
+
 // Compute the next position of the object during a pendulum motion.
 void Physics::ComputePendulumNextXY (double delta_t)
 {
@@ -395,6 +432,9 @@ void Physics::ComputeFallNextXY (double delta_t)
 
   GetSpeed(speed_norm, speed_angle);
 
+  if(!EqualsZero(speed_norm))
+    UpdateTimeOfLastMove();
+
   air_resistance_factor = AIR_RESISTANCE_FACTOR * m_air_resist_factor ;
 
   MSG_DEBUG( "physic.fall", "%s falls; mass %5f, weight %5f, wind %5f, air %5f, delta %f", typeid(*this).name(), m_mass, weight_force,wind_force, air_resistance_factor, delta_t);
@@ -438,8 +478,6 @@ Point2d Physics::ComputeNextXY(double delta_t){
   if (m_motion_type == Pendulum)
     ComputePendulumNextXY(delta_t);
 
-  m_last_move = Time::GetInstance()->Read() ;
-
   return Point2d(m_pos_x.x0, m_pos_y.x0);
 }
 
diff --git a/src/object/physics.h b/src/object/physics.h
index 8001e97..b8540a7 100644
--- a/src/object/physics.h
+++ b/src/object/physics.h
@@ -78,7 +78,7 @@ public:
   virtual ~Physics () {};
 
   // Set/Get position
-  void SetPhysXY (double x, double y) { m_pos_x.x0 = x; m_pos_y.x0 = y; }
+  void SetPhysXY(double x, double y);
   void SetPhysXY(const Point2d &position) { SetPhysXY(position.x, position.y); };
 
   double GetPhysX() const { return m_pos_x.x0; };
@@ -158,6 +158,8 @@ public:
 
   // The object is moving ?
   bool IsMoving() const;
+  // Is this object not moving ?
+  virtual bool IsSleeping() const;
 
   // The object is falling ?
   bool IsFalling() const { return (m_motion_type==FreeFall) && (m_pos_y.x1 > 0.1); };
@@ -179,6 +181,8 @@ private:
   void ComputeFallNextXY (double delta_t);
 
   void ComputePendulumNextXY (double delta_t);
+
+  void UpdateTimeOfLastMove();
 };
 
 #endif
diff --git a/src/particles/body_member.cpp b/src/particles/body_member.cpp
index 299b673..9504464 100644
--- a/src/particles/body_member.cpp
+++ b/src/particles/body_member.cpp
@@ -36,8 +36,8 @@ BodyMemberParticle::BodyMemberParticle(const Sprite* spr, const Point2i& positio
 
   SetSize(image->GetSize());
   SetOnTop(true);
-  SetSpeed( (double)randomObj.GetLong(10, 15),
-        - (double)randomObj.GetLong(0, 3000)/1000.0);
+  SetSpeed( (double)RandomLocal().GetLong(10, 15),
+        - (double)RandomLocal().GetLong(0, 3000)/1000.0);
 }
 
 void BodyMemberParticle::Refresh()
diff --git a/src/particles/explosion_smoke.cpp b/src/particles/explosion_smoke.cpp
index f38cae1..4251134 100644
--- a/src/particles/explosion_smoke.cpp
+++ b/src/particles/explosion_smoke.cpp
@@ -36,8 +36,8 @@ ExplosionSmoke::ExplosionSmoke(const uint size_init) :
   dx = 0;
 
   image = ParticleEngine::GetSprite(EXPLOSION_SMOKE_spr);
-  mvt_freq = randomObj.GetDouble(-2.0, 2.0);
-  SetGravityFactor(randomObj.GetDouble(-1.0,-2.0));
+  mvt_freq = RandomLocal().GetDouble(-2.0, 2.0);
+  SetGravityFactor(RandomLocal().GetDouble(-1.0,-2.0));
 
   image->ScaleSize(m_initial_size, m_initial_size);
   SetSize( Point2i(1, 1) );
diff --git a/src/particles/fire.cpp b/src/particles/fire.cpp
index 56a19ba..410ae0a 100644
--- a/src/particles/fire.cpp
+++ b/src/particles/fire.cpp
@@ -36,11 +36,12 @@ FireParticle::FireParticle() :
   Particle("fire_particle"),
   creation_time(Time::GetInstance()->Read()),
   on_ground(false),
-  oscil_delta(randomObj.GetLong(0, dig_ground_time))
+  oscil_delta(RandomLocal().GetLong(0, dig_ground_time))
 {
   SetCollisionModel(false, false, false);
   m_left_time_to_live = 100;
   m_check_move_on_end_turn = true;
+  m_is_fire = true;
 
   fire_cfg.damage = 1;
   fire_cfg.explosion_range = 5;
diff --git a/src/particles/ill_bubble.cpp b/src/particles/ill_bubble.cpp
index 57eeb5b..461618e 100644
--- a/src/particles/ill_bubble.cpp
+++ b/src/particles/ill_bubble.cpp
@@ -35,7 +35,7 @@ IllBubble::IllBubble() : ExplosionSmoke(20)
   delete image;
   image = ParticleEngine::GetSprite(ILL_BUBBLE_spr);
   SetAirResistFactor( GetAirResistFactor() * 3.0 );
-  vib_phi = randomObj.GetLong(0, vib_period);
+  vib_phi = RandomLocal().GetLong(0, vib_period);
 }
 
 void IllBubble::Draw()
diff --git a/src/particles/magic_star.cpp b/src/particles/magic_star.cpp
index 1a13bdf..ed89db0 100644
--- a/src/particles/magic_star.cpp
+++ b/src/particles/magic_star.cpp
@@ -33,7 +33,7 @@ MagicStarParticle::MagicStarParticle() :
   m_left_time_to_live = m_initial_time_to_live;
   m_time_between_scale = 25;
 
-  uint color=randomObj.GetLong(0,2);
+  uint color=RandomLocal().GetLong(0,2);
   switch(color)
   {
     case 0 : image = ParticleEngine::GetSprite(MAGIC_STAR_R_spr); break;
diff --git a/src/particles/particle.cpp b/src/particles/particle.cpp
index 9a15a89..c49f530 100644
--- a/src/particles/particle.cpp
+++ b/src/particles/particle.cpp
@@ -128,7 +128,7 @@ void ParticleEngine::AddPeriodic(const Point2i &position, particle_t type,
   uint time = Time::GetInstance()->Read() - m_last_refresh;
   uint tmp = Time::GetInstance()->Read();
 
-  uint delta = uint(m_time_between_add * double(randomObj.GetLong(3, 40)) / 10);
+  uint delta = uint(m_time_between_add * double(RandomLocal().GetLong(3, 40)) / 10);
   if (time >= delta) {
     m_last_refresh = tmp;
     ParticleEngine::AddNow(position, 1, type, upper, angle, norme);
@@ -162,6 +162,7 @@ void ParticleEngine::Load()
   particle_sprite[POLECAT_FART_spr] = resource_manager.LoadSprite(res,"polecat_fart");
   particle_sprite[WATER_spr] = resource_manager.LoadSprite(res,"water_drop");
   particle_sprite[LAVA_spr] = resource_manager.LoadSprite(res,"lava_drop");
+  particle_sprite[RADIOACTIVE_spr] = resource_manager.LoadSprite(res,"radioactive_drop");
   resource_manager.UnLoadXMLProfile(res);
 
   sprites_loaded = true;
@@ -223,6 +224,8 @@ void ParticleEngine::AddNow(const Point2i &position,
       break;
     case particle_LAVA: particle = new LavaParticle();
       break;
+    case particle_RADIOACTIVE: particle = new RadioactiveParticle();
+      break;
     default : particle = NULL;
       ASSERT(0);
       break;
@@ -231,12 +234,12 @@ void ParticleEngine::AddNow(const Point2i &position,
     if (particle != NULL) {
 
       if( norme == -1 )
-        tmp_norme = double(randomObj.GetLong(0, 5000))/100;
+        tmp_norme = double(RandomLocal().GetLong(0, 5000))/100;
       else
         tmp_norme = norme;
 
       if( angle == -1 )
-        tmp_angle = - double(randomObj.GetLong(0, 3000))/1000;
+        tmp_angle = - double(RandomLocal().GetLong(0, 3000))/1000;
       else
         tmp_angle = angle;
 
diff --git a/src/particles/particle.h b/src/particles/particle.h
index 29d881e..69e39bb 100644
--- a/src/particles/particle.h
+++ b/src/particles/particle.h
@@ -44,7 +44,8 @@ typedef enum {
   particle_TELEPORT_MEMBER,
   particle_POLECAT_FART,
   particle_WATER,
-  particle_LAVA
+  particle_LAVA,
+  particle_RADIOACTIVE
 } particle_t;
 
 enum particle_spr
@@ -61,9 +62,10 @@ enum particle_spr
   DARK_SMOKE_spr,
   POLECAT_FART_spr,
   WATER_spr,
-  LAVA_spr
+  LAVA_spr,
+  RADIOACTIVE_spr
 };
-const int particle_spr_nbr = LAVA_spr + 1;
+const int particle_spr_nbr = RADIOACTIVE_spr + 1;
 
 class Particle : public PhysicalObj
 {
diff --git a/src/particles/polecat_fart.cpp b/src/particles/polecat_fart.cpp
index 85b71a1..a82db99 100644
--- a/src/particles/polecat_fart.cpp
+++ b/src/particles/polecat_fart.cpp
@@ -19,18 +19,20 @@
  * Particle Engine
  *****************************************************************************/
 
-#include "particles/polecat_fart.h"
-#include "particles/particle.h"
 #include "character/character.h"
 #include "graphic/sprite.h"
+#include "particles/polecat_fart.h"
+#include "particles/particle.h"
+#include "team/macro.h"
+#include "team/team.h"
 
 PolecatFart::PolecatFart() :
   Particle("polecat_fart_particle")
 {
-  m_initial_time_to_live = 10;
+  m_initial_time_to_live = 50;
   m_left_time_to_live = m_initial_time_to_live;
   m_time_between_scale = 100;
-  SetCollisionModel(false, true, false);
+  SetCollisionModel(true, false, false);
   is_active = true;
 
   image = ParticleEngine::GetSprite(POLECAT_FART_spr);
@@ -38,11 +40,15 @@ PolecatFart::PolecatFart() :
   SetSize( Point2i(10, 10) );
 }
 
-void PolecatFart::SignalObjectCollision(PhysicalObj * obj)
+void PolecatFart::Refresh()
 {
-  if (!is_active) return;
-  Character * tmp = (Character *)obj;
-  tmp->SetEnergyDelta(-10);
-  tmp->SetDiseaseDamage(5, 3);
-  is_active = false;
+  Particle::Refresh();
+
+  FOR_ALL_LIVING_CHARACTERS(team, c) {
+    if ((c->GetTestRect()).Intersect(GetTestRect())) {
+      //c->SetEnergyDelta(-10);
+      c->SetDiseaseDamage(5, std::numeric_limits<uint>::max());
+      is_active = false;
+    }
+  }
 }
diff --git a/src/particles/polecat_fart.h b/src/particles/polecat_fart.h
index 97ed7bf..bb04f49 100644
--- a/src/particles/polecat_fart.h
+++ b/src/particles/polecat_fart.h
@@ -30,7 +30,7 @@ class PolecatFart : public Particle
   public:
     PolecatFart();
   protected:
-    void SignalObjectCollision(PhysicalObj * obj);
+    void Refresh();
 };
 
 #endif /* POLECAT_FART_H */
diff --git a/src/particles/teleport_member.cpp b/src/particles/teleport_member.cpp
index 0353f05..06a1b0c 100644
--- a/src/particles/teleport_member.cpp
+++ b/src/particles/teleport_member.cpp
@@ -46,8 +46,8 @@ TeleportMemberParticle::TeleportMemberParticle(const Sprite* spr, const Point2i&
   start = position;
   time = Time::GetInstance()->Read();
 
-  sin_x_max = randomObj.GetDouble(M_PI_4, 3.0 * M_PI_4);
-  sin_y_max = randomObj.GetDouble(M_PI_4, 3.0 * M_PI_4);
+  sin_x_max = RandomLocal().GetDouble(M_PI_4, 3.0 * M_PI_4);
+  sin_y_max = RandomLocal().GetDouble(M_PI_4, 3.0 * M_PI_4);
   Camera::GetInstance()->FollowObject(this, true);
 }
 
diff --git a/src/particles/water_drop.cpp b/src/particles/water_drop.cpp
index b4e104e..b9d07cb 100644
--- a/src/particles/water_drop.cpp
+++ b/src/particles/water_drop.cpp
@@ -84,3 +84,10 @@ LavaParticle::LavaParticle()
   delete image;
   image = ParticleEngine::GetSprite(LAVA_spr);
 }
+
+RadioactiveParticle::RadioactiveParticle()
+{
+  // delete std water image
+  delete image;
+  image = ParticleEngine::GetSprite(LAVA_spr);
+}
diff --git a/src/particles/water_drop.h b/src/particles/water_drop.h
index e2c6cb0..8087dde 100644
--- a/src/particles/water_drop.h
+++ b/src/particles/water_drop.h
@@ -41,4 +41,10 @@ public:
   LavaParticle();
 };
 
+class RadioactiveParticle : public WaterParticle
+{
+public:
+  RadioactiveParticle();
+};
+
 #endif /* WATER_DROP_H */
diff --git a/src/sound/jukebox.cpp b/src/sound/jukebox.cpp
index 0f63ced..dfcafcd 100644
--- a/src/sound/jukebox.cpp
+++ b/src/sound/jukebox.cpp
@@ -25,6 +25,7 @@
 #include <fstream>
 
 #include "game/config.h"
+#include "sound/sound_sample.h"
 #include "tool/debug.h"
 #include "tool/i18n.h"
 #include "tool/random.h"
@@ -60,13 +61,12 @@ void JukeBox::Init()
   JukeBox::GetInstance()->ActiveEffects(Config::GetInstance()->GetSoundEffects());
   JukeBox::GetInstance()->SetFrequency(Config::GetInstance()->GetSoundFrequency());
 
+  if (m_init) return;
   if (!m_config.music && !m_config.effects) {
     End();
     return;
   }
 
-  if (m_init) return;
-
   Uint16 audio_format = MIX_DEFAULT_FORMAT;
 
   /* Initialize the SDL library */
@@ -154,6 +154,9 @@ void JukeBox::ActiveMusic (bool on)
 
 void JukeBox::LoadMusicXML()
 {
+  if (!m_init) // the sound device has not be initialized (was busy?)
+    return;
+
   // is xml_file already loaded ?
   std::set<std::string>::iterator it_profile = m_profiles_loaded.find("music") ;
   if (it_profile !=  m_profiles_loaded.end())
@@ -177,7 +180,7 @@ void JukeBox::LoadMusicXML()
   if(!doc.Load(xml_filename))
     return;
 
-  xmlNodeArray nodes = XmlReader::GetNamedNeighbours(doc.GetRoot(), "music");
+  xmlNodeArray nodes = XmlReader::GetNamedChildren(doc.GetRoot(), "music");
   xmlNodeArray::const_iterator
     it = nodes.begin(),
     end = nodes.end();
@@ -327,6 +330,9 @@ bool JukeBox::PlayMusicSample(const std::vector<std::string>::const_iterator& fi
 
 void JukeBox::LoadXML(const std::string& profile)
 {
+  if (!m_init) // the sound device has not be initialized (was busy?)
+    return;
+
   // is xml_file already loaded ?
   std::set<std::string>::iterator it_profile = m_profiles_loaded.find(profile);
   if (it_profile !=  m_profiles_loaded.end())
@@ -351,7 +357,7 @@ void JukeBox::LoadXML(const std::string& profile)
   if(!doc.Load(xml_filename))
     return;
 
-  xmlNodeArray nodes = XmlReader::GetNamedNeighbours(doc.GetRoot(), "sound");
+  xmlNodeArray nodes = XmlReader::GetNamedChildren(doc.GetRoot(), "sound");
   xmlNodeArray::const_iterator
     it = nodes.begin(),
     end = nodes.end();
@@ -359,25 +365,29 @@ void JukeBox::LoadXML(const std::string& profile)
   for (; it != end; ++it)
   {
     // reads XML
-    std::string sample="no_sample";
-    std::string file="no_file";
+    std::string sample = "no_sample";
+    std::string file   = "no_file";
+    double      level  = 1.0;
+
     XmlReader::ReadStringAttr(*it, "sample", sample);
     XmlReader::ReadStringAttr(*it, "file", file);
+    XmlReader::ReadDoubleAttr(*it, "level", level);
 
-    MSG_DEBUG("jukebox", "Load sound sample %s/%s: %s",
-              profile.c_str(), sample.c_str(), file.c_str());
+    MSG_DEBUG("jukebox", "Load sound sample %s/%s: %s (%.3f)",
+              profile.c_str(), sample.c_str(), file.c_str(), level);
 
     // Load sound
     std::string sample_filename = folder + file;
     if( !DoesFileExist(sample_filename) )
     {
-      std::cerr << "Sound error: File " << sample_filename.c_str()
-                << " does not exist !" << std::endl;
+      std::cerr << "Sound warning: File " << sample_filename.c_str()
+                << " does not exist! (probably not yet recorded)" << std::endl;
       continue;
     }
 
     // Inserting sound sample in list
-    m_soundsamples.insert(sound_sample(profile+"/"+sample, sample_filename));
+    sample_info inf = { sample_filename, level };
+    m_soundsamples.insert(sound_sample(profile+"/"+sample, inf));
 
     // Precache
     m_cache.Precache( sample_filename.c_str() );
@@ -390,7 +400,7 @@ void JukeBox::LoadXML(const std::string& profile)
 int JukeBox::Play (const std::string& category, const std::string& sample,
                    const int loop)
 {
-  if (!UseEffects()) return -1;
+  if (!UseEffects() || !m_init) return -1;
 
   uint nb_sons= m_soundsamples.count(category+"/"+sample);
   if (nb_sons)
@@ -402,7 +412,7 @@ int JukeBox::Play (const std::string& category, const std::string& sample,
     // Choose a random sound sample
     if (nb_sons > 1)
     {
-      uint selection = uint(randomObj.GetLong(0, nb_sons));
+      uint selection = uint(RandomLocal().GetLong(0, nb_sons));
       if (selection == nb_sons) --selection ;
 
       it = p.first ;
@@ -411,42 +421,44 @@ int JukeBox::Play (const std::string& category, const std::string& sample,
     }
 
     // Play the sound
-    Mix_Chunk * sampleChunk = m_cache.LoadSound( it->second.c_str() );
+    Mix_Chunk * sampleChunk = m_cache.LoadSound( it->second.filename.c_str() );
     MSG_DEBUG("jukebox.play", "Playing sample %s/%s",
               category.c_str(), sample.c_str());
 
-    return PlaySample(sampleChunk, loop);
+    return PlaySample(sampleChunk, it->second.level, loop);
   }
   else if (category != "default")
   {
     return Play("default", sample, loop) ; // try with default profile
   }
 
-  std::cerr << "Sound error: No sound found for sample" << category.c_str() 
+  std::cerr << "Sound error: No sound found for sample" << category.c_str()
             << "/" << sample.c_str() << std::endl;
   return -1;
 }
 
 int JukeBox::Stop (int channel) const
 {
-  if(!m_config.music && !m_config.effects) return 0;
+  if (!m_init) return 0;
+  if (!m_config.music && !m_config.effects) return 0;
   if (channel == -1) return 0;
   return Mix_HaltChannel(channel);
 }
 
 int JukeBox::StopAll() const
 {
+  if (!m_init) return 0;
   if (!m_config.music && !m_config.effects) return 0;
 
   // halt playback on all channels
   return Mix_HaltChannel(-1);
 }
 
-int JukeBox::PlaySample (Mix_Chunk * sample, int loop)
+int JukeBox::PlaySample (Mix_Chunk * sample, double level, int loop)
 {
   if (loop != -1) loop--;
 
-  Mix_VolumeChunk(sample, Config::GetInstance()->GetVolumeEffects());
+  Mix_VolumeChunk(sample, int(0.5+level*Config::GetInstance()->GetVolumeEffects()));
   int channel = Mix_PlayChannel(-1, sample, loop);
 
   if (channel == -1)
@@ -463,6 +475,7 @@ void JukeBox::EndChunk(int channel)
 {
   JukeBox *jukebox = JukeBox::GetInstance();
   Mix_Chunk* chk = jukebox->chunks[channel];
+  SoundSample::ChannelFinished(channel);
 
   if(!chk) return;
 
diff --git a/src/sound/jukebox.h b/src/sound/jukebox.h
index d364c59..d1ae4e2 100644
--- a/src/sound/jukebox.h
+++ b/src/sound/jukebox.h
@@ -76,12 +76,16 @@ private:
   JukeBox operator=(const JukeBox&);
   /**********************************************/
 
-  typedef std::multimap<std::string, std::string>::value_type
+  typedef struct
+  {
+    std::string filename;
+    double      level;
+  } sample_info;
+  typedef std::multimap<std::string, sample_info>::value_type
     sound_sample;
-  typedef std::multimap<std::string, std::string>::iterator
+  typedef std::multimap<std::string, sample_info>::iterator
     sample_iterator;
-
-  std::multimap<std::string, std::string> m_soundsamples;
+  std::multimap<std::string, sample_info> m_soundsamples;
 
   std::map<int, Mix_Chunk*> chunks;
   Mix_Music* music;
@@ -169,7 +173,7 @@ private:
    * @return the channel used to play the sample
    * <i>loop</i>: -1 for loop forever, else number of times -1 to play
    */
-  int PlaySample (Mix_Chunk * sample, int loop=0);
+  int PlaySample (Mix_Chunk * sample, double level=1.0, int loop=0);
 };
 //-----------------------------------------------------------------------------
 #endif
diff --git a/src/sound/sound_sample.cpp b/src/sound/sound_sample.cpp
index fa3db97..613a5d9 100644
--- a/src/sound/sound_sample.cpp
+++ b/src/sound/sound_sample.cpp
@@ -24,25 +24,61 @@
 #include "sound/sound_sample.h"
 #include "sound/jukebox.h"
 
+std::map<int, SoundSample*> SoundSample::sound_samples_channel;
+
+void SoundSample::ChannelFinished(int channel)
+{
+  std::map<int, SoundSample*>::iterator it=sound_samples_channel.find(channel);
+
+  if (it != sound_samples_channel.end()) {
+    SoundSample* s = it->second;
+    s->channel = -1;
+    sound_samples_channel.erase(it);
+  }
+}
+
 SoundSample::SoundSample() : channel(-1)
 {}
 
-void SoundSample::Play(const std::string& category,
+SoundSample::~SoundSample()
+{
+  if (channel == -1)
+    return;
+
+  // removing sample from the table
+  std::map<int, SoundSample*>::iterator it=sound_samples_channel.find(channel);
+
+  if (it != sound_samples_channel.end()) {
+    SoundSample* s = it->second;
+    ASSERT(s == this);
+    sound_samples_channel.erase(it);
+  }
+}
+
+bool SoundSample::Play(const std::string& category,
                        const std::string& sample,
                        const int loop)
 {
-  channel = JukeBox::GetInstance()->Play(category, sample, loop);
+  if (!IsPlaying()) {
+    channel = JukeBox::GetInstance()->Play(category, sample, loop);
+    sound_samples_channel.insert(std::make_pair(channel, this));
+    return true;
+  }
+  return false;
 }
 
 void SoundSample::Stop()
 {
-  if (channel != -1)
+  if (IsPlaying())
     JukeBox::GetInstance()->Stop(channel);
   channel = -1;
 }
 
 bool SoundSample::IsPlaying()
 {
+  if (channel == -1)
+    return false;
+
   return Mix_Playing(channel)>0;
 }
 
diff --git a/src/sound/sound_sample.h b/src/sound/sound_sample.h
index 74d7619..c1a4d26 100644
--- a/src/sound/sound_sample.h
+++ b/src/sound/sound_sample.h
@@ -24,22 +24,29 @@
 #define SOUND_SAMPLE_H
 //-----------------------------------------------------------------------------
 #include <string>
+#include <map>
 //-----------------------------------------------------------------------------
 
 class SoundSample
 {
  private:
+  static std::map<int, SoundSample*> sound_samples_channel;
   int channel;
 
  public:
   SoundSample();
+  ~SoundSample();
 
-  void Play(const std::string& category,
+  // return false if sound can't be played because it is already playing
+  bool Play(const std::string& category,
             const std::string& sample,
             const int loop = 1);
   void Stop();
 
   bool IsPlaying();
+
+
+  static void ChannelFinished(int channel);
 };
 //-----------------------------------------------------------------------------
 #endif
diff --git a/src/team/custom_team.cpp b/src/team/custom_team.cpp
new file mode 100644
index 0000000..85f4ee6
--- /dev/null
+++ b/src/team/custom_team.cpp
@@ -0,0 +1,250 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Custom Team
+ *****************************************************************************/
+
+#include <cstring>
+#include <sstream>
+#include <iostream>
+#include <errno.h>
+#include <libxml/tree.h>
+
+#include "game/config.h"
+#include "team/custom_team.h"
+#include "team/custom_teams_list.h"
+#include "tool/file_tools.h"
+#include "tool/i18n.h"
+#include "tool/xml_document.h"
+
+CustomTeam::CustomTeam():characters_name_list()
+{
+ nb_characters = 10;
+ is_name_changed = false;
+}
+
+CustomTeam::CustomTeam (const std::string &custom_teams_dir, const std::string &id):characters_name_list(){
+std::string nomfich;
+  XmlReader   doc;
+
+  directory_name = custom_teams_dir+id+PATH_SEPARATOR;
+
+  // Load XML
+  nomfich = custom_teams_dir+id+ PATH_SEPARATOR "team.xml";
+
+  if (!doc.Load(nomfich))
+    throw "unable to load file of team data";
+
+  if (!XmlReader::ReadString(doc.GetRoot(), "name", name))
+    throw "Invalid file structure: cannot find a name for team ";
+
+
+  // Load character names
+  nb_characters = 10;
+
+  // Create the characters
+  xmlNodeArray nodes = XmlReader::GetNamedChildren(XmlReader::GetMarker(doc.GetRoot(), "team"), "character");
+  xmlNodeArray::const_iterator it = nodes.begin();
+  is_name_changed = false;
+  do
+  {
+
+    std::string character_name = "Unknown Soldier (it's all over)";
+
+      XmlReader::ReadString(*it, "name", character_name);
+      characters_name_list.push_back(character_name);
+
+
+    MSG_DEBUG("team", "Add %s in  custom team %s", character_name.c_str(), name.c_str());
+
+    // Did we reach the end ?
+    ++it;
+  } while (it != nodes.end() && characters_name_list.size() < nb_characters );
+
+
+
+}
+
+
+CustomTeam::~CustomTeam()
+{
+
+}
+
+
+void CustomTeam::Delete()
+{
+  if(!DeleteFile(directory_name+"team.xml")){
+    std::string file = directory_name + "team.xml";
+    std::cerr << "o "
+	      << Format(_("Error while deleting the file \"%s\". Unable to delete the custom team."),
+			file.c_str())
+	      << " " << strerror(errno)
+	      << std::endl;
+    return;
+  }
+  if(!DeleteFolder(directory_name))
+  {
+    std::cerr << "o "
+	      << Format(_("Error while deleting the directory \"%s\". Unable to delete the custom team."),
+			directory_name.c_str())
+	      << " " << strerror(errno)
+	      << std::endl;
+
+  }
+}
+
+
+std::vector<std::string> CustomTeam::GetCharactersNameList()
+{
+  std::cout<<"plop"<<std::endl;
+  std::vector<std::string> list = characters_name_list;
+  std::cout<<"plip"<<std::endl;
+  return list;
+}
+
+std::string CustomTeam::GetName()
+{
+  return name;
+}
+
+void CustomTeam::NewTeam()
+{
+  Config *config = Config::GetInstance();
+  int team_count = 0;
+do
+{
+    team_count++;
+    std::ostringstream oss;
+    oss << team_count;
+    // the default player name for custom teams
+    name = _("custom player");
+    name +="  "+oss.str();
+    directory_name = config->GetPersonalConfigDir() + "custom_team" PATH_SEPARATOR + FormatFileName(name) + PATH_SEPARATOR;
+
+}while(IsFolderExist(directory_name));
+
+    for(unsigned i = 1; i<(nb_characters+1); i++)
+    {
+
+     characters_name_list.push_back("");
+    }
+}
+
+bool CustomTeam::Save()
+{
+  Config *config = Config::GetInstance();
+  if(is_name_changed){
+      Delete();
+
+      directory_name = config->GetPersonalConfigDir() + "custom_team" PATH_SEPARATOR + FormatFileName(name) + PATH_SEPARATOR;
+      is_name_changed = false;
+  }
+
+
+  std::string rep = config->GetPersonalConfigDir();
+  // Create the directory if it doesn't exist
+  if (!config->MkdirPersonalConfigDir())
+  {
+    std::cerr << "o "
+	      << Format(_("Error while creating directory \"%s\": unable to store configuration file."),
+			rep.c_str())
+	      << " " << strerror(errno)
+	      << std::endl;
+    return false;
+  }
+  rep = config->GetPersonalConfigDir() + "custom_team" PATH_SEPARATOR;
+  if (!CreateFolder(config->GetPersonalConfigDir() + "custom_team" PATH_SEPARATOR))
+  {
+    std::cerr << "o "
+	      << Format(_("Error while creating directory \"%s\": unable to store configuration file."),
+			rep.c_str())
+	      << " " << strerror(errno)
+	      << std::endl;
+    return false;
+  }
+
+    rep = directory_name;
+
+  if (!CreateFolder(directory_name))
+  {
+    std::cerr << "o "
+	      << Format(_("Error while creating directory \"%s\": unable to store configuration file."),
+			rep.c_str())
+	      << " " << strerror(errno)
+	      << std::endl;
+    return false;
+  }
+
+  return SaveXml();
+}
+
+bool CustomTeam::SaveXml()
+{
+
+
+  XmlWriter doc;
+
+   std::string unix_name = name;
+
+    for(unsigned i = 0;i<unix_name.size();i++)
+    {
+      if(unix_name[i] == ' '){
+          unix_name[i] = '_';
+      }
+    }
+
+
+  std::string m_filename = directory_name + "team.xml";
+  doc.Create(m_filename, "resources", "1.0", "utf-8");
+  xmlNode *root = doc.GetRoot();
+  doc.WriteElement(root, "name", name);
+
+
+  xmlNode* team_node = xmlAddChild(root, xmlNewNode(NULL /* empty prefix */, (const xmlChar*)"team"));
+
+
+  for(unsigned i=0 ; i < characters_name_list.size() ; i++){
+    xmlNode* character = xmlAddChild(team_node, xmlNewNode(NULL /* empty prefix */, (const xmlChar*)"character"));
+    doc.WriteElement(character, "name", characters_name_list[i]);
+  }
+
+  return doc.Save();
+}
+
+
+void CustomTeam::SetName(const std::string &new_name)
+{
+  if(name.compare(new_name) != 0){
+    is_name_changed = true;
+  }
+  name = new_name;
+
+}
+
+void CustomTeam::SetCharacterName(unsigned id, const std::string &new_name)
+{
+  if(id < nb_characters)
+  {
+    characters_name_list[id]=new_name;
+  }
+
+}
+
+
+
diff --git a/src/team/custom_team.h b/src/team/custom_team.h
new file mode 100644
index 0000000..b1c7f3a
--- /dev/null
+++ b/src/team/custom_team.h
@@ -0,0 +1,59 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Custom team
+ *****************************************************************************/
+
+#ifndef CUSTOM_TEAM_H
+#define CUSTOM_TEAM_H
+//-----------------------------------------------------------------------------
+#include <list>
+#include <vector>
+
+//-----------------------------------------------------------------------------
+
+
+class CustomTeam
+{
+  public :
+    CustomTeam();
+    CustomTeam (const std::string &teams_dir, const std::string &id);
+    ~CustomTeam();
+    std::string GetName();
+    std::vector<std::string> GetCharactersNameList();
+    void NewTeam();
+    bool Save();
+    void Delete();
+
+    void SetName(const std::string &new_name);
+    void SetCharacterName(unsigned id, const std::string &new_name);
+
+    protected :
+    bool is_name_changed;
+    uint nb_characters;
+    std::string name;
+    std::string directory_name;
+    std::vector<std::string> characters_name_list;
+
+    bool SaveXml();
+
+};
+
+
+//-----------------------------------------------------------------------------
+#endif
diff --git a/src/team/custom_teams_list.cpp b/src/team/custom_teams_list.cpp
new file mode 100644
index 0000000..723f093
--- /dev/null
+++ b/src/team/custom_teams_list.cpp
@@ -0,0 +1,137 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Team handling
+ *****************************************************************************/
+
+#include "game/config.h"
+#include "team/custom_teams_list.h"
+#include "team/custom_team.h"
+#include "tool/file_tools.h"
+#include "tool/i18n.h"
+#include <iostream>
+#include <algorithm>
+
+CustomTeamsList::CustomTeamsList()
+{
+  LoadList();
+}
+
+CustomTeamsList::~CustomTeamsList()
+{
+
+  if (!singleton)
+  {
+    fprintf(stderr, "Destructor still called on unexisting CustomTeamsList\n");
+    return;
+  }
+
+Clear();
+  singleton = NULL;
+}
+
+void CustomTeamsList::Clear(){
+   for(unsigned i = 0; i <  full_list.size(); i++)
+  {
+    delete full_list[i];
+  }
+  full_list.clear();
+}
+
+CustomTeam *CustomTeamsList::GetByName(std::string name)
+{
+  for(unsigned i = 0; i <  full_list.size(); i++)
+  {
+    if(full_list[i]->GetName() == name){
+      return full_list[i];
+    }
+  }
+  return NULL;
+}
+
+std::vector<CustomTeam *> CustomTeamsList::GetList(){
+
+  return full_list;
+
+}
+
+unsigned CustomTeamsList::GetNumCustomTeam()
+{
+ return full_list.size();
+}
+
+void CustomTeamsList::LoadList()
+{
+
+  Clear();
+  const Config *config = Config::GetInstance();
+
+  // Load personal custom teams
+  std::string dirname = config->GetPersonalConfigDir() + "custom_team" PATH_SEPARATOR;
+  FolderSearch *f = OpenFolder(dirname);
+  if (f) {
+    const char *name;
+    while ((name = FolderSearchNext(f)) != NULL) LoadOneTeam(dirname, name);
+    CloseFolder(f);
+  } else {
+    std::cerr << std::endl
+      << Format(_("Cannot open the custom teams directory (%s)!"), dirname.c_str())
+      << std::endl;
+  }
+
+
+
+  Sort();
+
+}
+
+
+void CustomTeamsList::LoadOneTeam(const std::string &dir, const std::string &custom_team_name)
+{
+  // Skip '.', '..' and hidden files
+  if (custom_team_name[0] == '.') return;
+
+  // Is it a directory ?
+  if (!IsFolderExist(dir+custom_team_name)) return;
+
+  // Add the team
+  try {
+    full_list.push_back(new CustomTeam(dir, custom_team_name));
+
+  }
+
+  catch (char const *error) {
+    std::cerr << std::endl
+              << Format(_("Error loading team :")) << custom_team_name <<":"<< error
+              << std::endl;
+    return;
+  }
+}
+
+void CustomTeamsList::Sort()
+{
+  std::sort( full_list.begin(), full_list.end(), CustomTeamsList::CompareItems );
+}
+
+bool CustomTeamsList::CompareItems( CustomTeam* p1, CustomTeam* p2 )
+{
+return ( p1->GetName().compare(p2->GetName())< 0);
+
+}
+
+
diff --git a/src/team/custom_teams_list.h b/src/team/custom_teams_list.h
new file mode 100644
index 0000000..b17f1fe
--- /dev/null
+++ b/src/team/custom_teams_list.h
@@ -0,0 +1,59 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Handle custom team list
+ *****************************************************************************/
+
+#ifndef CUSTOM_TEAMS_LIST_H
+#define CUSTOM_TEAMS_LIST_H
+//-----------------------------------------------------------------------------
+
+#include "include/singleton.h"
+#include <string>
+#include <vector>
+
+//-----------------------------------------------------------------------------
+
+// Forward declarations
+class CustomTeam;
+
+class CustomTeamsList : public Singleton<CustomTeamsList>
+{
+
+public:
+
+  CustomTeamsList();
+  ~CustomTeamsList();
+  void LoadList();
+  std::vector<CustomTeam *> GetList();
+  CustomTeam* GetByName(std::string name);
+  unsigned GetNumCustomTeam();
+
+protected :
+  void Clear();
+  void Sort();
+  std::vector<CustomTeam *> full_list;
+  void LoadOneTeam (const std::string &dir, const std::string &file);
+  static bool CompareItems( CustomTeam* p1, CustomTeam* p2 );
+};
+
+
+inline CustomTeamsList &GetCustomTeamsList(void) { return CustomTeamsList::GetRef(); };
+
+//-----------------------------------------------------------------------------
+#endif
diff --git a/src/team/macro.h b/src/team/macro.h
index 016cfed..4666c4a 100644
--- a/src/team/macro.h
+++ b/src/team/macro.h
@@ -40,11 +40,11 @@
 
 #define FOR_EACH_CHARACTER(team,character) \
   FOR_EACH_LIVING_AND_DEAD_CHARACTER(team,character) \
-  if (!character -> IsGhost())
+  	if (!character -> IsGhost())
 
-#define FOR_EACH_LIVING_CHARACTER(team,character) \
+#define FOR_EACH_LIVING_CHARACTER(team,character)    \
   FOR_EACH_LIVING_AND_DEAD_CHARACTER(team,character) \
-  if (!character -> IsDead())
+  	if (!character -> IsDead())
 
 #define FOR_ALL_LIVING_AND_DEAD_CHARACTER(team, character) \
   FOR_EACH_TEAM(team) \
@@ -52,16 +52,16 @@
 
 #define FOR_ALL_CHARACTERS(team,character) \
   FOR_EACH_TEAM(team) \
-  FOR_EACH_CHARACTER(*team,character)
+  	FOR_EACH_CHARACTER(*team,character)
 
 #define FOR_ALL_LIVING_CHARACTERS(team,character) \
   FOR_EACH_TEAM(team) \
   FOR_EACH_LIVING_CHARACTER(*team,character)
 
-#define FOR_ALL_LIVING_ENEMIES(shooter,team,character) \
-  FOR_EACH_TEAM(team) \
-  if (!(*team)->IsSameAs(shooter.GetTeam())) \
-  FOR_EACH_LIVING_CHARACTER(*team,character)
+#define FOR_ALL_LIVING_ENEMIES(shooter,team,character)	\
+  FOR_EACH_TEAM(team)					\
+  	if (!(*team)->IsSameAs(shooter.GetTeam()))	\
+  		FOR_EACH_LIVING_CHARACTER(*team,character)
 
 //-----------------------------------------------------------------------------
 #endif
diff --git a/src/team/team.cpp b/src/team/team.cpp
index 454fda8..9829f70 100644
--- a/src/team/team.cpp
+++ b/src/team/team.cpp
@@ -33,6 +33,8 @@
 #include "map/camera.h"
 #include "map/map.h"
 #include "network/network.h"
+#include "sound/jukebox.h"
+#include "team/custom_team.h"
 #include "tool/debug.h"
 #include "tool/i18n.h"
 #include "tool/file_tools.h"
@@ -122,6 +124,10 @@ bool Team::LoadCharacters()
 
     // Create a new character and add him to the team
     Character new_character(*this, character_name, body);
+    if((attached_custom_team != NULL) && (IsLocal()) && !Network::IsConnected())
+    {
+      new_character.SetCustomName(attached_custom_team->GetCharactersNameList().at(characters.size()));
+    }
     characters.push_back(new_character);
     active_character = characters.begin(); // we need active_character to be initialized here !!
     if (!characters.back().PutRandomly(false, world.GetDistanceBetweenCharacters()))
@@ -248,6 +254,8 @@ int Team::NbAliveCharacter() const
 // Prepare a new team turn
 void Team::PrepareTurn()
 {
+  current_turn++;
+
   // Get a living character if possible
   if (ActiveCharacter().IsDead())
   {
@@ -260,6 +268,18 @@ void Team::PrepareTurn()
                           !is_camera_saved);
   CharacterCursor::GetInstance()->FollowActiveCharacter();
 
+  // Updating weapon ammos (some weapons are not available from the beginning)
+  std::list<Weapon *> l_weapons_list = WeaponsList::GetInstance()->GetList() ;
+  std::list<Weapon *>::iterator itw = l_weapons_list.begin(),
+  end = l_weapons_list.end();
+  for (; itw != end ; ++itw) {
+    if ((*itw)->AvailableAfterTurn() == (int)current_turn) {
+      // this weapon is available now
+      m_nb_ammos[ (*itw)->GetType() ] += (*itw)->ReadInitialNbAmmo();
+      m_nb_units[ (*itw)->GetType() ] += (*itw)->ReadInitialNbUnit();
+    }
+  }
+
   // Active last weapon use if EnoughAmmo
   if (AccessWeapon().EnoughAmmo())
     AccessWeapon().Select();
@@ -267,6 +287,10 @@ void Team::PrepareTurn()
     active_weapon = WeaponsList::GetInstance()->GetWeapon(Weapon::WEAPON_BAZOOKA);
     AccessWeapon().Select();
   }
+
+  // Sound the bell, so the local players know when it is their turn
+  if (IsLocal())
+    JukeBox::GetInstance()->Play("share", "start_turn");
 }
 
 Character& Team::ActiveCharacter() const
@@ -340,6 +364,8 @@ Character* Team::FindByIndex(uint index)
 
 void Team::LoadGamingData()
 {
+  current_turn = 0;
+
   // Reset ammos
   m_nb_ammos.clear();
   m_nb_units.clear();
@@ -351,8 +377,15 @@ void Team::LoadGamingData()
   m_nb_units.assign(l_weapons_list.size(), 0);
 
   for (; itw != end ; ++itw) {
-    m_nb_ammos[ (*itw)->GetType() ] = (*itw)->ReadInitialNbAmmo();
-    m_nb_units[ (*itw)->GetType() ] = (*itw)->ReadInitialNbUnit();
+    if ((*itw)->AvailableAfterTurn() == 0) {
+      // this weapon is available now
+      m_nb_ammos[ (*itw)->GetType() ] = (*itw)->ReadInitialNbAmmo();
+      m_nb_units[ (*itw)->GetType() ] = (*itw)->ReadInitialNbUnit();
+    } else {
+      // this weapon will be available later
+      m_nb_ammos[ (*itw)->GetType() ] = 0;
+      m_nb_units[ (*itw)->GetType() ] = 0;
+    }
   }
 
   // Disable non-working weapons in network games
@@ -402,3 +435,17 @@ bool Team::IsActiveTeam() const
 {
   return this == &ActiveTeam();
 }
+
+void Team::SetDefaultPlayingConfig()
+{
+  SetLocal();
+  SetPlayerName("");
+  SetNbCharacters(GameMode::GetInstance()->nb_characters);
+}
+
+void Team::AttachCustomTeam(CustomTeam *custom_team)
+{
+      std::cout<<"Team::Attach"<<std::endl;
+ attached_custom_team = custom_team;
+}
+
diff --git a/src/team/team.h b/src/team/team.h
index 83c3fba..1fbec23 100644
--- a/src/team/team.h
+++ b/src/team/team.h
@@ -31,6 +31,7 @@
 #include "weapon/weapon.h"
 
 class Character;
+class CustomTeam;
 
 typedef enum {
   TEAM_human_local,
@@ -74,6 +75,9 @@ class Team
     iterator active_character;
     Weapon *active_weapon;
     uint nb_characters;
+    uint current_turn;
+
+    CustomTeam *attached_custom_team;
 
     team_player_type_t type_of_player;
 
@@ -165,12 +169,19 @@ class Team
   // true if the team belong to a local AI
     bool IsLocalAI() const { return (type_of_player == TEAM_ai_local); };
 
+    bool IsRemote() const { return (type_of_player == TEAM_remote); };
+
     bool IsActiveTeam() const;
 
     void SetLocal() { type_of_player = TEAM_human_local; };
     void SetLocalAI() { type_of_player = TEAM_ai_local; };
     void SetRemote() { type_of_player = TEAM_remote; };
 
+  // reset characters number, type_of_player and player name
+    void SetDefaultPlayingConfig();
+
+  // Custom team
+    void AttachCustomTeam(CustomTeam*);
 };
 
 #endif /* TEAM_H */
diff --git a/src/team/team_energy.cpp b/src/team/team_energy.cpp
index 4cb108d..7723cd7 100644
--- a/src/team/team_energy.cpp
+++ b/src/team/team_energy.cpp
@@ -165,17 +165,6 @@ void TeamEnergy::SetValue(uint new_energy)
   energy_list.AddValue(new_energy);
 }
 
-void TeamEnergy::SetRanking(uint _rank)
-{
-  rank = _rank;
-  new_rank = _rank;
-}
-
-void TeamEnergy::NewRanking(uint _new_rank)
-{
-  new_rank = _new_rank;
-}
-
 // Move energy bar (change in ranking)
 void TeamEnergy::Move()
 {
@@ -200,7 +189,7 @@ void TeamEnergy::Move()
 
     dx = (int)(((float)new_rank - rank) * (BAR_WIDTH + BAR_SPACING) * ((global_time->Read() - move_start_time) / MOVE_DURATION));
 
-    // displacement in arc of circle only when losing place ranking
+    // displacement in arc only when losing place ranking
     if( new_rank > rank ) {
       dy = (int)((BAR_HEIGHT * ((float)rank - new_rank)) * 0.5 *
            sin( M_PI * ((global_time->Read() - move_start_time) / MOVE_DURATION)));
@@ -228,10 +217,3 @@ void TeamEnergy::FinalizeMove()
   status = EnergyStatusWait;
   return;
 }
-
-bool TeamEnergy::IsMoving () const
-{
-  if( dx != 0 || dy != 0 )
-    return true;
-  return false;
-}
diff --git a/src/team/team_energy.h b/src/team/team_energy.h
index 2d2bf7b..6972325 100644
--- a/src/team/team_energy.h
+++ b/src/team/team_energy.h
@@ -70,6 +70,7 @@ protected:
 public:
   typedef std::vector<EnergyValue*>::const_iterator const_iterator;
   uint GetMaxValue() const { return m_max_value; };
+  uint GetDuration() const { return at(size()-1)->GetDuration(); }
 };
 
 class TeamEnergy
@@ -109,21 +110,20 @@ class TeamEnergy
 
     TeamEnergy(Team * _team);
     ~TeamEnergy();
-    void Config(uint _current_energy,
-                uint _max_energy);
+    void Config(uint _current_energy, uint _max_energy);
 
     void Refresh();
     void Draw(const Point2i& pos);
 
     void SetIcon(const Surface & icon);
-    void SetValue(uint nv_energie);
+    void SetValue(uint new_energy);
 
-    void SetRanking(uint classem); // no animation
-    void NewRanking(uint nv_classem);
+    void SetRanking(uint value) { rank = new_rank = value; }
+    void NewRanking(uint value) { new_rank = value; }
     // Move energy bar (change ranking)
     void Move();
-    bool IsMoving() const;
-    // Move energy bar immediatly to there destination
+    bool IsMoving() const { return (dx!=0 || dy!=0); }
+    // Move energy bar immediatly to its destination
     void FinalizeMove();
 };
 
diff --git a/src/team/teams_list.cpp b/src/team/teams_list.cpp
index 8bfb945..ef0e4b1 100644
--- a/src/team/teams_list.cpp
+++ b/src/team/teams_list.cpp
@@ -76,7 +76,7 @@ void TeamsList::NextTeam ()
   Team* next = GetNextTeam();
   GetTeamsList().SetActive (next->GetId());
   Action a(Action::ACTION_GAMELOOP_NEXT_TEAM, next->GetId());
-  Network::GetInstance()->SendAction(&a);
+  Network::GetInstance()->SendAction(a);
 }
 
 //-----------------------------------------------------------------------------
@@ -187,13 +187,20 @@ void TeamsList::LoadGamingData()
   iterator it=playing_list.begin(), end=playing_list.end();
 
   // Load the data of all teams
-  for (; it != end; ++it) (**it).LoadGamingData();
+  for (; it != end; ++it) {
+
+    // Local or AI ?
+    if ( (*it)->IsLocal() && (*it)->GetPlayerName() == "AI-stupid")
+      (*it)->SetLocalAI();
+
+    (**it).LoadGamingData();
+  }
 }
 
 void TeamsList::RandomizeFirstPlayer()
 {
   active_team = playing_list.begin();
-  int skip = randomSync.GetLong(0, playing_list.size() - 1);
+  int skip = RandomSync().GetLong(0, playing_list.size() - 1);
   for(int i = 0; i < skip; i++)
     active_team++;
 }
@@ -274,7 +281,7 @@ void TeamsList::InitList (const std::list<ConfigTeam> &lst)
   Clear();
   std::list<ConfigTeam>::const_iterator it=lst.begin(), end=lst.end();
   for (; it != end; ++it) {
-    AddTeam (*it, false);
+    AddTeam (*it, true, false);
   }
   active_team = playing_list.begin();
 }
@@ -458,18 +465,32 @@ void TeamsList::Clear()
 
 //-----------------------------------------------------------------------------
 
-void TeamsList::AddTeam (const ConfigTeam &the_team_cfg, bool generate_error)
+void TeamsList::AddTeam(Team* the_team, int pos, const ConfigTeam &the_team_cfg,
+			bool is_local)
+{
+  ASSERT(the_team != NULL);
+
+  if (is_local) {
+    the_team->SetLocal();
+  } else {
+    the_team->SetRemote();
+  }
+  UpdateTeam(the_team, the_team_cfg);
+
+  selection.push_back (pos);
+  playing_list.push_back (the_team);
+
+  active_team = playing_list.begin();
+}
+
+void TeamsList::AddTeam(const ConfigTeam &the_team_cfg, bool is_local,
+			bool generate_error)
 {
   int pos;
   Team *the_team = FindById (the_team_cfg.id, pos);
   if (the_team != NULL) {
 
-    // set the player name and number of characters
-    the_team->SetPlayerName(the_team_cfg.player_name);
-    the_team->SetNbCharacters(the_team_cfg.nb_characters);
-
-    selection.push_back (pos);
-    playing_list.push_back (the_team);
+    AddTeam(the_team, pos, the_team_cfg, is_local);
 
   } else {
     std::string msg = Format(_("Can't find team %s!"), the_team_cfg.id.c_str());
@@ -478,45 +499,76 @@ void TeamsList::AddTeam (const ConfigTeam &the_team_cfg, bool generate_error)
     else
       std::cout << "! " << msg << std::endl;
   }
-  active_team = playing_list.begin();
 }
 
 //-----------------------------------------------------------------------------
 
-void TeamsList::UpdateTeam (const ConfigTeam &the_team_cfg, bool generate_error)
+void TeamsList::UpdateTeam(Team* the_team, const ConfigTeam &the_team_cfg)
+{
+  ASSERT(the_team != NULL);
+
+  // set the player name and number of characters
+  the_team->SetPlayerName(the_team_cfg.player_name);
+  the_team->SetNbCharacters(the_team_cfg.nb_characters);
+}
+
+void TeamsList::UpdateTeam (const std::string& old_team_id,
+			    const ConfigTeam &the_team_cfg)
 {
   int pos;
-  Team *the_team = FindById (the_team_cfg.id, pos);
-  if (the_team != NULL) {
 
-    // set the player name and number of characters
-    the_team->SetPlayerName(the_team_cfg.player_name);
-    the_team->SetNbCharacters(the_team_cfg.nb_characters);
+  if (old_team_id == the_team_cfg.id) {
+    // this is a simple update
+
+    Team *the_team = FindById (the_team_cfg.id, pos);
+    if (the_team != NULL) {
+      UpdateTeam(the_team, the_team_cfg);
+    } else {
+      Error(Format(_("Can't find team %s!"), the_team_cfg.id.c_str()));
+      return;
+    }
 
   } else {
-    std::string msg = Format(_("Can't find team %s!"), the_team_cfg.id.c_str());
-    if (generate_error)
-      Error (msg);
-    else
-      std::cout << "! " << msg << std::endl;
+
+    // here we are replacing a team by another one
+    Team *the_old_team = FindById (old_team_id, pos);
+    if (the_old_team == NULL) {
+      Error(Format(_("Can't find team %s!"), old_team_id.c_str()));
+      return;
+    }
+
+    Team *the_team = FindById (the_team_cfg.id, pos);
+    if (the_team == NULL) {
+      Error(Format(_("Can't find team %s!"), old_team_id.c_str()));
+      return;
+    }
+
+    bool is_local = (the_old_team->IsLocal() || the_old_team->IsLocalAI());
+    DelTeam(the_old_team);
+    AddTeam(the_team, pos, the_team_cfg, is_local);
   }
+
 }
 
 //-----------------------------------------------------------------------------
 
-void TeamsList::DelTeam (const std::string &id)
+void TeamsList::DelTeam(Team* the_team)
 {
-  int pos;
-  Team *equipe = FindById (id, pos);
-  ASSERT(equipe != NULL);
+  uint pos = 0;
+
+  ASSERT(the_team != NULL);
 
-  selection_iterator it = find(selection.begin(), selection.end(), (uint)pos);
+  the_team->SetDefaultPlayingConfig();
+
+  selection_iterator it = find(selection.begin(), selection.end(), pos);
 
   if (it != selection.end()) {
     selection.erase(it);
   }
 
-  iterator playing_it = find(playing_list.begin(), playing_list.end(), equipe);
+  iterator playing_it = find(playing_list.begin(), playing_list.end(), the_team);
+
+  ASSERT(playing_it != playing_list.end());
 
   if (playing_it != playing_list.end()) {
     playing_list.erase(playing_it);
@@ -525,6 +577,14 @@ void TeamsList::DelTeam (const std::string &id)
   active_team = playing_list.begin();
 }
 
+void TeamsList::DelTeam(const std::string &id)
+{
+  int pos;
+  Team *the_team = FindById (id, pos);
+
+  DelTeam(the_team);
+}
+
 //-----------------------------------------------------------------------------
 
 void TeamsList::SetActive(const std::string &id)
@@ -546,6 +606,25 @@ void TeamsList::SetActive(const std::string &id)
 
 //-----------------------------------------------------------------------------
 
+std::string TeamsList::GetLocalHeadCommanders() const
+{
+  std::string nickname;
+
+  for (std::vector<Team*>::iterator it = GetTeamsList().playing_list.begin();
+       it != GetTeamsList().playing_list.end();
+       it++) {
+    if ((*it)->IsLocal()) {
+      if (nickname != "") nickname += "+";
+
+      nickname += (*it)->GetPlayerName();
+    }
+  }
+
+  return nickname;
+}
+
+//-----------------------------------------------------------------------------
+
 Team& ActiveTeam()
 {
   return GetTeamsList().ActiveTeam();
diff --git a/src/team/teams_list.h b/src/team/teams_list.h
index c6e8b7b..911c015 100644
--- a/src/team/teams_list.h
+++ b/src/team/teams_list.h
@@ -48,6 +48,10 @@ private:
   void LoadOneTeam (const std::string &dir, const std::string &file);
   void LoadList();
 
+  void AddTeam(Team* the_team, int pos, const ConfigTeam& the_team_cfg, bool is_local);
+  void UpdateTeam(Team* the_team, const ConfigTeam &the_team_cfg);
+  void DelTeam(Team* the_team);
+
 protected:
   friend class Singleton<TeamsList>;
   TeamsList();
@@ -64,11 +68,11 @@ public:
   void RandomizeFirstPlayer();
 
   // Add a new team to playing, and change active team
-  void AddTeam (const ConfigTeam& the_team_cfg, bool generate_error=true);
-  void UpdateTeam (const ConfigTeam& the_team_cfg, bool generate_error=true);
-  void DelTeam (const std::string &id);
+  void AddTeam(const ConfigTeam& the_team_cfg, bool is_local, bool generate_error = true);
+  void UpdateTeam(const std::string &old_team_id, const ConfigTeam& the_team_cfg);
+  void DelTeam(const std::string &id);
   void SetActive(const std::string &id);
-  void InitList (const std::list<ConfigTeam> &lst);
+  void InitList(const std::list<ConfigTeam> &lst);
   void InitEnergy ();
   void RefreshEnergy (); //Refresh energy bar
   void RefreshSort (); //Refresh energy bar position
@@ -82,6 +86,9 @@ public:
   // Find a team by its id or index (in playing full_list)
   Team* FindPlayingById(const std::string &id, int &index);
   Team* FindPlayingByIndex(uint index);
+
+  // returns name1+name2+name3
+  std::string GetLocalHeadCommanders() const;
 };
 
 //-----------------------------------------------------------------------------
diff --git a/src/tool/error.cpp b/src/tool/error.cpp
index 803db18..e6473a0 100644
--- a/src/tool/error.cpp
+++ b/src/tool/error.cpp
@@ -20,6 +20,7 @@
  *****************************************************************************/
 
 #include "include/base.h"
+#include "include/constant.h"
 #include <cstdlib>
 #include <iostream>
 #include <signal.h>
@@ -56,6 +57,13 @@ void MissedAssertion (const char *filename, unsigned long line,
 #endif
 }
 
+std::string FormatError(const char *filename, unsigned long line,
+			const std::string &txt)
+{
+  return Format(_("Error in %s:%lu (Wormux %s) : %s"), filename, line, Constants::WORMUX_VERSION.c_str(), txt.c_str());
+}
+
+
 CError::CError (const char *filename, unsigned long line,
                 const std::string &txt)
   : m_filename(filename), m_txt(txt), m_line(line)
@@ -66,21 +74,19 @@ CError::~CError() throw()
 
 const char* CError::what() const throw()
 {
-  return m_txt.c_str();
+  return FormatError(m_filename.c_str(), m_line, m_txt).c_str();
 }
 
 std::ostream& CError::operator<< (std::ostream &os) const
 {
-  os << m_txt;
+  os << FormatError(m_filename.c_str(), m_line, m_txt);
   return os;
 }
 
 void TriggerError (const char *filename, unsigned long line,
                    const std::string &txt)
 {
-  std::cerr << "! "
-            << Format(_("Error in %s:%lu"), filename, line)
-            << ": " << txt << std::endl;
+  std::cerr << "! " << FormatError(filename, line, txt) << std::endl;
 
   ASSERT(false);
   throw CError (filename, line, txt);
diff --git a/src/tool/file_tools.cpp b/src/tool/file_tools.cpp
index c920011..208cd3e 100644
--- a/src/tool/file_tools.cpp
+++ b/src/tool/file_tools.cpp
@@ -22,10 +22,15 @@
 #include "tool/file_tools.h"
 #include <fstream>
 #include <sys/stat.h>
+#include <errno.h>
+
 #ifdef WIN32
    // To get SHGetSpecialFolderPath
 #  define _WIN32_IE   0x400
 #  include <shlobj.h>
+#  include <io.h>
+#  include <direct.h>
+#  undef DeleteFile  // windows.h defines it I think
 #else
 #  include <stdlib.h> // getenv
 #endif
@@ -51,6 +56,61 @@ bool IsFolderExist(const std::string &name)
   return (stat_file.st_mode & S_IFMT) == S_IFDIR;
 }
 
+#ifndef WIN32
+#  define MKDIR(dir) (mkdir(dir, 0750))
+#else
+#  define MKDIR(dir) (_mkdir(dir))
+#  define rmdir(dir) (_rmdir(dir))
+#endif
+
+bool CreateFolder(const std::string &name)
+{
+  if (IsFolderExist(name))
+    return true; // folder is already existing, nothing to do :-)
+
+  std::string dir = name;
+  std::string subdir;
+  std::size_t pos;
+
+  // Create the needed parent folders
+  pos = dir.find("/");
+  while (pos != dir.npos) {
+    subdir = dir.substr(0, pos);
+    printf("%s\n", subdir.c_str());
+
+    if (subdir.size() != 0) {
+      // Create the directory if it doesn't exist
+      if (MKDIR(subdir.c_str()) != 0 && errno != EEXIST)
+        return false;
+    }
+    pos = dir.find("/", pos+1);
+  }
+
+  // Create the directory if it doesn't exist
+  if (MKDIR(dir.c_str()) != 0 && errno != EEXIST)
+    return false;
+
+  return true;
+}
+
+
+// Delete the folder if it exists
+bool DeleteFolder(const std::string &name)
+{
+  if (IsFolderExist(name)){
+    return (rmdir(name.c_str())==0);
+  }
+  return false;
+}
+
+
+// Delete the file if it exists
+bool DeleteFile(const std::string &name)
+{
+  return (remove(name.c_str()) == 0);
+}
+
+
 // Find the extension part of a filename
 std::string FileExtension (const std::string &name)
 {
@@ -178,3 +238,26 @@ std::string TranslateDirectory(const std::string &directory)
   }
   return txt;
 }
+
+std::string FormatFileName(const std::string &name)
+{
+ std::string formated_name = name;
+
+    for(unsigned i = 0;i<formated_name.size();i++)
+    {
+      if(formated_name[i] == ' '){
+          formated_name[i] = '_';
+      }
+      if(formated_name[i] == '.'){
+          formated_name[i] = '_';
+      }
+      if(formated_name[i] == '/'){
+          formated_name[i] = '_';
+      }
+      if(formated_name[i] == '\\'){
+          formated_name[i] = '_';
+      }
+    }
+  return formated_name;
+}
+
diff --git a/src/tool/file_tools.h b/src/tool/file_tools.h
index 70f420a..0f2199c 100644
--- a/src/tool/file_tools.h
+++ b/src/tool/file_tools.h
@@ -29,6 +29,16 @@ bool DoesFileExist(const std::string &name);
 // Check if the folder exists
 bool IsFolderExist(const std::string &name);
 
+// Create the folder if it does not exist yet
+bool CreateFolder(const std::string &name);
+
+// Delete the folder if it exists
+bool DeleteFolder(const std::string &name);
+
+
+// Delete the file if it exists
+bool DeleteFile(const std::string &name);
+
 // Find the extension part of a filename
 std::string FileExtension(const std::string &name);
 
@@ -44,4 +54,6 @@ FolderSearch *OpenFolder(const std::string& dirname);
 const char* FolderSearchNext(FolderSearch *f);
 void CloseFolder(FolderSearch *f);
 
+std::string FormatFileName(const std::string &name);
+
 #endif
diff --git a/src/tool/i18n.h b/src/tool/i18n.h
index d7c8ce5..23f2f6d 100644
--- a/src/tool/i18n.h
+++ b/src/tool/i18n.h
@@ -37,7 +37,11 @@
 #define _(X) localization(X)
 char * localization(const char * buffer);
 #else
+#ifdef ENABLE_NLS /* gettext */
 #define _(X) gettext(X)
+#else
+#define _(X) X
+#endif /* ENABLE_NLS aka gettext */
 #endif /* USE_FRIBIDI */
 
 std::string Format (const char *format, ...);
diff --git a/src/tool/isnan.h b/src/tool/isnan.h
index fcf62ed..3fa65fb 100644
--- a/src/tool/isnan.h
+++ b/src/tool/isnan.h
@@ -19,74 +19,28 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  ******************************************************************************
- * isNan macro, taken from Inkscape. Thx!
- *****************************************************************************/
-
-/*
- * Temporary fix for various misdefinitions of isnan().
- * isnan() is becoming undef'd in some .h files. 
- * #include this last in your .cpp file to get it right.
+ * isNaN function, defined using C++ limits and not with C99
  *
  * The problem is that isnan and isfinite are part of C99 but aren't part of
  * the C++ standard (which predates C99).
  *
- * Authors:
- *   Inkscape groupies and obsessive-compulsives
- *
- * Copyright (C) 2004 authors
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- *
- * 2005 modification hereby placed in public domain.  Probably supercedes the 2004 copyright
- * for the code itself.
- */
+ *****************************************************************************/
 
-#include <math.h>
-/* You might try changing the above to <cmath> if you have problems.
- * Whether you use math.h or cmath, you may need to edit the .cpp file
- * and/or other .h files to use the same header file.
- */
+#include <limits>
 
-#if defined(__isnan)
-# define isNaN(_a) (__isnan(_a))
-#elif defined(__APPLE__) && __GNUC__ == 3
-# define isNaN(_a) (__isnan(_a))    /* MacOSX/Darwin definition < 10.4 */
-#elif defined(WIN32) || defined(_isnan)
-# define isNaN(_a) (_isnan(_a))     /* Win32 definition */
-#elif defined(isnan) || defined(__FreeBSD__) || defined(__osf__)
-# define isNaN(_a) (isnan(_a))      /* GNU definition */
-#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2
-# define isNaN(_a) (isnan(_a))      /* GNU definition */
-#else
-# define isNaN(_a) (std::isnan(_a))
+#ifdef NAN
+#undef NAN // please don't use C99 NAN
 #endif
-/* If the above doesn't work, then try (a != a).
- * Also, please report a bug as per http://www.inkscape.org/report_bugs.php,
- * giving information about what platform and compiler version you're using.
- */
 
+static inline double getNaN()
+{
+  return std::numeric_limits<double>::quiet_NaN();
+}
 
-#if defined(__isfinite)
-# define isFinite(_a) (__isfinite(_a))
-#elif defined(__APPLE__) && __GNUC__ == 3
-# define isFinite(_a) (__isfinite(_a))  /* MacOSX/Darwin definition < 10.4 */
-#elif defined(__sgi)
-# define isFinite(_a) (_isfinite(_a))
-#elif defined(isfinite)
-# define isFinite(_a) (isfinite(_a))
-#elif defined(__osf__)
-# define isFinite(_a) (finite(_a) && !isNaN(_a))
-#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2
-#include  <ieeefp.h>
-#define isFinite(_a) (finite(_a) && !isNaN(_a))
-#else
-# define isFinite(_a) (std::isfinite(_a))
-#endif
-/* If the above doesn't work, then try (finite(_a) && !isNaN(_a)) or (!isNaN((_a) - (_a))).
- * Also, please report a bug as per http://www.inkscape.org/report_bugs.php,
- * giving information about what platform and compiler version you're using.
- */
-
+static inline bool isNaN(double x)
+{
+  return (x != x);
+}
 
 #endif /* __ISNAN_H__ */
 
diff --git a/src/tool/math_tools.h b/src/tool/math_tools.h
index 5cf0488..bb495a2 100644
--- a/src/tool/math_tools.h
+++ b/src/tool/math_tools.h
@@ -39,31 +39,31 @@ T BorneTpl (const T &valeur, const T &min, const T &max){
 }
 
 // Force a value into range [min;max]
-long inline InRange_Long (const long &valeur, const long &min, const long &max) {
+inline long InRange_Long (const long &valeur, const long &min, const long &max) {
   return BorneTpl (valeur, min, max);
 }
-double inline InRange_Double (const double &valeur, const double &min, const double &max) {
+inline double InRange_Double (const double &valeur, const double &min, const double &max) {
   return BorneTpl (valeur, min, max);
 }
 
 // Invert an angle along the vertical axis
-double inline InverseAngle (const double &angle) {
+inline double InverseAngle (const double &angle) {
   if (angle < 0)
     return -M_PI -angle;
   return M_PI - angle;
 }
 
-double inline InverseAngleDeg (const double &angle) {
+inline double InverseAngleDeg (const double &angle) {
   if (angle < 0)
     return -180 - angle;
   return 180 - angle;
 }
 
-double inline InverseAngleRad (const double &angle) { return InverseAngle(angle); }
+inline double InverseAngleRad (const double &angle) { return InverseAngle(angle); }
 
 // Absolute value
-double inline AbsoluteValue (const double x) { return fabs(x); }
-bool inline EqualsZero (const double x) { return AbsoluteValue(x) <= EPS_ZERO; }
+inline double AbsoluteValue (const double x) { return fabs(x); }
+inline bool EqualsZero (const double x) { return AbsoluteValue(x) <= EPS_ZERO; }
 
 #ifdef _MSC_VER
 // MIT licensed from http://opensource.adobe.com/cmath_8hpp-source.html
diff --git a/src/tool/random.cpp b/src/tool/random.cpp
index 98100ab..d2b07d3 100644
--- a/src/tool/random.cpp
+++ b/src/tool/random.cpp
@@ -20,56 +20,90 @@
  *****************************************************************************/
 
 #include <time.h>
-#include <stdlib.h>
+#include "tool/debug.h"
 #include "tool/random.h"
 
-Random randomObj;
+RandomGenerator::RandomGenerator() :
+  next(0), initialized(false)
+{
+}
+
+RandomGenerator::~RandomGenerator()
+{}
 
-Random::Random()
+void RandomGenerator::InitRandom()
 {
-  srand(time(NULL));
+  SetRand(time(NULL));
 }
 
-int Random::GetSign()
+void RandomGenerator::SetRand(uint seed)
 {
-  if(rand() % 2) return 1;
-  else return -1;
+  MSG_DEBUG("random", "srand: %d", seed);
+  next = seed;
+  initialized = true;
 }
 
-bool Random::GetBool()
+
+/******************************************************************************
+ * From "man 3 rand"
+ * POSIX.1-2001  gives the following example of an implementation of rand() and
+ * srand(), possibly useful when one needs the same sequence on two different
+ * machines.
+ ******************************************************************************/
+
+/* RAND_MAX assumed to be 32767 */
+uint RandomGenerator::GetRand()
+{
+  ASSERT(initialized == true);
+
+  next = next * 1103515245 + 12345;
+  return((uint)(next/65536) % 32768);
+}
+
+#define WORMUX_RAND_MAX 32767
+
+bool RandomGenerator::GetBool()
+{
+  double middle = WORMUX_RAND_MAX/2;
+  return (GetRand() <= middle);
+}
+
+/**
+ * Get a random number between 0.0 and 1.0
+ *
+ * @return A number between 0.0 and 1.0
+ */
+double RandomGenerator::GetDouble()
 {
-  return rand() % 2 == 0;
+  return 1.0*GetRand()/(WORMUX_RAND_MAX + 1.0);
 }
 
-// Get a random value between min and max
-long Random::GetLong(long min, long max)
+/**
+ *  Get a random number between min and max
+ */
+long RandomGenerator::GetLong(long min, long max)
 {
   return min + (long)GetDouble(max - min + 1);
 }
 
-int Random::GetInt(int min, int max)
+int RandomGenerator::GetInt(int min, int max)
 {
   return GetLong(min, max);
 }
 
-double Random::GetDouble(double min, double max)
+uint RandomGenerator::GetUint(uint min, uint max)
 {
-  return min + GetDouble(max - min);
+  return (uint)GetLong(min, max);
 }
 
-double Random::GetDouble(double max)
+double RandomGenerator::GetDouble(double min, double max)
 {
-  return max * GetDouble();
+  return min + GetDouble(max - min);
 }
 
-/**
- * Get a random number between 0.0 and 1.0
- *
- * @return A number between 0.0 and 1.0
- */
-double Random::GetDouble()
+double RandomGenerator::GetDouble(double max)
 {
-  return 1.0 * rand() / (RAND_MAX + 1.0);
+  return max * GetDouble();
 }
 
 /**
@@ -78,16 +112,31 @@ double Random::GetDouble()
  * @param rect The rectangle in which the returned point will be.
  * @return a random point.
  */
-Point2i Random::GetPoint(const Rectanglei &rect)
+Point2i RandomGenerator::GetPoint(const Rectanglei &rect)
 {
   Point2i topPoint = rect.GetPosition();
   Point2i bottomPoint = rect.GetBottomRightPoint();
+  long x = GetLong(topPoint.x, bottomPoint.x);
+  long y = GetLong(topPoint.y, bottomPoint.y);
+  return Point2i( x, y );
+}
 
-  return Point2i( GetLong(topPoint.x, bottomPoint.x),
-      GetLong(topPoint.y, bottomPoint.y) );
+Point2i RandomGenerator::GetPoint(const Point2i &pt)
+{
+  long x = GetLong(0, pt.x - 1);
+  long y = GetLong(0, pt.y - 1);
+  return Point2i( x, y );
 }
 
-Point2i Random::GetPoint(const Point2i &pt)
+int RandomGenerator::GetSign()
+{
+  if (GetBool()) return 1;
+  else return -1;
+}
+
+// =============================================================
+
+RandomLocalGen& RandomLocal()
 {
-  return Point2i( GetLong(0, pt.x - 1), GetLong(0, pt.y - 1) );
+  return RandomLocalGen::GetRef();
 }
diff --git a/src/tool/random.h b/src/tool/random.h
index 07921e0..62fca96 100644
--- a/src/tool/random.h
+++ b/src/tool/random.h
@@ -22,24 +22,42 @@
 #ifndef RANDOM_H
 #define RANDOM_H
 
-#include "rectangle.h"
-#include "point.h"
-
-class Random{
- public:
-  Random();
-
-  static bool GetBool();
-  static long GetLong(long min, long max);
-  static int GetInt(int min, int max);
-  static double GetDouble();
-  static double GetDouble(double max);
-  static double GetDouble(double min, double max);
-  static Point2i GetPoint(const Rectanglei &rect);
-  static Point2i GetPoint(const Point2i &pt);
-  static int GetSign();
+#include "include/singleton.h"
+#include "tool/point.h"
+#include "tool/rectangle.h"
+
+class RandomGenerator
+{
+private:
+  uint next;
+  bool initialized;
+
+protected:
+  virtual void SetRand(uint seed);
+  virtual uint GetRand();
+
+public:
+  RandomGenerator();
+  virtual ~RandomGenerator();
+  virtual void InitRandom();
+
+  bool GetBool();
+  double GetDouble();
+  double GetDouble(double max);
+  double GetDouble(double min, double max);
+  int GetInt(int min, int max);
+  uint GetUint(uint min, uint max);
+  long GetLong(long min, long max);
+  Point2i GetPoint(const Rectanglei &rect);
+  Point2i GetPoint(const Point2i &pt);
+  int GetSign();
+};
+
+
+class RandomLocalGen : public RandomGenerator, public Singleton<RandomLocalGen>
+{
 };
 
-extern Random randomObj;
+RandomLocalGen& RandomLocal();
 
 #endif
diff --git a/src/tool/resource_manager.cpp b/src/tool/resource_manager.cpp
index 30be62f..cc9942b 100644
--- a/src/tool/resource_manager.cpp
+++ b/src/tool/resource_manager.cpp
@@ -63,7 +63,7 @@ void ResourceManager::AddDataPath(const std::string& base_path)
 int ResourceManager::LoadInt(const Profile *profile, const std::string& resource_name) const
 {
   int tmp = 0;
-  xmlNode* elem = GetElement(profile, "int", resource_name);
+  const xmlNode* elem = GetElement(profile, "int", resource_name);
   if (elem == NULL)
     Error("ResourceManager: can't find int resource \""+resource_name+"\" in profile "+profile->filename);
   if (!profile->doc->ReadIntAttr(elem, "value", tmp))
@@ -74,7 +74,7 @@ int ResourceManager::LoadInt(const Profile *profile, const std::string& resource
 double ResourceManager::LoadDouble(const Profile *profile, const std::string& resource_name) const
 {
   double tmp = 0.0;
-  xmlNode* elem = GetElement(profile, "double", resource_name);
+  const xmlNode* elem = GetElement(profile, "double", resource_name);
   if (elem == NULL)
     Error("ResourceManager: can't find double resource \""+resource_name+"\" in profile "+profile->filename);
   if (!profile->doc->ReadDoubleAttr(elem, "value", tmp))
@@ -84,7 +84,7 @@ double ResourceManager::LoadDouble(const Profile *profile, const std::string& re
 
 Color ResourceManager::LoadColor(const Profile *profile, const std::string& resource_name) const
 {
-  xmlNode* elem = GetElement(profile, "color", resource_name);
+  const xmlNode* elem = GetElement(profile, "color", resource_name);
   if ( elem == NULL)
     Error("ResourceManager: can't find color resource \""+resource_name+"\" in profile "+profile->filename);
 
@@ -99,7 +99,7 @@ Color ResourceManager::LoadColor(const Profile *profile, const std::string& reso
 
 Point2i ResourceManager::LoadPoint2i(const Profile *profile, const std::string& resource_name) const
 {
-  xmlNode* elem = GetElement(profile, "point", resource_name);
+  const xmlNode* elem = GetElement(profile, "point", resource_name);
   if ( elem == NULL)
     Error("ResourceManager: can't find point resource \""+resource_name+"\" in profile "+profile->filename);
 
@@ -114,7 +114,7 @@ Point2i ResourceManager::LoadPoint2i(const Profile *profile, const std::string&
 
 Point2d ResourceManager::LoadPoint2d(const Profile *profile, const std::string& resource_name) const
 {
-  xmlNode* elem = GetElement(profile, "point", resource_name);
+  const xmlNode* elem = GetElement(profile, "point", resource_name);
   if ( elem == NULL)
     Error("ResourceManager: can't find point resource \""+resource_name+"\" in profile "+profile->filename);
 
@@ -130,7 +130,7 @@ Point2d ResourceManager::LoadPoint2d(const Profile *profile, const std::string&
 MouseCursor ResourceManager::LoadMouseCursor(const Profile *profile, const std::string& resource_name,
 					     Mouse::pointer_t _pointer_id) const
 {
-  xmlNode* elem = GetElement ( profile, "mouse_cursor", resource_name);
+  const xmlNode* elem = GetElement ( profile, "mouse_cursor", resource_name);
   if(elem == NULL)
     Error("ResourceManager: can't find mouse cursor resource \""+resource_name+"\" in profile "+profile->filename);
 
@@ -200,13 +200,14 @@ void ResourceManager::UnLoadXMLProfile( Profile *profile) const
    delete profile;
 }
 
-xmlNode*  ResourceManager::GetElement( const Profile *profile, const std::string& resource_type, const std::string& resource_name) const
+const xmlNode*  ResourceManager::GetElement( const Profile *profile, const std::string& resource_type,
+					     const std::string& resource_name) const
 {
-  xmlNode* elem = profile->doc->Access(profile->doc->GetRoot(), resource_type, resource_name);
+  const xmlNode* elem = profile->doc->Access(profile->doc->GetRoot(), resource_type, resource_name);
 
   if(elem == NULL) {
     std::string r_name = resource_name;
-    xmlNode* cur_elem = profile->doc->GetRoot();
+    const xmlNode* cur_elem = profile->doc->GetRoot();
 
     while((r_name.find("/") != r_name.npos) && (cur_elem != NULL)) {
       cur_elem = profile->doc->Access(cur_elem, "section", r_name.substr(0, r_name.find("/")));
@@ -220,7 +221,7 @@ xmlNode*  ResourceManager::GetElement( const Profile *profile, const std::string
 
 Surface ResourceManager::LoadImage( const Profile *profile, const std::string& resource_name) const
 {
-  xmlNode* elem = GetElement ( profile, "surface", resource_name);
+  const xmlNode* elem = GetElement ( profile, "surface", resource_name);
   if(elem == NULL)
     Error("ResourceManager: can't find image resource \""+resource_name+"\" in profile "+profile->filename);
 
@@ -238,11 +239,11 @@ Surface ResourceManager::LoadImage( const Profile *profile, const std::string& r
 
 Sprite *ResourceManager::LoadSprite(const Profile *profile, const std::string& resource_name) const
 {
-  xmlNode* elem_sprite = GetElement(profile, "sprite", resource_name);
+  const xmlNode* elem_sprite = GetElement(profile, "sprite", resource_name);
   if(elem_sprite == NULL)
     Error("ResourceManager: can't find sprite resource \""+resource_name+"\" in profile "+profile->filename);;
 
-  xmlNode* elem_image = profile->doc->GetMarker(elem_sprite, "image");
+  const xmlNode* elem_image = profile->doc->GetMarker(elem_sprite, "image");
 
   if(elem_image == NULL)
     Error("ResourceManager: can't load (sprite) resource " + resource_name);
@@ -257,7 +258,7 @@ Sprite *ResourceManager::LoadSprite(const Profile *profile, const std::string& r
   bool alpha = true;
   Sprite *sprite = NULL;
 
-  xmlNode* elem_grid = profile->doc->GetMarker(elem_image, "grid");
+  const xmlNode* elem_grid = profile->doc->GetMarker(elem_image, "grid");
 
   if ( elem_grid == NULL ) {
     ASSERT(resource_name != "barrel");
@@ -301,7 +302,7 @@ Sprite *ResourceManager::LoadSprite(const Profile *profile, const std::string& r
 
   ASSERT(sprite != NULL);
 
-  xmlNode* elem = profile->doc->GetMarker(elem_sprite, "animation");
+  const xmlNode* elem = profile->doc->GetMarker(elem_sprite, "animation");
   if ( elem != NULL ) {
     std::string str;
     // Set the frame speed
@@ -318,6 +319,18 @@ Sprite *ResourceManager::LoadSprite(const Profile *profile, const std::string& r
       else
         std::cerr << "Unrecognized xml option loop_mode=\"" << str << "\" in resource " << resource_name;
     }
+
+    if(profile->doc->ReadStringAttr(elem, "loop_wait", str))
+    {
+        sprite->animation.SetLoopWait(atoi(str.c_str()));
+    }
+
+    if(profile->doc->ReadStringAttr(elem, "loop_wait_random", str))
+    {
+        sprite->animation.SetLoopWaitRandom(atoi(str.c_str()));
+    }
+
+
   }
   return sprite;
 }
diff --git a/src/tool/resource_manager.h b/src/tool/resource_manager.h
index 1d58b19..0f596f0 100644
--- a/src/tool/resource_manager.h
+++ b/src/tool/resource_manager.h
@@ -80,7 +80,8 @@ class ResourceManager
    Surface LoadImage(const Profile *profile, const std::string& resource_name) const;
    Sprite *LoadSprite(const Profile *profile, const std::string& resource_name) const;
    Surface GenerateMap(Profile *profile, InfoMap::Island_type generator, const int width, const int height) const;
-   xmlNode*  GetElement(const Profile *profile, const std::string& ressource_type, const std::string& ressource_name) const;
+   const xmlNode*  GetElement(const Profile *profile, const std::string& ressource_type,
+			      const std::string& ressource_name) const;
 
  private:
    std::string base_path;
diff --git a/src/tool/text_handling.cpp b/src/tool/text_handling.cpp
index ca9b5e6..c4bbcaa 100644
--- a/src/tool/text_handling.cpp
+++ b/src/tool/text_handling.cpp
@@ -22,7 +22,7 @@
 #include "tool/text_handling.h"
 #include "tool/copynpaste.h"
 
-bool MoveCursorLeft(const std::string& text, std::string::size_type& pos)
+static bool MoveCursorLeft(const std::string& text, std::string::size_type& pos)
 {
   if (pos != 0)
     {
@@ -33,7 +33,7 @@ bool MoveCursorLeft(const std::string& text, std::string::size_type& pos)
   return false;
 }
 
-bool MoveCursorRight(const std::string& text, std::string::size_type& pos)
+static bool MoveCursorRight(const std::string& text, std::string::size_type& pos)
 {
   if (pos < text.size())
     {
@@ -44,7 +44,7 @@ bool MoveCursorRight(const std::string& text, std::string::size_type& pos)
   return false;
 }
 
-bool RemoveUTF8CharBefore(std::string& text, std::string::size_type& pos)
+static bool RemoveUTF8CharBefore(std::string& text, std::string::size_type& pos)
 {
   if (pos != 0) {
     while ((text[--pos] & 0xc0) == 0x80)
@@ -53,11 +53,11 @@ bool RemoveUTF8CharBefore(std::string& text, std::string::size_type& pos)
       }
     text.erase(pos, 1);
     return true;
-  } 
+  }
   return false;
 }
 
-bool RemoveUTF8CharAfter(std::string& text, std::string::size_type& pos)
+static bool RemoveUTF8CharAfter(std::string& text, std::string::size_type& pos)
 {
   if (pos < text.size()) {
     MoveCursorRight(text, pos);
@@ -68,7 +68,7 @@ bool RemoveUTF8CharAfter(std::string& text, std::string::size_type& pos)
 }
 
 
-bool InsertUTF8Char(std::string& text, std::string::size_type& pos, const SDL_keysym& key)
+static bool InsertUTF8Char(std::string& text, std::string::size_type& pos, const SDL_keysym& key)
 {
   // check cursor position
   if (pos > text.size()) {
@@ -94,15 +94,18 @@ bool InsertUTF8Char(std::string& text, std::string::size_type& pos, const SDL_ke
 	}
       return true;
     }
+
+  // this is not a valid char
   return false;
 }
 
-bool processModifier(std::string& text, std::string::size_type& pos, const SDL_keysym& key)
+static bool processModifier(std::string& text, std::string::size_type& pos, const SDL_keysym& key)
 {
   switch (key.sym)
     {
     case SDLK_v:
     case SDLK_y:
+      // copy/paste
       return RetrieveBuffer(text, pos);
     default:
       return false;
@@ -111,7 +114,7 @@ bool processModifier(std::string& text, std::string::size_type& pos, const SDL_k
 
 bool TextHandle(std::string& text, std::string::size_type& pos, const SDL_keysym& key)
 {
-  bool r = false;
+  bool r = true;
 
   switch (key.sym) {
 
@@ -130,19 +133,22 @@ bool TextHandle(std::string& text, std::string::size_type& pos, const SDL_keysym
     // all those keys are forbidden!
     r = false;
     break;
-    
+
+    // we return true for all the following cases because even if action has failed,
+    // the action has not be handled by something else
   case SDLK_LEFT:
-    r = MoveCursorLeft(text, pos);
+    MoveCursorLeft(text, pos);
     break;
   case SDLK_RIGHT:
-    r = MoveCursorRight(text, pos);
+    MoveCursorRight(text, pos);
     break;
   case SDLK_BACKSPACE:
-    r = RemoveUTF8CharBefore(text, pos);
+    RemoveUTF8CharBefore(text, pos);
     break;
   case SDLK_DELETE:
-    r = RemoveUTF8CharAfter(text, pos);
+    RemoveUTF8CharAfter(text, pos);
     break;
+
   default:
     if (SDL_GetModState()&(KMOD_CTRL|KMOD_META))
       r = processModifier(text, pos, key);
diff --git a/src/tool/vector2.h b/src/tool/vector2.h
index 8d9ae7b..ceb5eb9 100644
--- a/src/tool/vector2.h
+++ b/src/tool/vector2.h
@@ -340,7 +340,7 @@ template<class T> class Vector2
     }
 
     /**
-     * [RCL]: using doubles, to keep the precision consistent with rest of 
+     * [RCL]: using doubles, to keep the precision consistent with rest of
      * functions here
     */
     Vector2<T> GetNormal() const {
@@ -396,7 +396,7 @@ template<class T> class Vector2
     }
 
     /** Transform polar coordinate */
-    static Vector2<T> FromPolarCoordinates(double norm, double angle) { return Vector2<T>(norm*cos(angle), norm*sin(angle)); }
+    static Vector2<T> FromPolarCoordinates(double norm, double angle) { return Vector2<T>(T(norm*cos(angle)), T(norm*sin(angle))); }
 
     /**
      *  Compute the angle of point M in the Cartesian plane
diff --git a/src/tool/xml_document.cpp b/src/tool/xml_document.cpp
index 7432a42..535b45f 100644
--- a/src/tool/xml_document.cpp
+++ b/src/tool/xml_document.cpp
@@ -27,6 +27,28 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 
+#ifdef DEBUG
+#include <cstring>
+void display_xml_tree(const xmlNode* root, uint level, bool neigh)
+{
+  char space[1024] = "";
+  for (uint i=0; i < level; i++)
+    strcat(space, "    ");
+
+  printf("%s %d - %s\n", space, root->type, root->name);
+  for (const xmlNode* c = root->children; c; c = c->next) {
+    if (c->type == XML_ELEMENT_NODE)
+      display_xml_tree(c, level+1, false);
+  }
+
+  if (neigh) {
+    for (const xmlNode* n = root->next; n; n = n->next)
+      if (n->type == XML_ELEMENT_NODE)
+	display_xml_tree(n, level, false);
+  }
+}
+#endif
+
 void XmlReader::Reset()
 {
    if (doc)
@@ -66,7 +88,7 @@ bool XmlReader::LoadFromString(const std::string &contents)
   return IsOk();
 }
 
-std::string XmlReader::ExportToString()
+std::string XmlReader::ExportToString() const
 {
   xmlChar *buffer = NULL;
   int     length  = 0;
@@ -78,71 +100,37 @@ std::string XmlReader::ExportToString()
   return ret;
 }
 
-#if DEBUG
-static int count = 0;
-#endif
-
-xmlNode* XmlReader::GetMarker(xmlNode* x, const std::string &name)
+const xmlNode* XmlReader::GetMarker(const xmlNode* x, const std::string &name)
 {
-#ifdef DEBUG
-  if (!count)
-    MSG_DEBUG("xml", "  Getting marker %s", name.c_str());
-  count++;
-#endif
-  for (; x; x = x->next)
-  {
-    if (x->children)
+  ASSERT(x->type == XML_ELEMENT_NODE);
+
+  // is it already the right xmlNode ?
+  if (name.empty() || name == (const char*)x->name)
+    return x;
+
+  // look at its children
+  for (const xmlNode* tmp = x->children; tmp; tmp = tmp->next) {
+    if (tmp->type == XML_ELEMENT_NODE && name == (const char*)tmp->name)
     {
-      xmlNode *node = GetMarker(x->children, name);
-      if (node)
-      {
-#ifdef DEBUG
-        count--;
-#endif
-        return node;
-      }
+      return tmp;
     }
+  }
 
-    if (name.empty() || name == (const char*)x->name) // xmlpp::Node::get_children
-    {
 #ifdef DEBUG
-      MSG_DEBUG("xml", "  Found at %p", x);
-      count--;
-#endif
-      return x;
+  if (IsLOGGING("xml.tree")) {
+    std::string looked_name = std::string((const char*)(x->name)) + std::string(">") + name;
+    for (const xmlNode *parent = x->parent;
+	 parent != xmlDocGetRootElement(x->doc) && parent && parent->name;
+	 parent = parent->parent) {
+      looked_name = std::string((const char*)(parent->name)) + std::string(">") + looked_name;
     }
-  };
-#ifdef DEBUG
-  count--;
-  if (!count)
-    MSG_DEBUG("xml", "  Getting marker %s", name.c_str());
+    fprintf(stderr, "Fail to read %s\n", looked_name.c_str());
+  }
 #endif
   return NULL;
 }
 
-static void getAny(xmlNode* father, const std::string& name, xmlNodeArray& tab)
-{
-  for (father = father; father; father = father->next)
-  {
-    if (father->children)
-      getAny(father->children, name, tab);
-    if (name == (const char*)father->name)
-      tab.push_back(father);
-  }
-}
-
-// Return any child matching name
-xmlNodeArray XmlReader::GetNamed(xmlNode* father, const std::string& name)
-{
-  xmlNodeArray tab;
-
-  // Load members
-  getAny(father, name, tab);
-
-  return tab;
-}
-
-xmlNodeArray XmlReader::GetNamedChildren(xmlNode* father, const std::string& name)
+xmlNodeArray XmlReader::GetNamedChildren(const xmlNode* father, const std::string& name)
 {
   xmlNodeArray tab;
   MSG_DEBUG("xml", "Search children of name %s", name.c_str());
@@ -155,68 +143,52 @@ xmlNodeArray XmlReader::GetNamedChildren(xmlNode* father, const std::string& nam
   }
   return tab;
 }
-xmlNodeArray XmlReader::GetNamedNeighbours(xmlNode* first, const std::string& name)
-{
-  xmlNodeArray tab;
-  MSG_DEBUG("xml", "Search neighbours of name %s", name.c_str());
-
-  // Load members
-  for (; first; first = first->next)
-  {
-    if (name == (const char*)first->name)
-      tab.push_back(first);
-  }
-  return tab;
-}
 
-xmlNode* XmlReader::Access(xmlNode* x,
-                           const std::string &name,
-                           const std::string &attr_name)
+const xmlNode* XmlReader::Access(const xmlNode* x,
+				 const std::string &name,
+				 const std::string &attr_name)
 {
-#ifdef DEBUG
-  if (!count)
-    MSG_DEBUG("xml", "Accessing attribute '%s' in element of name '%s' at %p...",
-              attr_name.c_str(), name.c_str(), x);
-  count++;
-#endif
-  for (; x; x = x->next)
-  {
-    if (x->children)
-    {
-      xmlNode* node = Access(x->children, name, attr_name);
-      if (node)
-      {
-#ifdef DEBUG
-        count--;
-#endif
-        return node;
-      }
-    }
+  ASSERT(x->type == XML_ELEMENT_NODE);
 
-    if (!xmlStrcmp(x->name, (const xmlChar *)name.c_str()))
-    {
-      xmlAttr* attr = xmlHasProp(x, (const xmlChar*)"name");
-      if (attr)
+  // is it already the right xmlNode ?
+  if (name == (const char*)x->name) {
+
+    xmlAttr* attr = xmlHasProp((xmlNode*)x, // cast to make libxml2 happy...
+			       (const xmlChar*)"name");
+    if (attr)
       {
         xmlChar *value = xmlGetProp(attr->parent, attr->name);
         if (attr_name == (const char*)value)
-        {
-          xmlFree(value);
-#ifdef DEBUG
-          MSG_DEBUG("xml", "    Found %p", x);
-          count--;
-#endif
-          return x;
-        }
+	  {
+	    xmlFree(value);
+	    return x;
+	  }
         xmlFree(value);
       }
+    return NULL;
+  }
+
+  // look at its children
+  for (const xmlNode* tmp = x->children; tmp; tmp = tmp->next) {
+    if (tmp->type == XML_ELEMENT_NODE && name == (const char*)tmp->name)
+    {
+      xmlAttr* attr = xmlHasProp((xmlNode*)tmp, // cast to make libxml2 happy...
+				 (const xmlChar*)"name");
+      if (attr)
+	{
+	  xmlChar *value = xmlGetProp(attr->parent, attr->name);
+	  if (attr_name == (const char*)value)
+	    {
+	      xmlFree(value);
+	      return tmp;
+	    }
+	  xmlFree(value);
+	}
+
+      // do not return as other child may have the same "name" but a different attr
+      // return NULL;
     }
   }
-#ifdef DEBUG
-  count--;
-  if (!count)
-    MSG_DEBUG("xml", "  Getting marker %s", name.c_str());
-#endif
 
   return NULL;
 }
@@ -226,17 +198,17 @@ xmlNode* XmlReader::Access(xmlNode* x,
  * - throwing exeptions: some of the nodes may really be absent, and might be
  *   more costly when comparing generic error handling and special case
  */
-bool XmlReader::ReadString(xmlNode* x,
+bool XmlReader::ReadString(const xmlNode* x,
                            const std::string &name,
                            std::string &output)
 {
-  xmlNode* elem = GetMarker(x, name);
+  const xmlNode* elem = GetMarker(x, name);
   MSG_DEBUG("xml", "Reading string of name '%s' from %p:", name.c_str(), elem);
   return ReadMarkerValue(elem, output);
 }
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadDouble(xmlNode *x,
+bool XmlReader::ReadDouble(const xmlNode *x,
                            const std::string &name,
                            double &output)
 {
@@ -246,7 +218,7 @@ bool XmlReader::ReadDouble(xmlNode *x,
 }
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadInt(xmlNode* x,
+bool XmlReader::ReadInt(const xmlNode* x,
                         const std::string &name,
                         int &output)
 {
@@ -256,7 +228,7 @@ bool XmlReader::ReadInt(xmlNode* x,
 }
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadUint(xmlNode* x,
+bool XmlReader::ReadUint(const xmlNode* x,
                          const std::string &name,
                          uint &output)
 {
@@ -271,7 +243,7 @@ bool XmlReader::ReadUint(xmlNode* x,
 }
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadBool (xmlNode* x,
+bool XmlReader::ReadBool (const xmlNode* x,
                           const std::string &name,
                           bool &output)
 {
@@ -281,7 +253,7 @@ bool XmlReader::ReadBool (xmlNode* x,
 }
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadMarkerValue(xmlNode* marker,
+bool XmlReader::ReadMarkerValue(const xmlNode* marker,
                                 std::string &output)
 {
   if (!marker || !marker->children)
@@ -304,13 +276,14 @@ bool XmlReader::ReadMarkerValue(xmlNode* marker,
 }
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadStringAttr(xmlNode* x,
+bool XmlReader::ReadStringAttr(const xmlNode* x,
                                const std::string &name,
                                std::string &output)
 {
   ASSERT (x != NULL);
 
-  xmlAttr *attr = xmlHasProp(x, (const xmlChar *)name.c_str()); //xmlpp::Attribute::get_attribute
+  xmlAttr *attr = xmlHasProp((xmlNode*)x, // cast to make libxml2 happy
+			     (const xmlChar *)name.c_str()); //xmlpp::Attribute::get_attribute
   if (!attr)
   {
     MSG_DEBUG("xml", " Attribute '%s' not found", name.c_str());
@@ -328,7 +301,7 @@ bool XmlReader::ReadStringAttr(xmlNode* x,
 }
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadIntAttr(xmlNode* x,
+bool XmlReader::ReadIntAttr(const xmlNode* x,
                             const std::string &name,
                             int &output)
 {
@@ -339,7 +312,7 @@ bool XmlReader::ReadIntAttr(xmlNode* x,
 }
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadUintAttr(xmlNode* x,
+bool XmlReader::ReadUintAttr(const xmlNode* x,
                              const std::string &name,
                              unsigned int &output)
 {
@@ -354,7 +327,7 @@ bool XmlReader::ReadUintAttr(xmlNode* x,
 }
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadBoolAttr(xmlNode* x,
+bool XmlReader::ReadBoolAttr(const xmlNode* x,
                              const std::string &name,
                              bool &output)
 {
@@ -367,7 +340,7 @@ bool XmlReader::ReadBoolAttr(xmlNode* x,
 
 
 /** @see XmlReader::ReadString comment */
-bool XmlReader::ReadDoubleAttr(xmlNode* x,
+bool XmlReader::ReadDoubleAttr(const xmlNode* x,
                                const std::string &name,
                                double &output)
 {
@@ -381,12 +354,13 @@ bool XmlReader::IsOk() const
   return doc != NULL;
 }
 
-xmlNode* XmlReader::GetRoot() const
+const xmlNode* XmlReader::GetRoot() const
 {
   ASSERT(IsOk());
-  xmlNode* root = xmlDocGetRootElement(doc);
+  const xmlNode* root = xmlDocGetRootElement(doc);
   ASSERT(root != NULL);
-  return root->children;
+
+  return root;
 }
 
 //-----------------------------------------------------------------------------
@@ -415,15 +389,16 @@ bool XmlWriter::IsOk() const
   return (m_doc != NULL) && (m_root != NULL);
 }
 
-void XmlWriter::WriteElement(xmlNode* x,
+xmlNode *XmlWriter::WriteElement(xmlNode* x,
                              const std::string &name,
                              const std::string &value)
 {
   xmlNode *node = xmlAddChild(x, xmlNewNode(NULL /* empty prefix */,
-                                           (const xmlChar*)name.c_str()));
+					    (const xmlChar*)name.c_str()));
   xmlNode *text = xmlNewText((const xmlChar*)value.c_str());
   xmlAddChild(node, text);
   m_save = false;
+  return node;
 }
 
 void XmlWriter::WriteComment(xmlNode* x,
@@ -449,7 +424,7 @@ bool XmlWriter::Create(const std::string &filename,const std::string &root,
   return true;
 }
 
-xmlNode*  XmlWriter::GetRoot()
+xmlNode* XmlWriter::GetRoot() const
 {
   ASSERT(m_root != NULL);
   return m_root;
@@ -464,7 +439,7 @@ bool XmlWriter::Save()
   return (result != -1);
 }
 
-std::string XmlWriter::SaveToString()
+std::string XmlWriter::SaveToString() const
 {
    xmlChar *buffer = NULL;
    int     length  = 0;
diff --git a/src/tool/xml_document.h b/src/tool/xml_document.h
index 9badaaf..c77cbe0 100644
--- a/src/tool/xml_document.h
+++ b/src/tool/xml_document.h
@@ -12,7 +12,7 @@
 // Forward declaration
 typedef struct _xmlNode xmlNode;
 typedef struct _xmlDoc xmlDoc;
-typedef std::vector<xmlNode*> xmlNodeArray;
+typedef std::vector<const xmlNode*> xmlNodeArray;
 
 class XmlReader
 {
@@ -26,65 +26,61 @@ public:
 
   // Load an XML document from a string in memory
   bool LoadFromString(const std::string &contents);
-  std::string ExportToString();
+  std::string ExportToString() const;
 
   bool IsOk() const;
 
   // Return the *exploitable* root (use root->parent for the real one) */
-  xmlNode* GetRoot() const;
+  const xmlNode* GetRoot() const;
 
-  // Return any child matching name
-  static xmlNodeArray GetNamed(xmlNode* father, const std::string& name);
-  // Return the Children matching name
-  static xmlNodeArray GetNamedChildren(xmlNode* father, const std::string& name);
-  // Return the neighbours node matching name
-  static xmlNodeArray GetNamedNeighbours(xmlNode* first, const std::string& name);
+  // Return the direct children matching name
+  static xmlNodeArray GetNamedChildren(const xmlNode* father, const std::string& name);
 
   // get a attribute marker
-  static bool ReadString(xmlNode* father,
+  static bool ReadString(const xmlNode* father,
                          const std::string &name,
                          std::string &output);
-  static bool ReadDouble(xmlNode* father,
+  static bool ReadDouble(const xmlNode* father,
                          const std::string &name,
                          double &output);
-  static bool ReadInt(xmlNode* father,
+  static bool ReadInt(const xmlNode* father,
                       const std::string &name,
                       int &output);
-  static bool ReadUint(xmlNode* father,
+  static bool ReadUint(const xmlNode* father,
                        const std::string &name,
                        unsigned int &output);
-  static bool ReadBool(xmlNode* father,
+  static bool ReadBool(const xmlNode* father,
                        const std::string &name,
                        bool &output);
 
   // get an XML element
-  static xmlNode* GetMarker(xmlNode* x,
-                              const std::string &name);
+  static const xmlNode* GetMarker(const xmlNode* x,
+				  const std::string &name);
 
   // Access to the 'anchor' <[name] name="[attr_name]"> : have to be uniq !
-  static xmlNode* Access(xmlNode* x,
-                         const std::string &name,
-                         const std::string &attr_name);
+  static const xmlNode* Access(const xmlNode* x,
+			       const std::string &name,
+			       const std::string &attr_name);
 
   // Lit un attribut d'un noeud
-  static bool ReadStringAttr(xmlNode* x,
+  static bool ReadStringAttr(const xmlNode* x,
                              const std::string &name,
                              std::string &output);
-  static bool ReadDoubleAttr(xmlNode* x,
+  static bool ReadDoubleAttr(const xmlNode* x,
                              const std::string &name,
                              double &output);
-  static bool ReadIntAttr(xmlNode* x,
+  static bool ReadIntAttr(const xmlNode* x,
                           const std::string &name,
                           int &output);
-  static bool ReadUintAttr(xmlNode* x,
+  static bool ReadUintAttr(const xmlNode* x,
                            const std::string &name,
                            unsigned int &output);
-  static bool ReadBoolAttr(xmlNode* x,
+  static bool ReadBoolAttr(const xmlNode* x,
                            const std::string &name,
                            bool &output);
 private:
   // Read marker value
-  static bool ReadMarkerValue(xmlNode* marker, std::string &output);
+  static bool ReadMarkerValue(const xmlNode* marker, std::string &output);
   void Reset();
 };
 
@@ -114,9 +110,9 @@ public:
 
   bool IsOk() const;
 
-  xmlNode* GetRoot();
+  xmlNode *GetRoot() const;
 
-  void WriteElement(xmlNode* x,
+  xmlNode *WriteElement(xmlNode* x,
                     const std::string &name,
                     const std::string &value);
 
@@ -125,7 +121,7 @@ public:
 
   bool Save();
 
-  std::string SaveToString();
+  std::string SaveToString() const;
 };
 
 #endif /* XML_DOCUMENT_H */
diff --git a/src/weapon/air_attack.cpp b/src/weapon/air_attack.cpp
index f590fbc..594e270 100644
--- a/src/weapon/air_attack.cpp
+++ b/src/weapon/air_attack.cpp
@@ -36,8 +36,10 @@
 #include "team/teams_list.h"
 #include "tool/i18n.h"
 #include "tool/resource_manager.h"
+#include "tool/random.h"
 #include "tool/xml_document.h"
 
+
 const int FORCE_X_MIN = -50;
 const uint FORCE_X_MAX = 0;
 const uint FORCE_Y_MIN = 1;
@@ -52,7 +54,7 @@ class AirAttackConfig : public ExplosiveWeaponConfig
     double speed;
     uint nbr_obus;
     AirAttackConfig();
-    virtual void LoadXml(xmlNode* elem);
+    virtual void LoadXml(const xmlNode* elem);
 };
 
 class Obus : public WeaponProjectile
@@ -100,11 +102,13 @@ Plane::~Plane()
 
 void Plane::Shoot(double speed, const Point2i& target)
 {
+  MSG_DEBUG("weapon.shoot", "Plane Shoot");
   nb_dropped_bombs = 0;
   last_dropped_bomb = NULL;
 
   Point2d speed_vector ;
   int dir = ActiveCharacter().GetDirection();
+
   cible_x = target.x;
   SetY(0);
   distance_to_release =(int)(speed * sqrt(2.0 * (GetY() + target.y)));
@@ -113,12 +117,13 @@ void Plane::Shoot(double speed, const Point2i& target)
 
   if (dir == 1) {
     speed_vector.SetValues(speed, 0);
-    SetX(-(int)image->GetWidth() + 1);
+    SetX(1.0 - double(image->GetWidth()));
     //distance_to_release -= obus_dx;
-    if(distance_to_release > cible_x) distance_to_release=0;
+   if(distance_to_release > cible_x) distance_to_release=0;
+
   } else {
     speed_vector.SetValues(-speed, 0) ;
-    SetX(world.GetWidth() - 1);
+    SetX(double(world.GetWidth() - 1));
     //distance_to_release += obus_dx;
     if(distance_to_release > (world.GetWidth()-cible_x - obus_dx)) distance_to_release=0;
   }
@@ -137,9 +142,9 @@ void Plane::DropBomb()
 
   Point2d speed_vector = GetSpeedXY();
 
-  int fx = randomSync.GetLong(FORCE_X_MIN, FORCE_X_MAX);
+  int fx = RandomSync().GetLong(FORCE_X_MIN, FORCE_X_MAX);
   fx *= GetDirection();
-  int fy = randomSync.GetLong(FORCE_Y_MIN, FORCE_Y_MAX);
+  int fy = RandomSync().GetLong(FORCE_Y_MIN, FORCE_Y_MAX);
 
   speed_vector.SetValues(speed_vector.x + fx/30.0, speed_vector.y + fy/30.0);
   instance->SetSpeedXY(speed_vector);
@@ -156,16 +161,21 @@ void Plane::DropBomb()
 
 void Plane::Refresh()
 {
+
   UpdatePosition();
   image->Update();
   // First shoot !!
   if ( OnTopOfTarget() && nb_dropped_bombs == 0) {
     DropBomb();
     m_ignore_movements = true;
+    next_height = RandomLocal().GetInt(20,100);
   } else if (nb_dropped_bombs > 0 &&  nb_dropped_bombs < cfg.nbr_obus) {
     // Get the last rocket and check the position to be sure to not collide with it
-    if ( last_dropped_bomb->GetY() > GetY()+GetHeight()+10 )
+    if ( last_dropped_bomb->GetY() > GetY()+GetHeight()+next_height )
+    {
+      next_height = RandomLocal().GetInt(20,100);
       DropBomb();
+    }
   }
 }
 
@@ -219,6 +229,7 @@ void AirAttack::ChooseTarget(Point2i mouse_pos)
 
 bool AirAttack::p_Shoot ()
 {
+  MSG_DEBUG("weapon.shoot", "AirAttack p_Shoot");
   if(!target_chosen)
     return false;
 
@@ -247,6 +258,7 @@ void AirAttack::p_Deselect()
 {
   // Go back to default cursor
   Mouse::GetInstance()->SetPointer(Mouse::POINTER_SELECT);
+  ActiveCharacter().SetMovement("breathe");
 }
 
 AirAttackConfig& AirAttack::cfg()
@@ -271,7 +283,7 @@ AirAttackConfig::AirAttackConfig()
   speed = 7;
 }
 
-void AirAttackConfig::LoadXml(xmlNode* elem)
+void AirAttackConfig::LoadXml(const xmlNode* elem)
 {
   ExplosiveWeaponConfig::LoadXml(elem);
   XmlReader::ReadUint(elem, "nbr_obus", nbr_obus);
diff --git a/src/weapon/air_attack.h b/src/weapon/air_attack.h
index d921c63..2bf327f 100644
--- a/src/weapon/air_attack.h
+++ b/src/weapon/air_attack.h
@@ -38,7 +38,7 @@ class Plane : public PhysicalObj
 
     int obus_dx, obus_dy;
     Sprite *image;
-
+    int next_height;
     int cible_x;
     int distance_to_release;
     AirAttackConfig &cfg;
diff --git a/src/weapon/airhammer.cpp b/src/weapon/airhammer.cpp
index 755e701..32d0b5d 100644
--- a/src/weapon/airhammer.cpp
+++ b/src/weapon/airhammer.cpp
@@ -52,7 +52,7 @@ class AirhammerConfig : public WeaponConfig
     uint range;
     uint damage;
     AirhammerConfig();
-    void LoadXml(xmlNode* elem);
+    void LoadXml(const xmlNode* elem);
 };
 
 //-----------------------------------------------------------------------------
@@ -88,9 +88,6 @@ bool Airhammer::p_Shoot()
   // initiate movement ;-)
   ActiveCharacter().SetRebounding(false);
 
-  // Little hack, so the character notices he is in the vaccum and begins to fall in the hole
-  ActiveCharacter().SetXY( ActiveCharacter().GetPosition() );
-
   Point2i pos = Point2i(ActiveCharacter().GetX() + ActiveCharacter().GetWidth()/2 - impact.GetWidth()/2,
                         ActiveCharacter().GetTestRect().GetPositionY() +
                         ActiveCharacter().GetHeight()  -16);
@@ -147,6 +144,7 @@ void Airhammer::p_Deselect()
 {
   drill_sound.Stop();
   select_sound.Stop();
+  ActiveCharacter().SetMovement("breathe");
 }
 
 //-----------------------------------------------------------------------------
@@ -192,7 +190,7 @@ AirhammerConfig::AirhammerConfig(){
 
 //-----------------------------------------------------------------------------
 
-void AirhammerConfig::LoadXml(xmlNode* elem){
+void AirhammerConfig::LoadXml(const xmlNode* elem){
   WeaponConfig::LoadXml(elem);
   XmlReader::ReadUint(elem, "range", range);
   XmlReader::ReadUint(elem, "damage", damage);
diff --git a/src/weapon/all.h b/src/weapon/all.h
index 068cd44..f4cb4d0 100644
--- a/src/weapon/all.h
+++ b/src/weapon/all.h
@@ -48,6 +48,7 @@
 #include "weapon/shotgun.h"
 #include "weapon/skip_turn.h"
 #include "weapon/snipe_rifle.h"
+#include "weapon/slap.h"
 #include "weapon/submachine_gun.h"
 #include "weapon/suicide.h"
 #include "weapon/supertux.h"
diff --git a/src/weapon/anvil.cpp b/src/weapon/anvil.cpp
index 5407dd0..38a8811 100644
--- a/src/weapon/anvil.cpp
+++ b/src/weapon/anvil.cpp
@@ -54,7 +54,7 @@ class Anvil : public WeaponProjectile
     void PlayCollisionSound();
     void SetEnergyDelta(int /*delta*/, bool /*do_report = true*/) { };
   protected:
-    virtual void SignalObjectCollision(PhysicalObj * obj);
+    virtual void SignalObjectCollision(PhysicalObj * obj, const Point2d& /* speed_before */);
     virtual void SignalGroundCollision(const Point2d& /* speed_before */);
     virtual void SignalOutOfMap();
 };
@@ -74,7 +74,7 @@ Anvil::~Anvil()
   falling_sound.Stop(); // paranoiac sound stop
 }
 
-void Anvil::SignalObjectCollision(PhysicalObj * obj)
+void Anvil::SignalObjectCollision(PhysicalObj * obj, const Point2d& /* speed_before */)
 {
   merge_time = Time::GetInstance()->Read() + 5000;
   obj->SetEnergyDelta(-200);
@@ -174,6 +174,7 @@ void AnvilLauncher::p_Deselect()
 {
   // Go back to default cursor
   Mouse::GetInstance()->SetPointer(Mouse::POINTER_SELECT);
+  ActiveCharacter().SetMovement("breathe");
 }
 
 WeaponProjectile * AnvilLauncher::GetProjectileInstance()
diff --git a/src/weapon/auto_bazooka.cpp b/src/weapon/auto_bazooka.cpp
index c7d73d8..ab26b39 100644
--- a/src/weapon/auto_bazooka.cpp
+++ b/src/weapon/auto_bazooka.cpp
@@ -49,7 +49,7 @@ class AutomaticBazookaConfig : public ExplosiveWeaponConfig {
     double fuel_time;
     double rocket_force;
     AutomaticBazookaConfig();
-    void LoadXml(xmlNode* elem);
+    void LoadXml(const xmlNode* elem);
 };
 
 class RPG : public WeaponProjectile
@@ -71,7 +71,7 @@ public:
   void Shoot(double strength);
   void Explosion();
   void SetTarget (int x,int y);
-  
+
 protected:
   void SignalOutOfMap();
   void SignalDrowning();
@@ -290,7 +290,7 @@ void AutomaticBazooka::DrawTarget() const
 {
   if( !m_target->selected ) return;
 
-  AppWormux::GetInstance()->video->window.Blit(m_target->image, m_target->pos - m_target->image.GetSize()/2 - Camera::GetInstance()->GetPosition());
+  GetMainWindow().Blit(m_target->image, m_target->pos - m_target->image.GetSize()/2 - Camera::GetInstance()->GetPosition());
 
   world.ToRedrawOnMap(Rectanglei(m_target->pos.x-m_target->image.GetWidth()/2,
                                  m_target->pos.y-m_target->image.GetHeight()/2,
@@ -315,7 +315,7 @@ AutomaticBazookaConfig::AutomaticBazookaConfig() {
     rocket_force = 2500;
 }
 
-void AutomaticBazookaConfig::LoadXml(xmlNode* elem) {
+void AutomaticBazookaConfig::LoadXml(const xmlNode* elem) {
     ExplosiveWeaponConfig::LoadXml(elem);
     XmlReader::ReadDouble(elem, "uncontrolled_turn_speed", uncontrolled_turn_speed);
     XmlReader::ReadDouble(elem, "max_controlled_turn_speed", max_controlled_turn_speed);
diff --git a/src/weapon/baseball.cpp b/src/weapon/baseball.cpp
index ad2ce64..c8f8456 100644
--- a/src/weapon/baseball.cpp
+++ b/src/weapon/baseball.cpp
@@ -40,7 +40,7 @@ class BaseballConfig : public WeaponConfig
     uint range;
     uint strength;
     BaseballConfig();
-    void LoadXml(xmlNode* elem);
+    void LoadXml(const xmlNode* elem);
 };
 
 Baseball::Baseball() : Weapon(WEAPON_BASEBALL, "baseball", new BaseballConfig())
@@ -125,7 +125,7 @@ BaseballConfig::BaseballConfig()
   strength = 250;
 }
 
-void BaseballConfig::LoadXml(xmlNode* elem)
+void BaseballConfig::LoadXml(const xmlNode* elem)
 {
   WeaponConfig::LoadXml(elem);
   XmlReader::ReadUint(elem, "range", range);
diff --git a/src/weapon/blowtorch.cpp b/src/weapon/blowtorch.cpp
index 2878b33..27bcd66 100644
--- a/src/weapon/blowtorch.cpp
+++ b/src/weapon/blowtorch.cpp
@@ -43,7 +43,7 @@ class BlowtorchConfig : public WeaponConfig
 {
   public:
     BlowtorchConfig();
-    virtual void LoadXml(xmlNode* elem);
+    virtual void LoadXml(const xmlNode* elem);
 
     uint range;
 };
@@ -125,7 +125,7 @@ BlowtorchConfig& Blowtorch::cfg()
   return static_cast<BlowtorchConfig&>(*extra_params);
 }
 
-void BlowtorchConfig::LoadXml(xmlNode* elem)
+void BlowtorchConfig::LoadXml(const xmlNode* elem)
 {
   WeaponConfig::LoadXml(elem);
   XmlReader::ReadUint(elem, "range", range);
diff --git a/src/weapon/cluster_bomb.cpp b/src/weapon/cluster_bomb.cpp
index 23e850d..44d584d 100644
--- a/src/weapon/cluster_bomb.cpp
+++ b/src/weapon/cluster_bomb.cpp
@@ -41,7 +41,7 @@ class ClusterBombConfig : public ExplosiveWeaponConfig
 public:
   uint nb_fragments;
   ClusterBombConfig();
-  virtual void LoadXml(xmlNode* elem);
+  virtual void LoadXml(const xmlNode* elem);
 };
 
 class Cluster : public WeaponProjectile
@@ -160,7 +160,7 @@ void ClusterBomb::DoExplosion()
   {
     double angle = -M_PI / 2; // this angle is "upwards" here
     double cluster_deviation = angle_range * i / ( float )fragments - angle_range / 2.0f;
-    double speed = randomSync.GetDouble(10, 25);
+    double speed = RandomSync().GetDouble(10, 25);
 
     cluster = new Cluster(static_cast<ClusterBombConfig &>(cfg), launcher);
     cluster->Shoot( pos, speed, angle + cluster_deviation );
@@ -215,7 +215,7 @@ ClusterBombConfig::ClusterBombConfig() :
   nb_fragments = 5;
 }
 
-void ClusterBombConfig::LoadXml(xmlNode* elem)
+void ClusterBombConfig::LoadXml(const xmlNode* elem)
 {
   ExplosiveWeaponConfig::LoadXml(elem);
   XmlReader::ReadUint(elem, "nb_fragments", nb_fragments);
diff --git a/src/weapon/cluzooka.cpp b/src/weapon/cluzooka.cpp
index f816597..06d4608 100644
--- a/src/weapon/cluzooka.cpp
+++ b/src/weapon/cluzooka.cpp
@@ -84,7 +84,7 @@ public:
   uint m_angle_dispersion;
 
   CluzookaConfig();
-  virtual void LoadXml(xmlNode *elem);
+  virtual void LoadXml(const xmlNode *elem);
 };
 
 CluzookaConfig::CluzookaConfig() :
@@ -94,7 +94,7 @@ CluzookaConfig::CluzookaConfig() :
 {
 }
 
-void CluzookaConfig::LoadXml(xmlNode *elem)
+void CluzookaConfig::LoadXml(const xmlNode *elem)
 {
   ExplosiveWeaponConfig::LoadXml(elem);
   XmlReader::ReadUint(elem, "nb_fragments", m_fragments);
@@ -149,7 +149,7 @@ void CluzookaCluster::Shoot(const Point2i & start_pos, double strength, double a
   m_time_before_spawn = 750;
   // make time a bit random to unsychronize particles
 
-  m_time_before_spawn += randomSync.GetDouble( -300, 100 );
+  m_time_before_spawn += RandomSync().GetDouble( -300, 100 );
 }
 
 void CluzookaCluster::Refresh()
diff --git a/src/weapon/construct.cpp b/src/weapon/construct.cpp
index ff643fa..a099cba 100644
--- a/src/weapon/construct.cpp
+++ b/src/weapon/construct.cpp
@@ -28,6 +28,7 @@
 #include "game/time.h"
 #include "graphic/sprite.h"
 #include "include/action_handler.h"
+#include "interface/interface.h"
 #include "interface/mouse.h"
 #include "map/camera.h"
 #include "map/map.h"
@@ -99,17 +100,20 @@ void Construct::Draw()
   if (!IsInUse()) {
     Weapon::Draw();
 
-    dst = Mouse::GetInstance()->GetWorldPosition();
-    construct_spr->SetRotation_rad(angle);
-    construct_spr->Draw(dst - construct_spr->GetSize() / 2);
+    if (EnoughAmmo() && EnoughAmmoUnit() && !Interface::GetInstance()->weapons_menu.IsDisplayed()) {
+      dst = Mouse::GetInstance()->GetWorldPosition();
+      construct_spr->SetRotation_rad(angle);
+      construct_spr->Draw(dst - construct_spr->GetSize() / 2);
+
 #ifdef DEBUG
-    if (IsLOGGING("test_rectangle"))
-    {
-      Rectanglei test_rect(dst - construct_spr->GetSizeMax() / 2, construct_spr->GetSizeMax());
-      test_rect.SetPosition(test_rect.GetPosition() - Camera::GetInstance()->GetPosition());
-      AppWormux::GetInstance()->video->window.RectangleColor(test_rect, primary_red_color, 1);
-    }
+      if (IsLOGGING("test_rectangle"))
+	{
+	  Rectanglei test_rect(dst - construct_spr->GetSizeMax() / 2, construct_spr->GetSizeMax());
+	  test_rect.SetPosition(test_rect.GetPosition() - Camera::GetInstance()->GetPosition());
+	  GetMainWindow().RectangleColor(test_rect, primary_red_color, 1);
+	}
 #endif
+    }
   }
 }
 
diff --git a/src/weapon/crosshair.cpp b/src/weapon/crosshair.cpp
index 4243bc0..582c808 100644
--- a/src/weapon/crosshair.cpp
+++ b/src/weapon/crosshair.cpp
@@ -65,6 +65,6 @@ void CrossHair::Draw() const
   if(Game::GetInstance()->ReadState() != Game::PLAYING)
     return;
   Point2i tmp = ActiveTeam().GetWeapon().GetGunHolePosition() + crosshair_position;
-  AppWormux::GetInstance()->video->window.Blit(image, tmp - Camera::GetInstance()->GetPosition());
+  GetMainWindow().Blit(image, tmp - Camera::GetInstance()->GetPosition());
   world.ToRedrawOnMap(Rectanglei(tmp, image.GetSize()));
 }
diff --git a/src/weapon/disco_grenade.cpp b/src/weapon/disco_grenade.cpp
index 7748a74..ce7502d 100644
--- a/src/weapon/disco_grenade.cpp
+++ b/src/weapon/disco_grenade.cpp
@@ -64,12 +64,12 @@ DiscoGrenade::DiscoGrenade(ExplosiveWeaponConfig& cfg,
 }
 
 void DiscoGrenade::Shoot(double strength)
-{   
+{
   // Sound must be launched before WeaponProjectile::Shoot
   // in case that the projectile leave the battlefield
   // during WeaponProjectile::Shoot (#bug 10241)
   disco_sound.Play("share","weapon/disco_grenade_music", -1);
-  
+
   WeaponProjectile::Shoot(strength);
 }
 
@@ -89,7 +89,7 @@ void DiscoGrenade::Explosion()
                                 1,particle_MAGIC_STAR,false,angle,2.5);
   }
   disco_sound.Stop();
-  
+
   WeaponProjectile::Explosion();
 }
 
@@ -116,7 +116,7 @@ void DiscoGrenade::Refresh()
   double tmp = Time::GetInstance()->Read() - begin_time;
   // Ah ! Ah ! Ah ! Staying Alive, staying alive ...
   if (GetTotalTimeout() >= 2 && tmp > (1000 * GetTotalTimeout() - 2000) && !have_played_music) {
-    JukeBox::GetInstance()->Play("share","weapon/alleluia") ;
+    //JukeBox::GetInstance()->Play("share","weapon/alleluia") ;
     have_played_music = true;
   }
   image->SetRotation_rad(GetSpeedAngle());
@@ -125,7 +125,7 @@ void DiscoGrenade::Refresh()
 void DiscoGrenade::SignalOutOfMap()
 {
   GameMessages::GetInstance()->Add (_("The disco grenade has left the dance floor before exploding"));
-  WeaponProjectile::SignalOutOfMap();  
+  WeaponProjectile::SignalOutOfMap();
 
   disco_sound.Stop();
 }
diff --git a/src/weapon/explosion.cpp b/src/weapon/explosion.cpp
index c99a0ca..287d144 100644
--- a/src/weapon/explosion.cpp
+++ b/src/weapon/explosion.cpp
@@ -202,7 +202,7 @@ void ApplyExplosion_common (const Point2i &pos,
   {
      int reduced_range = ( int )config.explosion_range / 2;
      Camera::GetInstance()->Shake( config.explosion_range * 15,
-         Point2i( randomObj.GetLong( -reduced_range, reduced_range  ),
+         Point2i( RandomLocal().GetLong( -reduced_range, reduced_range  ),
                 config.explosion_range ),
          Point2i( 0, 0 )
         );
@@ -220,7 +220,7 @@ void ApplyExplosion_master (const Point2i &pos,
   ActionHandler* action_handler = ActionHandler::GetInstance();
 
   Action a_begin_sync(Action::ACTION_NETWORK_SYNC_BEGIN);
-  Network::GetInstance()->SendAction(&a_begin_sync);
+  Network::GetInstance()->SendAction(a_begin_sync);
 
   TeamsList::iterator
     it=GetTeamsList().playing_list.begin(),
@@ -250,7 +250,7 @@ void ApplyExplosion_master (const Point2i &pos,
     }
   }
   // send characters infos on network
-  Network::GetInstance()->SendAction(&a_characters_info);
+  Network::GetInstance()->SendAction(a_characters_info);
 
   Action* a = new Action(Action::ACTION_EXPLOSION);
   a->Push(pos);
@@ -267,7 +267,7 @@ void ApplyExplosion_master (const Point2i &pos,
 
   action_handler->NewAction(a);
   Action a_sync_end(Action::ACTION_NETWORK_SYNC_END);
-  Network::GetInstance()->SendAction(&a_sync_end);
+  Network::GetInstance()->SendAction(a_sync_end);
 }
 
 
diff --git a/src/weapon/flamethrower.cpp b/src/weapon/flamethrower.cpp
index 12e3398..606d73f 100644
--- a/src/weapon/flamethrower.cpp
+++ b/src/weapon/flamethrower.cpp
@@ -68,6 +68,7 @@ FlameThrowerBullet::FlameThrowerBullet(ExplosiveWeaponConfig& cfg,
   WeaponBullet("flamethrower_bullet", cfg, p_launcher), particle(40)
 {
   explode_colliding_character = true;
+  m_is_fire = true;
   can_drown = false;
 }
 
@@ -79,7 +80,7 @@ bool FlameThrowerBullet::IsOverlapping(const PhysicalObj* obj) const
 
 void FlameThrowerBullet::RandomizeShoot(double &angle, double &/*strength*/)
 {
-  angle += M_PI * randomSync.GetDouble(-FLAMETHROWER_RANDOM_ANGLE, FLAMETHROWER_RANDOM_ANGLE);
+  angle += M_PI * RandomSync().GetDouble(-FLAMETHROWER_RANDOM_ANGLE, FLAMETHROWER_RANDOM_ANGLE);
 }
 
 void FlameThrowerBullet::ShootSound()
@@ -102,7 +103,6 @@ void FlameThrowerBullet::SignalGroundCollision(const Point2d& speed_before)
 
 void FlameThrowerBullet::SignalDrowning()
 {
-  particle.AddNow(GetPosition(), 2, particle_SMOKE, true, 0, 1);
   launcher->IncMissedShots();
   Ghost();
 }
diff --git a/src/weapon/footbomb.cpp b/src/weapon/footbomb.cpp
index a826d4d..c0175ec 100644
--- a/src/weapon/footbomb.cpp
+++ b/src/weapon/footbomb.cpp
@@ -45,7 +45,7 @@ public:
   double nb_max_speed;
 
   FootBombConfig();
-  virtual void LoadXml(xmlNode *elem);
+  virtual void LoadXml(const xmlNode *elem);
 };
 
 class FootBomb : public WeaponProjectile
@@ -127,8 +127,8 @@ void FootBomb::DoExplosion()
   for (uint i = 0; i < fragments; ++i )
   {
     double angle = -M_PI / 2; // this angle is "upwards" here
-    double cluster_deviation = randomSync.GetDouble( -half_angle_range, half_angle_range );
-    double speed = randomSync.GetDouble( static_cast<FootBombConfig &>(cfg).nb_min_speed,
+    double cluster_deviation = RandomSync().GetDouble( -half_angle_range, half_angle_range );
+    double speed = RandomSync().GetDouble( static_cast<FootBombConfig &>(cfg).nb_min_speed,
         static_cast<FootBombConfig &>(cfg).nb_max_speed );
 
     cluster = new FootBomb(static_cast<FootBombConfig &>(cfg), launcher);
@@ -186,7 +186,7 @@ FootBombConfig::FootBombConfig() :
   nb_recursions = 2;
 }
 
-void FootBombConfig::LoadXml(xmlNode *elem)
+void FootBombConfig::LoadXml(const xmlNode *elem)
 {
   ExplosiveWeaponConfig::LoadXml(elem);
   XmlReader::ReadUint(elem, "nb_fragments", nb_fragments);
diff --git a/src/weapon/gnu.cpp b/src/weapon/gnu.cpp
index cb69176..f20afaf 100644
--- a/src/weapon/gnu.cpp
+++ b/src/weapon/gnu.cpp
@@ -81,9 +81,14 @@ void Gnu::Shoot(double strength)
 
 void Gnu::Refresh()
 {
-  WeaponProjectile::Refresh();
+  if (m_energy == 0) {
+    Explosion();
+    return;
+  }
+  int tmp = Time::GetInstance()->Read() - begin_time;
+  if(cfg.timeout && tmp > 1000 * (GetTotalTimeout())) SignalTimeout();
 
-  double norme, angle;
+  double norm, angle;
   //When we hit the ground, jump !
   if(!IsMoving()&& !FootsInVacuum()) {
     // Limiting number of rebound to avoid desync
@@ -92,6 +97,7 @@ void Gnu::Refresh()
       return;
     }
     last_rebound_time = Time::GetInstance()->Read();
+    MSG_DEBUG("weapon.gnu", "Jump ! (time = %d)", last_rebound_time);
     //If the GNU is stuck in ground -> change direction
     int x = GetX();
     int y = GetY();
@@ -101,15 +107,15 @@ void Gnu::Refresh()
     save_y = y;
 
     //Do the jump
-    norme = randomSync.GetDouble(2.0, 5.0);
+    norm = RandomSync().GetDouble(2.0, 5.0);
     PutOutOfGround();
-    SetSpeedXY(Point2d(m_sens * norme , - norme * 3.0));
+    SetSpeedXY(Point2d(m_sens * norm , - norm * 3.0));
     JukeBox::GetInstance()->Play("share", "weapon/gnu_bounce");
   }
 
   //Due to a bug in the physic engine
   //sometimes, angle==infinite (according to gdb) ??
-  GetSpeed(norme, angle);
+  GetSpeed(norm, angle);
 
   while(angle < -M_PI)
     angle += M_PI;
@@ -131,11 +137,6 @@ void Gnu::Refresh()
   image->SetRotation_rad(angle);
   image->Scale((double)m_sens,1.0);
   image->Update();
-  // Fixes test rectangle ??
-  SetTestRect(image->GetWidth() / 2 - 1,
-              image->GetWidth() / 2 - 1,
-              image->GetHeight() / 2 - 1,
-              image->GetHeight() / 2 - 1);
 }
 
 void Gnu::SignalOutOfMap()
diff --git a/src/weapon/grapple.cpp b/src/weapon/grapple.cpp
index 007d70a..35bebd5 100644
--- a/src/weapon/grapple.cpp
+++ b/src/weapon/grapple.cpp
@@ -58,7 +58,7 @@ bool find_first_contact_point (Point2i from, double angle, uint length,
 
   posd.x += ((double)skip) * x_step;
   posd.y += ((double)skip) * y_step;
-  
+
   from.x = (int)round(posd.x) ;
   from.y = (int)round(posd.y) ;
 
@@ -81,7 +81,7 @@ bool find_first_contact_point (Point2i from, double angle, uint length,
         if ( contact_point_uncertain && !world.IsInVacuum( contact_point ) )
         {
            // it's not, so try our best to return a contact point in vacuum
-           // try searching in area NxN around our original point and return 
+           // try searching in area NxN around our original point and return
            // the closest pixel in vacuum
 
            // FIXME: can be optimized!
@@ -138,7 +138,7 @@ class GrappleConfig : public EmptyWeaponConfig
 
  public:
   GrappleConfig();
-  void LoadXml(xmlNode* elem);
+  void LoadXml(const xmlNode* elem);
 };
 
 //-----------------------------------------------------------------------------
@@ -275,7 +275,7 @@ bool Grapple::TryAddNode(int CurrentSense)
            (fabs(last_broken_node_angle - rope_angle) < 0.1))
         return false ;
 
-      // if contact point is the same as position of the last node 
+      // if contact point is the same as position of the last node
       // (can happen because of jitter applied in find_first_contact_point),
       // give up adding such node
       if ( rope_nodes.size() > 0 && rope_nodes.back().pos == contact_point )
@@ -291,7 +291,7 @@ bool Grapple::TryAddNode(int CurrentSense)
       a.Push(contact_point);
       a.Push(rope_angle);
       a.Push(CurrentSense);
-      Network::GetInstance()->SendAction(&a);
+      Network::GetInstance()->SendAction(a);
 
       return true;
     }
@@ -361,7 +361,7 @@ bool Grapple::TryRemoveNodes(int currentSense)
      // Send node suppression over the network
      Action a(Action::ACTION_WEAPON_GRAPPLE);
      a.Push(DETACH_NODE);
-     Network::GetInstance()->SendAction(&a);
+     Network::GetInstance()->SendAction(a);
   }
 
   return nodes_to_remove > 0;
@@ -534,9 +534,12 @@ void Grapple::AttachRope(const Point2i& contact_point)
 
 void Grapple::DetachRope()
 {
-  ActiveCharacter().UnsetPhysFixationPoint() ;
+  if(m_is_active)
+    ActiveCharacter().UnsetPhysFixationPoint() ;
   rope_nodes.clear();
   m_is_active = false;
+
+  cable_sound.Stop();
 }
 
 void Grapple::AttachNode(const Point2i& contact_point,
@@ -612,6 +615,11 @@ void Grapple::GoUp()
   delta_len = 0 ;
 }
 
+void Grapple::StopUp()
+{
+  cable_sound.Stop();
+}
+
 void Grapple::GoDown()
 {
   if(Time::GetInstance()->Read()<last_mvt+DT_MVT)
@@ -627,8 +635,16 @@ void Grapple::GoDown()
   delta_len = 0 ;
 }
 
+void Grapple::StopDown()
+{
+  cable_sound.Stop();
+}
+
 void Grapple::GoRight()
 {
+  if (!go_right) {
+    cable_sound.Play("share", "weapon/grapple_cable");
+  }
   go_right = true ;
   ActiveCharacter().SetExternForce(cfg().push_force,0);
   ActiveCharacter().SetDirection(DIRECTION_RIGHT);
@@ -647,6 +663,9 @@ void Grapple::StopRight()
 
 void Grapple::GoLeft()
 {
+  if (!go_left) {
+    cable_sound.Play("share", "weapon/grapple_cable");
+  }
   go_left = true ;
   ActiveCharacter().SetExternForce(-cfg().push_force,0);
   ActiveCharacter().SetDirection(DIRECTION_LEFT);
@@ -667,8 +686,10 @@ void Grapple::StopLeft()
 
 void Grapple::HandleKeyPressed_Up(bool shift)
 {
-  if (IsInUse())
+  if (IsInUse())  {
+    cable_sound.Play("share", "weapon/grapple_cable", -1);
     GoUp();
+  }
   else
     ActiveCharacter().HandleKeyPressed_Up(shift);
 }
@@ -683,15 +704,18 @@ void Grapple::HandleKeyRefreshed_Up(bool shift)
 
 void Grapple::HandleKeyReleased_Up(bool shift)
 {
-  if (!IsInUse())
+  if (IsInUse())
+    StopUp();
+  else
     ActiveCharacter().HandleKeyReleased_Up(shift);
 }
 
 void Grapple::HandleKeyPressed_Down(bool shift)
 {
-  if (IsInUse())
+  if (IsInUse()) {
+    cable_sound.Play("share", "weapon/grapple_cable", -1);
     GoDown();
-  else
+  } else
     ActiveCharacter().HandleKeyPressed_Down(shift);
 }
 
@@ -705,7 +729,9 @@ void Grapple::HandleKeyRefreshed_Down(bool shift)
 
 void Grapple::HandleKeyReleased_Down(bool shift)
 {
-  if (!IsInUse())
+  if (IsInUse())
+    StopDown();
+  else
     ActiveCharacter().HandleKeyReleased_Down(shift);
 }
 
@@ -764,8 +790,8 @@ void Grapple::HandleKeyPressed_Shoot(bool)
 void Grapple::PrintDebugRope()
 {
   printf("%05d %05d %03.3f\n",
-         ActiveCharacter().GetPosition().GetX(),
-         ActiveCharacter().GetPosition().GetY(),
+         ActiveCharacter().GetX(),
+         ActiveCharacter().GetY(),
          ActiveCharacter().GetRopeAngle());
 
   for (std::list<rope_node_t>::iterator it = rope_nodes.begin();
@@ -800,7 +826,7 @@ GrappleConfig::GrappleConfig()
   push_force = 10;
 }
 
-void GrappleConfig::LoadXml(xmlNode* elem)
+void GrappleConfig::LoadXml(const xmlNode* elem)
 {
   EmptyWeaponConfig::LoadXml(elem);
   XmlReader::ReadUint(elem, "max_rope_length", max_rope_length);
diff --git a/src/weapon/grapple.h b/src/weapon/grapple.h
index 552729c..e92a099 100644
--- a/src/weapon/grapple.h
+++ b/src/weapon/grapple.h
@@ -51,6 +51,8 @@ class Grapple : public Weapon
     Sprite* m_hook_sprite;
     Sprite* m_node_sprite;
 
+    SoundSample cable_sound;
+
   protected:
     void Refresh();
     void p_Deselect() { DetachRope(); };
@@ -60,6 +62,8 @@ class Grapple : public Weapon
     void GoDown();
     void GoLeft();
     void GoRight();
+    void StopUp();
+    void StopDown();
     void StopLeft();
     void StopRight();
 
diff --git a/src/weapon/jetpack.cpp b/src/weapon/jetpack.cpp
index 82aae19..e7d2874 100644
--- a/src/weapon/jetpack.cpp
+++ b/src/weapon/jetpack.cpp
@@ -26,6 +26,7 @@
 #include "game/game_mode.h"
 #include "game/time.h"
 #include "include/action_handler.h"
+#include "interface/cursor.h"
 #include "interface/game_msg.h"
 #include "map/camera.h"
 #include "network/network.h"
@@ -137,6 +138,13 @@ void JetPack::StartUse()
 
       Camera::GetInstance()->FollowObject (&ActiveCharacter(), true);
     }
+
+  // this avoids to show the arrow on top of character that can hide the ammo units
+  ActiveCharacter().UpdateLastMovingTime();
+
+  // do not display the character on top of the active character
+  // else it will hide the ammo unit of the jetpack (bug #11479)
+  CharacterCursor::GetInstance()->Hide();
 }
 
 void JetPack::StopUse()
diff --git a/src/weapon/lowgrav.cpp b/src/weapon/lowgrav.cpp
index 4e39900..2399d4e 100644
--- a/src/weapon/lowgrav.cpp
+++ b/src/weapon/lowgrav.cpp
@@ -55,6 +55,7 @@ void LowGrav::p_Deselect()
 {
   ActiveCharacter().ResetConstants();
   ActiveCharacter().SetClothe("normal");
+  ActiveCharacter().SetMovement("breathe");
 }
 
 bool LowGrav::p_Shoot()
diff --git a/src/weapon/mine.cpp b/src/weapon/mine.cpp
index 68f0300..3d3ffe7 100644
--- a/src/weapon/mine.cpp
+++ b/src/weapon/mine.cpp
@@ -86,7 +86,7 @@ void ObjMine::StartTimeout()
 
     // is it a fake mine ? (here because Constructor is called before random
     // number generator is synchronized over the network)
-    fake = !(randomSync.GetLong(0, 9));
+    fake = !(RandomSync().GetLong(0, 9));
 
     Camera::GetInstance()->FollowObject(this, true);
 
@@ -275,7 +275,7 @@ MineConfig::MineConfig()
   escape_time = 2;
 }
 
-void MineConfig::LoadXml(xmlNode* elem)
+void MineConfig::LoadXml(const xmlNode* elem)
 {
   ExplosiveWeaponConfig::LoadXml (elem);
   XmlReader::ReadUint(elem, "escape_time", escape_time);
diff --git a/src/weapon/mine.h b/src/weapon/mine.h
index 59b0799..4c30477 100644
--- a/src/weapon/mine.h
+++ b/src/weapon/mine.h
@@ -74,7 +74,7 @@ class MineConfig : public ExplosiveWeaponConfig
     MineConfig();
   public:
     static MineConfig * GetInstance();
-    virtual void LoadXml(xmlNode* elem);
+    virtual void LoadXml(const xmlNode* elem);
 };
 
 class Mine : public WeaponLauncher
diff --git a/src/weapon/parachute.cpp b/src/weapon/parachute.cpp
index d4be451..41723c7 100644
--- a/src/weapon/parachute.cpp
+++ b/src/weapon/parachute.cpp
@@ -46,7 +46,7 @@ class ParachuteConfig : public WeaponConfig
      double air_resist_factor;
      double force_side_displacement;
      ParachuteConfig();
-     void LoadXml(xmlNode* elem);
+     void LoadXml(const xmlNode* elem);
 };
 
 
@@ -87,6 +87,7 @@ void Parachute::p_Select()
 void Parachute::p_Deselect()
 {
   ActiveCharacter().ResetConstants();
+  ActiveCharacter().SetMovement("breathe");
 }
 
 bool Parachute::IsInUse() const
@@ -239,7 +240,7 @@ ParachuteConfig::ParachuteConfig(){
   force_side_displacement = 2000.0;
 }
 
-void ParachuteConfig::LoadXml(xmlNode* elem){
+void ParachuteConfig::LoadXml(const xmlNode* elem){
   WeaponConfig::LoadXml(elem);
   XmlReader::ReadDouble(elem, "wind_factor", wind_factor);
   XmlReader::ReadDouble(elem, "air_resist_factor", air_resist_factor);
diff --git a/src/weapon/polecat.cpp b/src/weapon/polecat.cpp
index 16b9f07..2bb8674 100644
--- a/src/weapon/polecat.cpp
+++ b/src/weapon/polecat.cpp
@@ -39,7 +39,7 @@
 #include "weapon/explosion.h"
 
 const uint TIME_BETWEEN_FART = 500;
-const uint TIME_BETWEEN_REBOUND = 600;
+const uint TIME_BETWEEN_REBOUND = 400;
 
 class Polecat : public WeaponProjectile
 {
@@ -86,9 +86,21 @@ void Polecat::Shoot(double strength)
 
 void Polecat::Refresh()
 {
-  WeaponProjectile::Refresh();
+  if (m_energy == 0) {
+    Explosion();
+    return;
+  }
+  int tmp = Time::GetInstance()->Read() - begin_time;
+  if(cfg.timeout && tmp > 1000 * (GetTotalTimeout())) SignalTimeout();
 
-  double norme, angle;
+  double norm, angle;
+  if(last_fart_time + TIME_BETWEEN_FART < Time::GetInstance()->Read()) {
+    // particles must be exactly the same accross the network
+    double norme = double(RandomSync().GetLong(0, 500))/100;
+    double angle = double(RandomSync().GetLong(0, 3000))/100;
+    ParticleEngine::AddNow(GetPosition(), 3, particle_POLECAT_FART, true, angle, norme);
+    last_fart_time = Time::GetInstance()->Read();
+  }
   //When we hit the ground, jump !
   if(!IsMoving() && !FootsInVacuum()) {
     // Limiting number of rebound to avoid desync
@@ -97,6 +109,7 @@ void Polecat::Refresh()
       return;
     }
     last_rebound_time = Time::GetInstance()->Read();
+    MSG_DEBUG("weapon.polecat", "Jump ! (time = %d)", last_rebound_time);
     //If the GNU is stuck in ground -> change direction
     int x = GetX();
     int y = GetY();
@@ -106,19 +119,13 @@ void Polecat::Refresh()
     save_y = y;
 
     //Do the jump
-    norme = randomSync.GetDouble(1.0, 2.0);
+    norm = RandomSync().GetDouble(1.0, 2.0);
     PutOutOfGround();
-    SetSpeedXY(Point2d(m_sens * norme , -norme * 3.0));
-  }
-  if(last_fart_time + TIME_BETWEEN_FART < Time::GetInstance()->Read()) {
-    double norme = randomSync.GetLong(0, 5000) / 100;
-    double angle = randomSync.GetLong(0, 3000) / 1000;
-    ParticleEngine::AddNow(GetPosition(), 1, particle_POLECAT_FART, true, norme, angle);
-    last_fart_time = Time::GetInstance()->Read();
+    SetSpeedXY(Point2d(m_sens * norm , -norm * 3.0));
   }
   //Due to a bug in the physic engine
   //sometimes, angle==infinite (according to gdb) ??
-  GetSpeed(norme, angle);
+  GetSpeed(norm, angle);
 
   while(angle < -M_PI)
     angle += M_PI;
@@ -136,11 +143,6 @@ void Polecat::Refresh()
   image->SetRotation_rad(angle);
   image->Scale((double)m_sens,1.0);
   image->Update();
-  // Set the test area ?
-  SetTestRect(image->GetWidth() / 2 - 1,
-              image->GetWidth() / 2 - 1,
-              image->GetHeight() / 2 - 1,
-              image->GetHeight() / 2 - 1);
 }
 
 void Polecat::SignalOutOfMap()
diff --git a/src/weapon/shotgun.cpp b/src/weapon/shotgun.cpp
index baaab57..0ab8900 100644
--- a/src/weapon/shotgun.cpp
+++ b/src/weapon/shotgun.cpp
@@ -61,8 +61,8 @@ ShotgunBuckshot::ShotgunBuckshot(ExplosiveWeaponConfig& cfg,
 
 void ShotgunBuckshot::RandomizeShoot(double &angle,double &strength)
 {
-  angle += M_PI * randomSync.GetDouble(-SHOTGUN_RANDOM_ANGLE,SHOTGUN_RANDOM_ANGLE);
-  strength += randomSync.GetDouble(-SHOTGUN_RANDOM_STRENGTH,SHOTGUN_RANDOM_STRENGTH);
+  angle += M_PI * RandomSync().GetDouble(-SHOTGUN_RANDOM_ANGLE,SHOTGUN_RANDOM_ANGLE);
+  strength += RandomSync().GetDouble(-SHOTGUN_RANDOM_STRENGTH,SHOTGUN_RANDOM_STRENGTH);
 }
 
 bool ShotgunBuckshot::IsOverlapping(const PhysicalObj* obj) const
diff --git a/src/weapon/slap.cpp b/src/weapon/slap.cpp
new file mode 100644
index 0000000..a557d15
--- /dev/null
+++ b/src/weapon/slap.cpp
@@ -0,0 +1,130 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Slap. The target moves a bit in amazement (similar to the prod weapon).
+ *****************************************************************************/
+
+#include "weapon/slap.h"
+#include "weapon/weapon_cfg.h"
+
+#include <iostream>
+#include "map/camera.h"
+#include "character/character.h"
+#include "character/body.h"
+#include "sound/jukebox.h"
+#include "team/macro.h"
+#include "team/team.h"
+#include "team/teams_list.h"
+#include "tool/i18n.h"
+#include "tool/xml_document.h"
+#include "include/action_handler.h"
+
+class SlapConfig : public WeaponConfig
+{
+  public:
+    uint range;
+    uint damage;
+    uint strength;
+    SlapConfig();
+    void LoadXml(const xmlNode* elem);
+};
+
+SlapConfig& Slap::cfg() {
+  return static_cast<SlapConfig&>(*extra_params);
+}
+
+SlapConfig::SlapConfig(){
+  range = 20;
+  damage = 5;
+  strength = 10;
+}
+
+void SlapConfig::LoadXml(const xmlNode* elem){
+  WeaponConfig::LoadXml(elem);
+  XmlReader::ReadUint(elem, "range", range);
+  XmlReader::ReadUint(elem, "damage", damage);
+  XmlReader::ReadUint(elem, "strength", strength);
+}
+
+Slap::Slap() : Weapon(WEAPON_SLAP, "slap", new SlapConfig())
+{
+  UpdateTranslationStrings();
+
+  m_category = DUEL;
+}
+
+void Slap::UpdateTranslationStrings()
+{
+  m_name = _("Slap");
+  m_help = _("Slap the enemy to make him jump a bit.");
+}
+
+void Slap::Refresh()
+{
+  if (IsInUse()) m_is_active = false;
+}
+
+std::string Slap::GetWeaponWinString(const char *TeamName, uint items_count) const
+{
+  return Format(ngettext(
+            "%s team has won %u slap!",
+            "%s team has won %u slaps! Dodge this!",
+            items_count), TeamName, items_count);
+}
+
+bool Slap::p_Shoot (){
+  double angle = ActiveCharacter().GetFiringAngle();
+  double radius = 0.0;
+  bool end = false;
+
+  JukeBox::GetInstance()->Play ("share","weapon/slap");
+
+  do
+  {
+    // Did we finish the computation?
+    radius += 1.0;
+    if (cfg().range < radius)
+    {
+      radius = cfg().range;
+      end = true;
+    }
+
+    // Compute point coordinates
+    Point2i relative_pos(static_cast<int>(radius * cos(angle)),
+                         static_cast<int>(radius * sin(angle)) );
+    Point2i pos_to_check = ActiveCharacter().GetHandPosition() + relative_pos;
+    FOR_ALL_LIVING_CHARACTERS(team, character)
+    if (&(*character) != &ActiveCharacter())
+    {
+      // Did we touch somebody ?
+      if( character->Contain(pos_to_check) )
+      {
+        // Apply damage
+        character->SetEnergyDelta(-(int)cfg().damage);
+        character->SetSpeed(cfg().strength / character->GetMass(), angle);
+        character->SetMovement("fly");
+        Camera::GetInstance()->FollowObject(&(*character), true, true);
+
+        end = true;
+      }
+    }
+  } while (!end);
+
+  return true;
+}
+
diff --git a/src/weapon/slap.h b/src/weapon/slap.h
new file mode 100644
index 0000000..e2bcf9e
--- /dev/null
+++ b/src/weapon/slap.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *  Wormux is a convivial mass murder game.
+ *  Copyright (C) 2001-2008 Wormux Team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ******************************************************************************
+ * Slap. The target moves a bit in amazement (similar to the prod weapon).
+ *****************************************************************************/
+
+#ifndef SLAP_H
+#define SLAP_H
+
+#include "include/base.h"
+#include "weapon.h"
+
+class SlapConfig;
+
+class Slap : public Weapon
+{
+  protected:
+    bool p_Shoot();
+    void Refresh();
+  public:
+    Slap();
+    SlapConfig &cfg();
+
+    void UpdateTranslationStrings();
+    std::string GetWeaponWinString(const char *TeamName, uint items_count ) const;
+};
+
+#endif /* SLAP_H */
diff --git a/src/weapon/snipe_rifle.cpp b/src/weapon/snipe_rifle.cpp
index b4cd42b..7bc0edd 100644
--- a/src/weapon/snipe_rifle.cpp
+++ b/src/weapon/snipe_rifle.cpp
@@ -177,6 +177,7 @@ void SnipeRifle::ComputeCrossPoint(bool force = false)
 void SnipeRifle::p_Deselect()
 {
   ActiveCharacter().SetFiringAngle(0.);
+  ActiveCharacter().SetMovement("breathe");
 }
 
 void SnipeRifle::DrawBeam()
@@ -185,10 +186,10 @@ void SnipeRifle::DrawBeam()
   Point2i pos2 = targeted_point - Camera::GetInstance()->GetPosition();
   float dst = laser_beam_start.Distance(targeted_point);
 
-  AppWormux::GetInstance()->video->window.
+  GetMainWindow().
     AAFadingLineColor(pos1.x, pos2.x, pos1.y, pos2.y, laser_beam_color, Color(255, 0, 0, 0));
 
-  // AppWormux::GetInstance()->video->window.AALineColor(pos1.x, pos2.x, pos1.y, pos2.y, laser_beam_color);
+  // GetMainWindow().AALineColor(pos1.x, pos2.x, pos1.y, pos2.y, laser_beam_color);
 
   // Set area of the screen to be redrawn:
   // Splited into little rectangles to avoid too large area of redraw
diff --git a/src/weapon/submachine_gun.cpp b/src/weapon/submachine_gun.cpp
index 3225c2d..91c9187 100644
--- a/src/weapon/submachine_gun.cpp
+++ b/src/weapon/submachine_gun.cpp
@@ -65,7 +65,7 @@ SubMachineGunBullet::SubMachineGunBullet(ExplosiveWeaponConfig& cfg,
 
 void SubMachineGunBullet::RandomizeShoot(double &angle,double &/*strength*/)
 {
-  angle += M_PI * randomSync.GetDouble(-SUBMACHINE_RANDOM_ANGLE,SUBMACHINE_RANDOM_ANGLE);
+  angle += M_PI * RandomSync().GetDouble(-SUBMACHINE_RANDOM_ANGLE,SUBMACHINE_RANDOM_ANGLE);
 }
 
 void SubMachineGunBullet::ShootSound()
diff --git a/src/weapon/supertux.cpp b/src/weapon/supertux.cpp
index 3e4debe..f80af48 100644
--- a/src/weapon/supertux.cpp
+++ b/src/weapon/supertux.cpp
@@ -47,7 +47,7 @@ class SuperTuxWeaponConfig : public ExplosiveWeaponConfig
   public:
     uint speed;
     SuperTuxWeaponConfig();
-    virtual void LoadXml(xmlNode* elem);
+    virtual void LoadXml(const xmlNode* elem);
 };
 //-----------------------------------------------------------------------------
 
@@ -94,13 +94,13 @@ SuperTux::SuperTux(SuperTuxWeaponConfig& cfg,
 }
 
 void SuperTux::Shoot(double strength)
-{    
+{
   // Sound must be launched before WeaponProjectile::Shoot
   // in case that the projectile leave the battlefield
   // during WeaponProjectile::Shoot (#bug 10241)
   swimming = false;
   flying_sound.Play("share","weapon/supertux_flying", -1);
-  
+
   WeaponProjectile::Shoot(strength);
   angle_rad = ActiveCharacter().GetFiringAngle();
 
@@ -127,7 +127,7 @@ void SuperTux::Refresh()
     Action a(Action::ACTION_WEAPON_SUPERTUX);
     a.Push(angle_rad);
     a.Push(GetPos());
-    Network::GetInstance()->SendAction(&a);
+    Network::GetInstance()->SendAction(a);
   }
 
   if (!swimming)
@@ -200,7 +200,7 @@ SuperTuxWeaponConfig::SuperTuxWeaponConfig()
   speed = 2;
 }
 
-void SuperTuxWeaponConfig::LoadXml(xmlNode* elem)
+void SuperTuxWeaponConfig::LoadXml(const xmlNode* elem)
 {
   ExplosiveWeaponConfig::LoadXml (elem);
   XmlReader::ReadUint(elem, "speed", speed);
@@ -239,6 +239,9 @@ WeaponProjectile * TuxLauncher::GetProjectileInstance()
 
 bool TuxLauncher::p_Shoot ()
 {
+  if (current_tux != NULL)
+    return false;
+
   current_tux = static_cast<SuperTux *>(projectile);
   bool r = WeaponLauncher::p_Shoot();
 
diff --git a/src/weapon/syringe.cpp b/src/weapon/syringe.cpp
index 2394185..e425f47 100644
--- a/src/weapon/syringe.cpp
+++ b/src/weapon/syringe.cpp
@@ -38,7 +38,7 @@ class SyringeConfig : public WeaponConfig
     uint damage;
     uint turns;
     SyringeConfig();
-    void LoadXml(xmlNode* elem);
+    void LoadXml(const xmlNode* elem);
 };
 
 SyringeConfig& Syringe::cfg() {
@@ -51,7 +51,7 @@ SyringeConfig::SyringeConfig(){
   damage = 10;
 }
 
-void SyringeConfig::LoadXml(xmlNode* elem){
+void SyringeConfig::LoadXml(const xmlNode* elem){
   WeaponConfig::LoadXml(elem);
   XmlReader::ReadUint(elem, "range", range);
   XmlReader::ReadUint(elem, "turns", turns);
diff --git a/src/weapon/weapon.cpp b/src/weapon/weapon.cpp
index 59f6a0c..f01a14e 100644
--- a/src/weapon/weapon.cpp
+++ b/src/weapon/weapon.cpp
@@ -53,7 +53,7 @@
 extern Profile *weapons_res_profile;
 
 const int INFINITE_AMMO = -1;
-const uint MAX_TIME_LOADING = 2000;
+const uint MAX_TIME_LOADING = 3500;
 
 // XXX Unused ?
 //const uint WEAPON_BOX_BUTTON_DX = 20;
@@ -79,6 +79,7 @@ Weapon::Weapon(Weapon_type type,
   m_is_active = false;
 
   m_time_anim_begin = Time::GetInstance()->Read();
+  m_available_after_turn = 0;
   m_initial_nb_ammo = INFINITE_AMMO;
   m_initial_nb_unit_per_ammo = 1;
   use_unit_on_first_shoot = true;
@@ -120,7 +121,7 @@ Weapon::Weapon(Weapon_type type,
 
   mouse_character_selection = true;
 
-  xmlNode* elem = resource_manager.GetElement(weapons_res_profile, "position", m_id);
+  const xmlNode* elem = resource_manager.GetElement(weapons_res_profile, "position", m_id);
   if (elem != NULL) {
     // E.g. <position name="my_weapon_id" origin="hand" x="-1" y="0" />
     std::string origin_xml;
@@ -435,7 +436,7 @@ void Weapon::UpdateStrength(){
     return ;
 
   uint time = Time::GetInstance()->Read() - m_first_time_loading;
-  double val = (max_strength * time) / MAX_TIME_LOADING;
+  double val = (max_strength * time*time) / (MAX_TIME_LOADING*MAX_TIME_LOADING);
 
   m_strength = InRange_Double (val, 0.0, max_strength);
 
@@ -552,7 +553,7 @@ void Weapon::Draw(){
   }
 
   if ( m_image )
-    m_image->Blit( AppWormux::GetInstance()->video->window, Point2i(x, y) - Camera::GetInstance()->GetPosition());
+    m_image->Blit( GetMainWindow(), Point2i(x, y) - Camera::GetInstance()->GetPosition());
 
 #ifdef DEBUG
   if (IsLOGGING("weapon")) {
@@ -563,7 +564,7 @@ void Weapon::Draw(){
 
     world.ToRedrawOnMap(rect);
 
-    AppWormux::GetInstance()->video->window.RectangleColor(rect, c_red);
+    GetMainWindow().RectangleColor(rect, c_red);
 
     MSG_DEBUG("weapon.handposition", "Position: %d, %d - hand: %d, %d",
 	      ActiveCharacter().GetX(),
@@ -578,7 +579,7 @@ void Weapon::Draw(){
       	    	  3, 3);
 
   world.ToRedrawOnMap(rect);
-  AppWormux::GetInstance()->video->window.RectangleColor(rect, c_red);
+  GetMainWindow().RectangleColor(rect, c_red);
 
 //  rect = Rectangle(
 #endif
@@ -649,9 +650,9 @@ void Weapon::DrawAmmoUnits() const
   }
 }
 
-bool Weapon::LoadXml(xmlNode*  weapon)
+bool Weapon::LoadXml(const xmlNode*  weapon)
 {
-  xmlNode* elem = XmlReader::GetMarker(weapon, m_id)->children;
+  const xmlNode* elem = XmlReader::GetMarker(weapon, m_id);
   if (elem == NULL)
   {
       std::cout << Format(_("No element <%s> found in the xml config file!"),
@@ -660,6 +661,7 @@ bool Weapon::LoadXml(xmlNode*  weapon)
     return false;
   }
 
+  XmlReader::ReadInt(elem, "available_after_turn", m_available_after_turn);
   XmlReader::ReadInt(elem, "nb_ammo", m_initial_nb_ammo);
   XmlReader::ReadInt(elem, "unit_per_ammo", m_initial_nb_unit_per_ammo);
 
@@ -737,6 +739,11 @@ void Weapon::HandleKeyReleased_Shoot(bool)
   NewActionWeaponShoot();
 }
 
+void Weapon::p_Deselect()
+{
+  ActiveCharacter().SetMovement("breathe");
+}
+
 void Weapon::HandleKeyPressed_MoveRight(bool shift)
 {
   ActiveCharacter().HandleKeyPressed_MoveRight(shift);
diff --git a/src/weapon/weapon.h b/src/weapon/weapon.h
index 2f3a8a6..2234e17 100644
--- a/src/weapon/weapon.h
+++ b/src/weapon/weapon.h
@@ -52,7 +52,7 @@ public:
     WEAPON_BAZOOKA,       WEAPON_AUTOMATIC_BAZOOKA, WEAPON_CLUZOOKA, WEAPON_RIOT_BOMB,
     WEAPON_GRENADE,       WEAPON_DISCO_GRENADE,     WEAPON_CLUSTER_BOMB, WEAPON_FOOTBOMB,
     WEAPON_GUN,           WEAPON_SHOTGUN,           WEAPON_SUBMACHINE_GUN,
-    WEAPON_BASEBALL,      WEAPON_FLAMETHROWER,
+    WEAPON_BASEBALL,      WEAPON_FLAMETHROWER,      WEAPON_SLAP,
 
     WEAPON_DYNAMITE,      WEAPON_MINE,
 
@@ -130,6 +130,7 @@ protected:
   weapon_visibility_t m_unit_visibility;
 
   // how many times can we use this weapon (since the beginning of the game) ?
+  int m_available_after_turn; // -1 means NEVER
   int m_initial_nb_ammo;
   int m_initial_nb_unit_per_ammo;
   bool use_unit_on_first_shoot;
@@ -149,7 +150,7 @@ public:
 
 protected:
   virtual void p_Select() { m_last_fire_time = 0; };
-  virtual void p_Deselect() { };
+  virtual void p_Deselect();
   virtual void Refresh() = 0;
   virtual bool p_Shoot() = 0;
 
@@ -181,7 +182,10 @@ public:
   void UseAmmo() const;
   bool EnoughAmmoUnit() const;
   void UseAmmoUnit() const;
+
+  int AvailableAfterTurn() const { return m_available_after_turn; };
   int ReadInitialNbAmmo() const { return m_initial_nb_ammo; };
+  void WriteInitialNbAmmo(int nb) { m_initial_nb_ammo = nb; };
   int ReadInitialNbUnit() const { return m_initial_nb_unit_per_ammo; };
 
   bool CanBeUsedOnClosedMap() const { return can_be_used_on_closed_map; };
@@ -295,7 +299,7 @@ public:
 
   // Load parameters from the xml config file
   // Return true if xml has been succesfully load
-  bool LoadXml(xmlNode*  weapon);
+  bool LoadXml(const xmlNode*  weapon);
 
   // return the strength of the weapon
   double ReadStrength() const { return m_strength; };
diff --git a/src/weapon/weapon_cfg.cpp b/src/weapon/weapon_cfg.cpp
index aabafa1..ec714a1 100644
--- a/src/weapon/weapon_cfg.cpp
+++ b/src/weapon/weapon_cfg.cpp
@@ -24,7 +24,7 @@
 #include "tool/xml_document.h"
 //-----------------------------------------------------------------------------
 
-void EmptyWeaponConfig::LoadXml(xmlNode* /*elem*/)
+void EmptyWeaponConfig::LoadXml(const xmlNode* /*elem*/)
 {}
 
 //-----------------------------------------------------------------------------
@@ -32,7 +32,7 @@ void EmptyWeaponConfig::LoadXml(xmlNode* /*elem*/)
 WeaponConfig::WeaponConfig()
 { damage = 10; }
 
-void WeaponConfig::LoadXml(xmlNode* elem)
+void WeaponConfig::LoadXml(const xmlNode* elem)
 {
   XmlReader::ReadUint(elem, "damage", damage);
 }
@@ -50,7 +50,7 @@ ExplosiveWeaponConfig::ExplosiveWeaponConfig()
   speed_on_hit = 0 ;
 }
 
-void ExplosiveWeaponConfig::LoadXml(xmlNode* elem)
+void ExplosiveWeaponConfig::LoadXml(const xmlNode* elem)
 {
   WeaponConfig::LoadXml (elem);
   XmlReader::ReadUint(elem, "timeout", timeout);
diff --git a/src/weapon/weapon_cfg.h b/src/weapon/weapon_cfg.h
index 96d5e52..a39046b 100644
--- a/src/weapon/weapon_cfg.h
+++ b/src/weapon/weapon_cfg.h
@@ -31,7 +31,7 @@ class EmptyWeaponConfig
 {
 public:
    virtual ~EmptyWeaponConfig() {};
-   virtual void LoadXml(xmlNode* elem) = 0;
+   virtual void LoadXml(const xmlNode* elem) = 0;
 };
 
 //-----------------------------------------------------------------------------
@@ -43,7 +43,7 @@ public:
 public:
   WeaponConfig();
   virtual ~WeaponConfig() {};
-  virtual void LoadXml(xmlNode* elem);
+  virtual void LoadXml(const xmlNode* elem);
 };
 
 //-----------------------------------------------------------------------------
@@ -61,7 +61,7 @@ public:
 public:
   ExplosiveWeaponConfig();
   virtual ~ExplosiveWeaponConfig() {};
-  virtual void LoadXml(xmlNode* elem);
+  virtual void LoadXml(const xmlNode* elem);
 };
 
 //-----------------------------------------------------------------------------
diff --git a/src/weapon/weapon_launcher.cpp b/src/weapon/weapon_launcher.cpp
index 15d3d2f..71ae5ce 100644
--- a/src/weapon/weapon_launcher.cpp
+++ b/src/weapon/weapon_launcher.cpp
@@ -76,11 +76,27 @@ void WeaponBullet::SignalOutOfMap()
 
 void WeaponBullet::SignalObjectCollision(PhysicalObj * obj, const Point2d& my_speed_before)
 {
+#if 1
   if (!obj->IsCharacter())
     Explosion();
   obj->SetEnergyDelta(-(int)cfg.damage);
   obj->AddSpeed(cfg.speed_on_hit, my_speed_before.ComputeAngle());
   Ghost();
+#else
+  // multiply by ten to get something more funny
+  double bullet_mass = GetMass()/* * 10*/;
+  double total_mass = bullet_mass + obj->GetMass();
+  // computing new speed of character
+  Point2d v2 = (my_speed_before * (1 + 0.8) * bullet_mass +
+                obj->GetSpeed() * (obj->GetMass() - 0.8 * bullet_mass)) / total_mass;
+  // Pushing a little upward character to allow him to be pushed by the projectile
+  obj->SetXY(Point2i(obj->GetX(), obj->GetY() - 3));
+  obj->SetSpeedXY(v2);
+  obj->SetEnergyDelta(-(int)cfg.damage);
+  if (!obj->IsCharacter())
+    Explosion();
+  Ghost();
+#endif
 }
 
 void WeaponBullet::Refresh()
@@ -196,7 +212,7 @@ void WeaponProjectile::Refresh()
   }
   SetSize(image->GetSizeMax());
   // Explose after timeout
-  double tmp = Time::GetInstance()->Read() - begin_time;
+  int tmp = Time::GetInstance()->Read() - begin_time;
 
   if(cfg.timeout && tmp > 1000 * (GetTotalTimeout())) SignalTimeout();
 }
@@ -232,10 +248,10 @@ void WeaponProjectile::Draw()
   {
     Rectanglei test_rect(GetTestRect());
     test_rect.SetPosition(test_rect.GetPosition() - Camera::GetInstance()->GetPosition());
-    AppWormux::GetInstance()->video->window.RectangleColor(test_rect, primary_red_color, 1);
+    GetMainWindow().RectangleColor(test_rect, primary_red_color, 1);
 
     Rectanglei rect(GetPosition() - Camera::GetInstance()->GetPosition(), image->GetSizeMax());
-    AppWormux::GetInstance()->video->window.RectangleColor(rect, primary_blue_color, 1);
+    GetMainWindow().RectangleColor(rect, primary_blue_color, 1);
   }
 #endif
 }
@@ -455,11 +471,11 @@ void WeaponLauncher::Draw()
   {
     Point2i p = ActiveCharacter().GetHandPosition() - Camera::GetInstance()->GetPosition();
     // Red color for the blast range (should be superior to the explosion_range)
-    AppWormux::GetInstance()->video->window.CircleColor(p.x, p.y, (int)cfg->blast_range, c_red);
+    GetMainWindow().CircleColor(p.x, p.y, (int)cfg->blast_range, c_red);
     // Yellow color for the blast range (should be superior to the explosion_range)
-    AppWormux::GetInstance()->video->window.CircleColor(p.x, p.y, (int)cfg->explosion_range, c_black);
+    GetMainWindow().CircleColor(p.x, p.y, (int)cfg->explosion_range, c_black);
   }
-  AppWormux::GetInstance()->video->window.CircleColor(GetGunHolePosition().x-Camera::GetInstance()->GetPositionX(), GetGunHolePosition().y-Camera::GetInstance()->GetPositionY(), 5, c_black);
+  GetMainWindow().CircleColor(GetGunHolePosition().x-Camera::GetInstance()->GetPositionX(), GetGunHolePosition().y-Camera::GetInstance()->GetPositionY(), 5, c_black);
 #endif
 }
 
diff --git a/src/weapon/weapon_launcher.h b/src/weapon/weapon_launcher.h
index 5377d4e..4bc7f15 100644
--- a/src/weapon/weapon_launcher.h
+++ b/src/weapon/weapon_launcher.h
@@ -38,7 +38,7 @@ class WeaponProjectile : public PhysicalObj
     bool explode_with_collision;
     bool can_drown;
     bool camera_in_advance;
-    double begin_time;
+    uint begin_time;
 
     ExplosiveWeaponConfig& cfg;
 
diff --git a/src/weapon/weapons_list.cpp b/src/weapon/weapons_list.cpp
index 5efb458..874e86e 100644
--- a/src/weapon/weapons_list.cpp
+++ b/src/weapon/weapons_list.cpp
@@ -72,6 +72,7 @@ WeaponsList::WeaponsList()
   m_weapons_list.push_back(new GnuLauncher);
   m_weapons_list.push_back(new PolecatLauncher);
   m_weapons_list.push_back(new BounceBallLauncher);
+  m_weapons_list.push_back(new Slap);
   m_weapons_list.push_back(new Teleportation);
   m_weapons_list.push_back(new Parachute);
   m_weapons_list.push_back(new Suicide);
diff --git a/tools/win32_setup/English.nsh b/tools/win32_setup/English.nsh
index 45a80e6..0228628 100644
--- a/tools/win32_setup/English.nsh
+++ b/tools/win32_setup/English.nsh
@@ -1,5 +1,8 @@
 ; English NSIS installer translation
 
+!define WORMUX_PROMPT_NO_RIGHTS "Not enough rights to install, aborting"
+!define WORMUX_PROMPT_CONTINUE  "Unable to uninstall the currently installed version of Wormux. The new version will be installed without removing the currently installed version."
+
 ; License Page
 !define WORMUX_TITLE            "Wormux"
 !define WORMUX_DESC             "Installs Wormux game ${WORMUX_VERSION}"
@@ -11,5 +14,9 @@
 !define WORMUX_STARTM_SC_DESC   "Place a shortcut in the start menu, Wormux location"
 !define WORMUX_UNINST_SC_DESC   "Place an uninstall shortcut in the start menu, Wormux location"
 !define WORMUX_SHORCUTS_TITLE   "Shortcut installation"
+!define WORMUX_REMOVE_TITLE     "Uninstall previous version"
+
+!define WORMUX_CONFIG_SC_DESC   "Shortcut to user config folder"
+!define WORMUX_PDF_SC_DESC      "Install howto play PDFs"
 
 !define WORMUX_VISIT            "Visit the Wormux website"
diff --git a/tools/win32_setup/French.nsh b/tools/win32_setup/French.nsh
index 07877c5..c32554a 100644
--- a/tools/win32_setup/French.nsh
+++ b/tools/win32_setup/French.nsh
@@ -1,16 +1,22 @@
 ; French NSIS installer translation
 
+!define WORMUX_PROMPT_NO_RIGHTS "Pas assez de droits pour l'installation, annulation"
+!define WORMUX_PROMPT_CONTINUE  "Impossible de désinstaller la version de Wormux en place. La nouvelle version sera installée sans supprimer la version en place."
+
 ; License Page
 !define WORMUX_TITLE            "Wormux"
 !define WORMUX_DESC             "Installe le jeu Wormux en version ${WORMUX_VERSION}"
-!define WORMUX_BUTTON           "Suivant >"
 !define WORMUX_BOTTOM_TEXT      "${WORMUX_TITLE} est disponible sous licence GNU General Public License (GPL). Le texte de licence suivant est fourni uniquement à titre informatif. $_CLICK"
+!define WORMUX_BUTTON           "Suivant >"
 
 !define WORMUX_SHORTCUTS_DESC   "Installer les raccourcis"
 !define WORMUX_DESKTOP_SC_DESC  "Raccourci sur le bureau pour lancer Wormux"
 !define WORMUX_STARTM_SC_DESC   "Raccourci dans le menu Démarrer\Wormux"
 !define WORMUX_UNINST_SC_DESC   "Raccourci de désinstallation dans le menu Démarrer\Wormux"
-
 !define WORMUX_SHORCUTS_TITLE   "Installation des raccourcis"
+!define WORMUX_REMOVE_TITLE     "Désinstallation de la version précédente"
+
+!define WORMUX_CONFIG_SC_DESC   "Raccourci vers le répertoire de config utilisateur"
+!define WORMUX_PDF_SC_DESC      "Installation des raccourcis vers les fichiers d'aide"
 
 !define WORMUX_VISIT            "Visiter le site web de Wormux"
diff --git a/tools/win32_setup/create_setup.sh b/tools/win32_setup/create_setup.sh
index e5f2f5f..a7bd025 100755
--- a/tools/win32_setup/create_setup.sh
+++ b/tools/win32_setup/create_setup.sh
@@ -13,7 +13,9 @@ BINDIR=/mingw
 HKLM_PATH="SOFTWARE\Games\Wormux"
 
 # Version number in installer
-WORMUX_VERSION=0.8
+WORMUX_VERSION=r$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
+
+#0.8.1
 
 # Set compression and in/out
 COMPRESSION="/solid lzma"
@@ -30,12 +32,14 @@ if [ "$OSTYPE" == "linux-gnu" ]; then
   WIN_WORMUXDIR="$PWD/../.."
   LOCAL_PATH="$PWD"
   SEP="/"
+  i586-mingw32msvc-strip ../../src/wormux.exe
 else
   PKG_CONFIG=pkg-config
   SDL_CONFIG=sdl-config
   WIN_WORMUXDIR=$(cd "$WORMUXDIR" && cmd /c cd)
   LOCAL_PATH=$(cmd /c cd)
   SEP="\\"
+  strip ../../src/wormux.exe
 fi
 
 mkdir -p $DEST
@@ -57,26 +61,39 @@ fi
 # Create head
 cat > $NSIS <<EOF
 ;based on MUI Welcome/Finish Page Example Script written by Joost Verburg
-!include "MUI.nsh"
+!include "MUI2.nsh"
 !include "Sections.nsh"
 !include "LogicLib.nsh"
+!include "FileFunc.nsh"
+!insertmacro GetParent
+
 
 Name "Wormux"
 !define WORMUX_VERSION  "${WORMUX_VERSION}"
 ;Version resource
-VIProductVersion        "0.8.0.2"
+VIProductVersion        "0.8.1.0"
 VIAddVersionKey         "FileDescription"       "Wormux Installer"
 VIAddVersionKey         "ProductName"           "Wormux"
 VIAddVersionKey         "FileVersion"           "${WORMUX_VERSION}"
 VIAddVersionKey         "ProductVersion"        "${WORMUX_VERSION}"
-VIAddVersionKey         "LegalCopyright"        "(C) 2001-2007 The Wormux Project"
+VIAddVersionKey         "LegalCopyright"        "(C) 2001-2008 The Wormux Project"
 
 ;General
 OutFile "${LOCAL_PATH}\Wormux-Setup-${WORMUX_VERSION}.exe"
 SetCompressor ${COMPRESSION}
-
-;--------------------------------
-;Modern UI Configuration
+ShowInstDetails show
+ShowUninstDetails show
+SetDateSave on
+RequestExecutionLevel highest
+
+!define WORMUX_REG_KEY          "${HKLM_PATH}"
+!define WORMUX_UNINSTALL_KEY    "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Wormux"
+!define HKLM_APP_PATHS_KEY      "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\wormux.exe"
+!define STARTUP_RUN_KEY         "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Modern UI Configuration ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   !define MUI_ICON                          "${LOCAL_PATH}${SEP}install.ico"
   !define MUI_UNICON                        "${LOCAL_PATH}${SEP}uninstall.ico"
   ; Alter License section
@@ -84,9 +101,9 @@ SetCompressor ${COMPRESSION}
   !define MUI_LICENSEPAGE_TEXT_BOTTOM       \$(WORMUX_BOTTOM_TEXT)
   ; Language
   !define MUI_LANGDLL_ALWAYSSHOW
-  !define MUI_LANGDLL_REGISTRY_ROOT         "HKLM"
-  !define MUI_LANGDLL_REGISTRY_KEY"         ${HKLM_PATH}"
-  !define MUI_LANGDLL_REGISTRY_VALUENAME    "lang"
+  !define MUI_LANGDLL_REGISTRY_ROOT         "HKCU"
+  !define MUI_LANGDLL_REGISTRY_KEY          "\${WORMUX_REG_KEY}"
+  !define MUI_LANGDLL_REGISTRY_VALUENAME    "Installer Language"
   ; Misc stuff
   !define MUI_COMPONENTSPAGE_SMALLDESC
   !define MUI_ABORTWARNING
@@ -99,8 +116,8 @@ SetCompressor ${COMPRESSION}
   !define MUI_FINISHPAGE_LINK               \$(WORMUX_VISIT)
   !define MUI_FINISHPAGE_LINK_LOCATION      "http://www.wormux.org"
 
-;--------------------------------
-;Pages
+  ;--------------------------------
+  ;Pages
   ; Install
   !insertmacro MUI_PAGE_WELCOME
   !insertmacro MUI_PAGE_LICENSE \$(WormuxLicense)
@@ -114,38 +131,35 @@ SetCompressor ${COMPRESSION}
   !insertmacro MUI_UNPAGE_INSTFILES
   !insertmacro MUI_UNPAGE_FINISH
 
-;--------------------------------
-;Languages
+  ;--------------------------------
+  ;Languages
   !insertmacro MUI_LANGUAGE "English"
   LicenseLangString WormuxLicense "English" "${WIN_WORMUXDIR}\doc\license\COPYING.en.txt"
-  LangString TITLE_Wormux "English" "Wormux"
-  LangString DESC_Wormux  "English" "Installs the game Wormux, version ${WORMUX_VERSION}"
 
   !insertmacro MUI_LANGUAGE "French"
   LicenseLangString WormuxLicense "French" "${WIN_WORMUXDIR}\doc\license\COPYING.fr.txt"
-  LangString TITLE_Wormux "French" "Wormux"
-  LangString DESC_Wormux  "French" "Installe le jeu Wormux, en version ${WORMUX_VERSION}"
+
+  !insertmacro MUI_LANGUAGE "Greek"
+  LicenseLangString WormuxLicense "Greek" "${WIN_WORMUXDIR}\doc\license\COPYING.el.txt"
+
+  !insertmacro MUI_LANGUAGE "Polish"
+  LicenseLangString WormuxLicense "Polish" "${WIN_WORMUXDIR}\doc\license\COPYING.pl.txt"
 
   !insertmacro MUI_LANGUAGE "German"
   LicenseLangString WormuxLicense "German" "${WIN_WORMUXDIR}\doc\license\COPYING.de.txt"
   LangString TITLE_Wormux "German" "Wormux"
-  LangString DESC_Wormux  "German" "Das Spiel Wormux, Version ${WORMUX_VERSION} anbringen"
+  LangString DESC_Wormux  "German" "Wormux ${WORMUX_VERSION}"
 
   !insertmacro MUI_LANGUAGE "Spanish"
   LicenseLangString WormuxLicense "Spanish" "${WIN_WORMUXDIR}\doc\license\COPYING.es.txt"
   LangString TITLE_Wormux "Spanish" "Wormux"
-  LangString DESC_Wormux  "Spanish" "Instala el juego Wormux, versión ${WORMUX_VERSION}"
+  LangString DESC_Wormux  "Spanish" "Wormux ${WORMUX_VERSION}"
 
   !insertmacro MUI_LANGUAGE "Dutch"
   LicenseLangString WormuxLicense "Dutch" "${WIN_WORMUXDIR}\doc\license\COPYING.nl.txt"
   LangString TITLE_Wormux "Dutch" "Wormux"
   LangString DESC_Wormux  "Dutch" "Wormux ${WORMUX_VERSION}"
 
-  !insertmacro MUI_LANGUAGE "Polish"
-  LicenseLangString WormuxLicense "Polish" "${WIN_WORMUXDIR}\doc\license\COPYING.pl.txt"
-  LangString TITLE_Wormux "Polish" "Wormux"
-  LangString DESC_Wormux  "Polish" "Wormux ${WORMUX_VERSION}"
-
   !insertmacro MUI_LANGUAGE "Russian"
   LicenseLangString WormuxLicense "Russian" "${WIN_WORMUXDIR}\doc\license\COPYING.ru.txt"
   LangString TITLE_Wormux "Russian" "Wormux"
@@ -162,25 +176,154 @@ SetCompressor ${COMPRESSION}
   !include "${LOCAL_PATH}\langmacros.nsh"
   !insertmacro WORMUX_MACRO_INCLUDE_LANGFILE "ENGLISH"  "${LOCAL_PATH}\English.nsh"
   !insertmacro WORMUX_MACRO_INCLUDE_LANGFILE "FRENCH"   "${LOCAL_PATH}\French.nsh"
+  !insertmacro WORMUX_MACRO_INCLUDE_LANGFILE "POLISH"   "${LOCAL_PATH}\Polish.nsh"
+  !insertmacro WORMUX_MACRO_INCLUDE_LANGFILE "GREEK"    "${LOCAL_PATH}\Greek.nsh"
+
+  ;--------------------------------
+  ;Reserve Files
+  ;If you are using solid compression, files that are required before
+  ;the actual installation should be stored first in the data block,
+  ;because this will make your installer start faster.
+
+  !insertmacro MUI_RESERVEFILE_LANGDLL
+
+  ;--------------------------------
+  ;Folder-selection page
+  InstallDir "\$PROGRAMFILES\Wormux"
+  ; Registry key to check for directory (so if you install again, it will 
+  ; overwrite the old one automatically)
+  InstallDirRegKey HKLM "\${WORMUX_REG_KEY}" "Path"
+  AutoCloseWindow false
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Start Install Sections ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;-----------------------------------------
+;Create folder only if it doesnt exist yet
+!macro CreateDirectoryOnce FOLDER
+  IfFileExists "\${FOLDER}\\*.*" +1
+    CreateDirectory "\${FOLDER}"
+!macroend
 
 ;--------------------------------
-;Folder-selection page
-InstallDir "\$PROGRAMFILES\Wormux"
-; Registry key to check for directory (so if you install again, it will 
-; overwrite the old one automatically)
-InstallDirRegKey HKLM ${HKLM_PATH} "Path"
-AutoCloseWindow false
+;Check (un)install rights
+!macro CheckUserInstallRightsMacro UN
+Function \${UN}CheckUserInstallRights
+  Push \$0
+  Push \$1
+  ClearErrors
+  UserInfo::GetName
+  IfErrors Win9x
+  Pop \$0
+  UserInfo::GetAccountType
+  Pop \$1
+
+  StrCmp \$1 "Admin" 0 +3
+    StrCpy \$1 "HKLM"
+    Goto done
+  StrCmp \$1 "Power" 0 +3
+    StrCpy \$1 "HKLM"
+    Goto done
+  StrCmp \$1 "User" 0 +3
+    StrCpy \$1 "HKCU"
+    Goto done
+  StrCmp \$1 "Guest" 0 +3
+    StrCpy \$1 "NONE"
+    Goto done
+  ; Unknown error
+  StrCpy \$1 "NONE"
+  Goto done
+
+  Win9x:
+    StrCpy \$1 "HKLM"
+
+  done:
+    Exch \$1
+    Exch
+    Pop \$0
+FunctionEnd
+!macroend
+!insertmacro CheckUserInstallRightsMacro ""
+!insertmacro CheckUserInstallRightsMacro "un."
+
+;--------------------------------
+; Uninstall any old version of Wormux
+
+; Section hidden because automatically selected by the installer
+Section \$(WORMUX_REMOVE_TITLE) SecUninstallOldWormux
+  ; Check install rights..
+  StrCpy \$R3 \${WORMUX_REG_KEY}
+  StrCpy \$R4 \${wORMUX_UNINSTALL_KEY}
+  StrCpy \$R5 "uninstall.exe"
+  Call CheckUserInstallRights
+  Pop \$R0
+  ; "NONE" case already handled at start
+  StrCmp \$R0 "HKCU" _hkcu
+    ReadRegStr \$R1 HKLM \$R3 ""
+    ReadRegStr \$R2 HKLM "\$R4" "UninstallString"
+    Goto try_uninstall
+
+  _hkcu:
+    ReadRegStr \$R1 HKCU \$R3 ""
+    ReadRegStr \$R2 HKCU "\$R4" "UninstallString"
+
+  ; If a previous version exists, remove it
+  try_uninstall:
+    ; If first string is unavailable, Wormux was probably not installed
+    StrCmp \$R1 "" done
+      ; Check if we have uninstall string..
+      IfFileExists \$R2 0 no_file
+        ; Have uninstall string, go ahead and uninstall.
+        SetOverwrite on
+        ; Need to copy uninstaller outside of the install dir
+        ClearErrors
+        CopyFiles /SILENT \$R2 "\$TEMP\\\$R5"
+        SetOverwrite off
+        IfErrors uninstall_problem
+          ; Ready to uninstall..
+          ClearErrors
+          ExecWait '"\$TEMP\\\$R5" /S _?=\$R1'
+          IfErrors exec_error
+            Delete "\$TEMP\\\$R5"
+            Goto done
+
+          exec_error:
+            Delete "\$TEMP\\\$R5"
+            Goto uninstall_problem
+
+  no_file:
+    MessageBox MB_OK "No uninstaller exe found" /SD IDOK IDOK done
+
+  uninstall_problem:
+    ; We cant uninstall. Either the user must manually uninstall or
+    ; we ignore and reinstall over it.
+    MessageBox MB_OKCANCEL \$(WORMUX_PROMPT_CONTINUE) /SD IDOK IDCANCEL done
+    Quit
+
+  done:
+SectionEnd
 
 ;--------------------------------
-;Installer Sections
+; Installer Sections
 
 Section \$(TITLE_Wormux) Sec_Wormux
+  ; Create install and config folders
+  CreateDirectory "\$INSTDIR"
+  CreateDirectory "\$APPDATA\\Wormux"
   ; Set output path to the installation directory.
-  SetOutPath \$INSTDIR
+  SetOutPath "\$INSTDIR"
   File "${WIN_WORMUXDIR}\src\wormux.ico"
   ; Executing in tmpdir, looking for file in folder below
   File "${LOCAL_PATH}\uninstall.ico"
   File "${WIN_WORMUXDIR}\src\wormux.exe"
+  WriteUninstaller "uninstall.exe"
+  ; data
+  File /r /x .svn /x Makefile* /x Makefile.* "${WIN_WORMUXDIR}\\data"
+  ; Licenses
+  File /r /x .svn "${WIN_WORMUXDIR}\\doc\\license"
+  ; Howto-play PDFs
+  File /r /x .svn "${WIN_WORMUXDIR}\\doc\\howto_play"
 EOF
 
 # Glib (gobject, gthread, glib & gmodule)
@@ -209,66 +352,106 @@ for gmo in "$WORMUXDIR"/po/*.gmo; do
   lg=${gmo%%.gmo}
   lg=${lg//.*\//}
   echo "  SetOutPath \$INSTDIR\\locale\\$lg\\LC_MESSAGES" >> $NSIS
-  echo "  File /oname=wormux.mo \"$WIN_WORMUXDIR${SEP}po${SEP}$lg.gmo\"" >> $NSIS
+  echo "  File /oname=wormux.mo \"${WIN_WORMUXDIR}${SEP}po${SEP}$lg.gmo\"" >> $NSIS
 done
 
-## Data - I love this syntax
+## Various files
 cat >> $NSIS <<EOF
-  ; Data
-  SetOutPath \$INSTDIR
-  File /r /x .svn /x Makefile* /x Makefile.* "${WIN_WORMUXDIR}\\data"
+  Call CheckUserInstallRights
+  Pop \$R0
+  ; "NONE" case already handled at start
+  StrCmp \$R0 "HKCU" _hkcu
+    WriteRegStr HKLM "\${HKLM_APP_PATHS_KEY}" "" "\$INSTDIR\wormux.exe"
+    WriteRegStr HKLM "\${WORMUX_REG_KEY}" "" "\$INSTDIR"
+    WriteRegStr HKLM "\${WORMUX_REG_KEY}" "Version" "${WORMUX_VERSION}"
+    WriteRegStr HKLM "\${WORMUX_UNINSTALL_KEY}" "DisplayName" "Wormux"
+    WriteRegStr HKLM "\${WORMUX_UNINSTALL_KEY}" "DisplayVersion" "${WORMUX_VERSION}"
+    WriteRegStr HKLM "\${WORMUX_UNINSTALL_KEY}" "UninstallString" "\$INSTDIR\uninstall.exe"
+    ;Write language to the registry (for the uninstaller)
+    WriteRegStr HKLM "\${WORMUX_REG_KEY}" "Installer Language" \$LANGUAGE
+    ; Sets scope of the desktop and Start Menu entries for all users.
+    SetShellVarContext "all"
+    Goto _next
+
+  _hkcu:
+    WriteRegStr HKCU "\${WORMUX_REG_KEY}" "" "\$INSTDIR"
+    WriteRegStr HKCU "\${WORMUX_REG_KEY}" "Version" "${WORMUX_VERSION}"
+    WriteRegStr HKCU "\${WORMUX_UNINSTALL_KEY}" "DisplayName" "Pidgin"
+    WriteRegStr HKCU "\${WORMUX_UNINSTALL_KEY}" "DisplayVersion" "${WORMUX_VERSION}"
+    WriteRegStr HKCU "\${WORMUX_UNINSTALL_KEY}" "UninstallString" "\$INSTDIR\\uninstall.exe"
+    ;Write language to the registry (for the uninstaller)
+    WriteRegStr HKCU "\${WORMUX_REG_KEY}" "Installer Language" \$LANGUAGE
+    ;SetShellVarContext "current"
+
+  _next:
+SectionEnd ; Installer section
+
+;--------------------------------
+;Shortcuts
+SectionGroup /e \$(WORMUX_SHORCUTS_TITLE) Sec_Shortcuts
+  ; Shortcut to config folder
+  Section \$(WORMUX_CONFIG_SC_DESC) Sec_ConfigShortcut
+    SetOutPath "\$INSTDIR"
+    SetOverwrite on
+    !insertmacro CreateDirectoryOnce "\$SMPROGRAMS\\Wormux"
+    CreateShortcut  "\$SMPROGRAMS\\Wormux\\Config.lnk" "\$APPDATA\\Wormux" "" "" 0
+    SetOverwrite off
+  SectionEnd
+
+  ; Group of shortcuts for pdfs
+  SectionGroup /e \$(WORMUX_PDF_SC_DESC) Sec_PdfShortcut
 EOF
 
-## License
-cat >> $NSIS <<EOF
-  ; Licenses
-  File /r /x .svn "${WIN_WORMUXDIR}\\doc\\license"
+## PDF stuff
+lang=$(ls ../../doc/howto_play/*.pdf)
+lang=${lang//.pdf}
+lang=${lang//..\/..\/doc\/howto_play\/}
+for f in $lang; do
+  cat >> $NSIS <<EOF
+    ; PDF for language $f
+    Section $f
+      SetOutPath "\$INSTDIR"
+      SetOverwrite on
+      File "/oname=help-$f.pdf" "${WIN_WORMUXDIR}${SEP}doc${SEP}howto_play${SEP}${f}.pdf"
+      !insertmacro CreateDirectoryOnce "\$SMPROGRAMS\\Wormux"
+      CreateShortcut  "\$SMPROGRAMS\\Wormux\\howto-$f.lnk" "\$INSTDIR\\help-$f.pdf" "" "" 0
+      SetOverwrite off
+    SectionEnd
 EOF
+done
 
-# End
 cat >> $NSIS <<EOF
+  SectionGroupEnd
 
-  ; Write the installation path into the registry
-  WriteRegStr HKLM ${HKLM_PATH} "Path" "\$INSTDIR"
-  ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wormux" "DisplayName" "Wormux (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wormux" "UninstallString" '"\$INSTDIR\uninstall.exe"'
-  WriteUninstaller "uninstall.exe"
-
-  ; Shortcuts
-  SetShellVarContext all
-  CreateDirectory "\$SMPROGRAMS\Wormux"
-  CreateShortCut  "\$SMPROGRAMS\Wormux\Wormux.lnk" "\$INSTDIR\Wormux.exe" "" "\$INSTDIR\Wormux.exe" 0
-  CreateShortCut  "\$SMPROGRAMS\Wormux\Uninstall.lnk" "\$INSTDIR\uninstall.exe" "" "\$INSTDIR\uninstall.exe" 0
-  ;Write language to the registry (for the uninstaller)
-  WriteRegStr HKLM ${HKLM_PATH} "Installer Language" \$LANGUAGE
-
-  GetFullPathName /SHORT \$SHORTINSTDIR \$INSTDIR
-SectionEnd
-
-;--------------------------------
-;Shortcuts
-SubSection /e \$(WORMUX_SHORCUTS_TITLE) Sec_Shortcuts
+  ; Desktop shortcut
   Section /o \$(WORMUX_DESKTOP_SC_DESC) Sec_DesktopShortcut
     SetOverwrite on
-    CreateShortCut "\$DESKTOP\WORMUX.lnk" "\$INSTDIR\wormux.exe" \
-      "" "\$INSTDIR\wormux.exe" 0
+    CreateShortCut "\$DESKTOP\\WORMUX.lnk" "\$INSTDIR\\wormux.exe" \
+      "" "\$INSTDIR\\wormux.exe" 0
     SetOverwrite off
   SectionEnd
+
+  ; Wormux shortcut in start menu
   Section \$(WORMUX_STARTM_SC_DESC) Sec_StartMenuShortcut
     SetOverwrite on
-    CreateDirectory "\$SMPROGRAMS\Wormux"
-    CreateShortCut "\$SMPROGRAMS\Wormux\Wormux.lnk" \
-      "\$INSTDIR\wormux.exe" "" "\$INSTDIR\wormux.exe" 0
+    !insertmacro CreateDirectoryOnce "\$SMPROGRAMS\\Wormux"
+    CreateShortCut "\$SMPROGRAMS\\Wormux\\Wormux.lnk" \
+      "\$INSTDIR\\wormux.exe" "" "\$INSTDIR\\wormux.exe" 0
     SetOverwrite off
   SectionEnd
+
+  ; Wormux uninstall shortcut in start menu
+  ; Might be forced if user has no install rights, because it would be complex otherwise:
+  ; - No uninstall available in Windows "Program uninstall"
+  ; - Folder lost in APPDATA, which can be hidden, etc
   Section \$(WORMUX_UNINST_SC_DESC) Sec_UninstallShortCut
     SetOverwrite on
-    CreateShortCut  "\$SMPROGRAMS\Wormux\Uninstall.lnk" \
-      "\$INSTDIR\uninstall.exe" "" "\$INSTDIR\uninstall.exe" 0
+    !insertmacro CreateDirectoryOnce "\$SMPROGRAMS\\Wormux"
+    CreateShortCut  "\$SMPROGRAMS\\Wormux\\Uninstall.lnk" \
+         "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
     SetOverwrite off
   SectionEnd
-SubSectionEnd
+SectionGroupEnd
 
 ;--------------------------------
 ;Descriptions
@@ -281,33 +464,97 @@ SubSectionEnd
     !insertmacro MUI_DESCRIPTION_TEXT   \${Sec_UninstallShortcut}  \$(WORMUX_UNINST_SC_DESC)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
+
 ;--------------------------------
 ;Uninstaller Section
 
 Section "Uninstall"
-  ; remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Wormux"
-  DeleteRegKey HKLM ${HKLM_PATH}
-  DeleteRegKey HKCU ${HKLM_PATH}
-  ; remove shortcuts, if any.
-  SetShellVarContext all
-  Delete "\$SMPROGRAMS\Wormux\*.*"
-  RMDir  "\$SMPROGRAMS\Wormux"
-  Delete "\$SMPROGRAMS\Wormux.lnk"
-  Delete "\$DESKTOP\Wormux.lnk"
-  ; remove files
-  RMDir /r "\$INSTDIR"
+  ; Set install path according to user rights
+  Call un.CheckUserInstallRights
+  Pop \$R0
+  StrCmp \$R0 "HKLM" _hklm
+
+  ; Also used as fallback by HKLM case
+  _hkcu:
+    ReadRegStr \$R0 HKCU "\${WORMUX_REG_KEY}" ""
+    StrCmp \$R0 "\$INSTDIR" 0 _next
+      ; HKCU install path matches our INSTDIR so uninstall
+      DeleteRegKey HKCU "\${WORMUX_REG_KEY}"
+      DeleteRegKey HKCU "\${WORMUX_UNINSTALL_KEY}"
+      Goto _next
+
+  _hklm:
+    ReadRegStr \$R0 HKLM "\${WORMUX_REG_KEY}" ""
+    StrCmp \$R0 \$INSTDIR 0 _hkcu
+      ; HKLM install path matches our INSTDIR so uninstall
+      DeleteRegKey HKLM "\${HKLM_APP_PATHS_KEY}"
+      DeleteRegKey HKLM "\${WORMUX_REG_KEY}"
+      DeleteRegKey HKLM "\${WORMUX_UNINSTALL_KEY}"
+      SetShellVarContext all
+
+  _next:
+    ; Remove Language preference info
+    DeleteRegValue HKCU "\${WORMUX_REG_KEY}" "Installer Language"
+    ; remove shortcuts, if any.
+    Delete "\$SMPROGRAMS\\Wormux\\*.*"
+    RMDir  "\$SMPROGRAMS\\Wormux"
+    Delete "\$SMPROGRAMS\\Wormux.lnk"
+    Delete "\$DESKTOP\\Wormux.lnk"
+    ; remove files
+    RMDir /r "\$INSTDIR"
 SectionEnd
 
 Function .onInit
   ;Language selection
   !insertmacro MUI_LANGDLL_DISPLAY
+
   IntOp \$R0 \${SF_RO} | \${SF_SELECTED}
   SectionSetFlags \${Sec_Wormux} \$R0
+  SectionSetFlags \${Sec_ConfigShortcut} \$R0
+  SectionSetFlags \${SecUninstallOldWormux} \$R0
+
+  ; Set install path according to user rights
+  Call CheckUserInstallRights
+  Pop \$R0
+  StrCmp \$R0 "NONE" _none
+  StrCmp \$R0 "HKLM" 0 _hkcu
+    StrCpy \$INSTDIR "\$PROGRAMFILES\\Wormux"
+    Goto _done
+
+  _hkcu:
+    Push \$SMPROGRAMS
+    \${GetParent} \$SMPROGRAMS \$R2
+    \${GetParent} \$R2 \$R2
+    StrCpy \$INSTDIR "\$R2\\Wormux"
+    ; In this case uninstall shortcut *must* be available because
+    ; the alternative are complex for the user
+    IntOp \$R0 \${SF_RO} | \${SF_SELECTED}
+    SectionSetFlags \${Sec_UninstallShortCut} \$R0
+    Goto _done
+
+  _none:
+   ; Not going to bother
+   MessageBox MB_OK \$(WORMUX_PROMPT_NO_RIGHTS) /SD IDOK
+   Quit
+
+  _done:
 FunctionEnd
 
+; INSTDIR will be determined by reading a registry key
 Function un.onInit
   !insertmacro MUI_UNGETLANGUAGE
+  ; Set install path according to user rights
+  Call un.CheckUserInstallRights
+  Pop \$R0
+  StrCmp \$R0 "NONE" _none
+    Goto _end
+
+  _none:
+   ; Not going to bother
+   MessageBox MB_OK \$(WORMUX_PROMPT_NO_RIGHTS) /SD IDOK
+   Quit
+
+  _end:
 FunctionEnd
 EOF
 
diff --git a/tools/win32_setup/langmacros.nsh b/tools/win32_setup/langmacros.nsh
index a48ff13..d207ae5 100644
--- a/tools/win32_setup/langmacros.nsh
+++ b/tools/win32_setup/langmacros.nsh
@@ -30,10 +30,10 @@
   ; String labels should match those from the default language file.
 
   ; License Page
-  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_BUTTON         ${CUR_LANG}
-  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_BOTTOM_TEXT    ${CUR_LANG}
-  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_TITLE          ${CUR_LANG}
-  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_DESC           ${CUR_LANG}
+  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_BUTTON             ${CUR_LANG}
+  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_BOTTOM_TEXT        ${CUR_LANG}
+  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_TITLE              ${CUR_LANG}
+  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_DESC               ${CUR_LANG}
 
   ; Components Page
   !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_SHORTCUTS_DESC     ${CUR_LANG}
@@ -41,6 +41,15 @@
   !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_STARTM_SC_DESC     ${CUR_LANG}
   !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_UNINST_SC_DESC     ${CUR_LANG}
   !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_SHORCUTS_TITLE     ${CUR_LANG}
+  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_CONFIG_SC_DESC     ${CUR_LANG}
+  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_PDF_SC_DESC        ${CUR_LANG}
+
+  ; Misc
+  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_PROMPT_NO_RIGHTS   ${CUR_LANG}
+  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_PROMPT_CONTINUE    ${CUR_LANG}
+
+  ; Force uninstall
+  !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_REMOVE_TITLE       ${CUR_LANG}
 
   ; Installer Finish Page
   !insertmacro WORMUX_MACRO_LANGSTRING_INSERT WORMUX_VISIT              ${CUR_LANG}
diff --git a/visual/wormux.vcproj b/visual/wormux.vcproj
index e03868a..67770d6 100644
--- a/visual/wormux.vcproj
+++ b/visual/wormux.vcproj
@@ -53,7 +53,7 @@
 				UseUnicodeResponseFiles="false"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\src&quot;;&quot;$(ProjectDir)..\src\msvc&quot;;&quot;$(GTK_BASEPATH)\include&quot;;&quot;$(GTK_BASEPATH)\include\libxml2&quot;"
-				PreprocessorDefinitions="WIN32;DEBUG;_DEBUG;CURL_STATICLIB;main=SDL_main;INSTALL_DATADIR=\&quot;data\&quot;;INSTALL_LOCALEDIR=\&quot;locale\&quot;;FONT_FILE=\&quot;data\\font\\DejaVuSans.ttf\&quot;;PACKAGE_VERSION=\&quot;0.8svn\&quot;;M_PI=3.14159265358979323846;M_PI_2=1.57079632679489661923;M_PI_4=0.78539816339744830962;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;USE_FRIBIDI"
+				PreprocessorDefinitions="WIN32;DEBUG;_DEBUG;CURL_STATICLIB;main=SDL_main;INSTALL_DATADIR=\&quot;data\&quot;;INSTALL_LOCALEDIR=\&quot;locale\&quot;;FONT_FILE=\&quot;data\\font\\LiberationSans-Regular.ttf\&quot;;PACKAGE_VERSION=\&quot;0.8svn\&quot;;M_PI=3.14159265358979323846;M_PI_2=1.57079632679489661923;M_PI_4=0.78539816339744830962;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;USE_FRIBIDI"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -684,6 +684,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\gui\talk_box.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\gui\talk_box.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\gui\text_box.cpp"
 					>
 				</File>
@@ -956,6 +964,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\menu\game_mode_editor.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\menu\game_mode_editor.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\menu\help_menu.cpp"
 					>
 				</File>
@@ -1040,6 +1056,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\menu\skin_menu.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\menu\skin_menu.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\menu\team_box.cpp"
 					>
 				</File>
@@ -1400,6 +1424,22 @@
 				Name="team"
 				>
 				<File
+					RelativePath="..\src\team\custom_team.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\team\custom_team.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\team\custom_teams_list.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\team\custom_teams_list.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\team\macro.h"
 					>
 				</File>
@@ -1500,6 +1540,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\tool\isnan.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\tool\math_tools.h"
 					>
 				</File>
@@ -1808,6 +1852,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\weapon\slap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\weapon\slap.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\weapon\snipe_rifle.cpp"
 					>
 				</File>

-- 
Wormux PKG



More information about the Pkg-games-commits mailing list