Changed files to tme

42 files changed, 306 insertions, 303 deletions

diff --git a/AUTHORS b/AUTHORS
index 19d28884..d3349490 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,22 @@
+---------------------------
+The Mana xperiment Dev Team
+---------------------------
+
+ Blameu aka Kevin Day (blame582@gmail.com)
+
+== Programmers ==
+
+ Sanga            
+ Scraggy          
+ Kraant
+
+== Artists ==
+
+
+== Map Designers ==
+
+ Ichigo Black
+
 -----------------------
 The Mana World Dev Team
 -----------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13399ef9..8181f6b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(TMW)
+PROJECT(TME)
 
 SET(VERSION 0.0.24.1)
 
@@ -18,4 +18,4 @@ ENDIF (WIN32)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(src)
 
-INSTALL(FILES tmw.desktop DESTINATION share/applications)
+INSTALL(FILES tme.desktop DESTINATION share/applications)
diff --git a/INSTALL b/INSTALL
index 81c2d148..aeb81213 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,20 +1,20 @@
-How to compile and run TMW on your GNU/Linux Box
+How to compile and run TME on your GNU/Linux Box
 ================================================
 
-Homepage:  http://themanaworld.org/
-IRC:       irc.freenode.net / #themanaworld
+Homepage:  http://209.168.213.109/
+IRC:       irc.freenode.net / #themanaexperiment
 
 1) Requirements
-2) Compiling The Mana World
+2) Compiling The Mana Experiment
 3) Notes
 
 
 1. Requirements
 ===============
 
-You are expected to have either checked out TMW from CVS or you have downloaded
-a source release. To get The Mana World to compile, you need a compiler (GCC)
-and some libraries. The required libraries are:
+You are expected to have either checked out TME from CVS or you have downloaded
+a source release. To get The Mana Experiment to compile, you need a compiler
+(GCC) and some libraries. The required libraries are:
 
 * SDL               http://www.libsdl.org/
 * SDL_mixer         http://www.libsdl.org/projects/SDL_mixer/
@@ -26,7 +26,7 @@ and some libraries. The required libraries are:
 * zlib 1.2.x        http://www.gzip.org/zlib/
 * libcurl           http://curl.haxx.se/libcurl/
 
-If you checked TMW out from Subversion you will also need these tools to
+If you checked TME out from Subversion you will also need these tools to
 compile:
 
 * GNU automake 1.9  http://www.gnu.org/software/automake/
@@ -36,8 +36,8 @@ Installing these dependencies is distributions-specific, and we'll leave it to
 you to figure this out.
 
 
-2. Compiling And Installing The Mana World
-==========================================
+2. Compiling And Installing The Mana Experiment
+===============================================
 
 1) Go to the directory you have extracted the source to.
 2) If you checked out from SVN, run "./autogen.sh" to generate configure.
@@ -45,12 +45,12 @@ you to figure this out.
 4) Run "make"
 5) Run "make install" as root
 
-It should have installed The Mana World on your system now, and you can run it
-with "tmw". By default all files are installed to /usr/local, you can pass a
-different prefix to configure as usual.
+It should have installed The Mana Experiment on your system now, and you can
+run it with "tme". By default all files are installed to /usr/local, you can
+pass a different prefix to configure as usual.
 
 
-  NOTE: It is possible to compile TMW without support for OpenGL rendering.
+  NOTE: It is possible to compile TME without support for OpenGL rendering.
   To do this perform step 3 as follows:
 
     ./configure --without-opengl
@@ -64,4 +64,4 @@ different prefix to configure as usual.
 If you have any problems, you are welcome to post your questions on our forums,
 or talk about them in our IRC channel.
 
-- The Mana World Dev Team
+- The Mana Experiment Dev Team
diff --git a/ManaWorld.vcproj b/ManaExperiment.vcproj
index 478a345c..6612e1a1 100644
--- a/ManaWorld.vcproj
+++ b/ManaExperiment.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="ManaWorld"
+	Name="ManaExperiment"
 	ProjectGUID="{DE31E83E-62BD-460E-8E6A-648CF98CC5A4}"
-	RootNamespace="ManaWorld"
+	RootNamespace="ManaExperimet"
 	Keyword="Win32Proj"
 	SignManifests="true"
 	>
@@ -65,11 +65,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="physfs.lib sdl.lib sdlmain.lib sdl_image.lib sdl_mixer.lib guichan.lib guichan_sdl.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
-				OutputFile="$(OutDir)/ManaWorld.exe"
+				OutputFile="$(OutDir)/ManaExperiment.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libc.lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/ManaWorld.pdb"
+				ProgramDatabaseFile="$(OutDir)/ManaExperiment.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
diff --git a/README b/README
index 98772d58..88da7d97 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-THE MANA WORLD
-==============
+THE MANA EXPERIMENT
+===================
 
  Version: 0.0.24.1    Date: 7/4/2007
 
@@ -122,7 +122,7 @@ level 10: enables not used
 If you're having troubles, please first of all read the FAQ.
 If you can't find a solution to your problem, feel free to check our
 Bugs/Support section of the forum:
-- http://216.139.126.36/forums
+- http://209.168.213.109/forums
 or come visit us on our IRC channel:
 - #themanaexperiment @ irc.freenode.net
 
diff --git a/The Mana World.dev b/The Mana Experiment.dev
index 76728f25..0a0acf8a 100644
--- a/The Mana World.dev
+++ b/The Mana Experiment.dev
@@ -1,13 +1,13 @@
 [Project]
-FileName=The Mana World.dev
-Name=tmw
+FileName=The Mana Experiment.dev
+Name=tme
 UnitCount=277
 Type=0
 Ver=1
 ObjFiles=
 Includes=
 Libs=
-PrivateResource=The_Mana_World_private.rc
+PrivateResource=The_Mana_Experiment_private.rc
 ResourceIncludes=
 MakeIncludes=
 Compiler=
@@ -18,7 +18,7 @@ Icon=
 ExeOutput=
 ObjectOutput=obj
 OverrideOutput=1
-OverrideOutputName=tmw.exe
+OverrideOutputName=tme.exe
 HostApplication=
 Folders=gui,gui/header,gui/source,header,header/widgets,net,net/header,net/source,resources,utils
 CommandLine=
@@ -77,16 +77,6 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit22]
-FileName=src\gui\buddywindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
 [Unit25]
 FileName=src\gui\button.h
 CompileCpp=1
diff --git a/configure.ac b/configure.ac
index b85683ff..dcc1eeeb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ else
     with_opengl=yes
     AC_CHECK_LIB([GL], [glBegin], ,
     AC_MSG_ERROR([ *** Unable to find OpenGL library]))
-    AC_DEFINE(USE_OPENGL, 1, [Defines if tmw should use an OpenGL display])
+    AC_DEFINE(USE_OPENGL, 1, [Defines if tme should use an OpenGL display])
 fi
 
 # Search for sdl-config
@@ -92,10 +92,10 @@ if test -n "$LIBSDL_CONFIG"; then
   AC_SUBST(LIBSDL_CFLAGS)
 
   AC_DEFINE_UNQUOTED(HAVE_LIBSDL, 1,
-                     [Defines if your system has the LIBSDL library])
+		     [Defines if your system has the LIBSDL library])
 else
   AC_DEFINE_UNQUOTED(HAVE_LIBSDL, 0,
-                     [Defines if your system has the LIBSDL library])
+		     [Defines if your system has the LIBSDL library])
   AC_MSG_ERROR([Could not find sdl-config, check http://www.libsdl.org])
 fi
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 5a28f7c1..86ae612d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
 
 SUBDIRS = graphics help icons
 
-tmwdatadir = $(pkgdatadir)/data
+tmedatadir = $(pkgdatadir)/data
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 375edef7..5d7adee9 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,14 +1,14 @@
 
 iconsdir = $(pkgdatadir)/data/icons
 
-icons_DATA = tmw.png
+icons_DATA = tme.png
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
+	$(INSTALL) $(srcdir)/tme.png $(DESTDIR)$(datadir)/pixmaps/tme.png
 
 uninstall-local:
-	rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png
+	rm -f $(DESTDIR)$(datadir)/pixmaps/tme.png
 
 EXTRA_DIST =		\
 	$(icons_DATA)
diff --git a/data/icons/The Mana World.icns b/data/icons/The Mana Experiment.icns
index 7230a099..7230a099 100644
--- a/data/icons/The Mana World.icns
+++ b/data/icons/The Mana Experiment.icns
diff --git a/data/icons/tmw.ico b/data/icons/tme.ico
index 61d559a3..61d559a3 100644
--- a/data/icons/tmw.ico
+++ b/data/icons/tme.ico
diff --git a/data/icons/tmw.png b/data/icons/tme.png
index 93e6c9ae..93e6c9ae 100644
--- a/data/icons/tmw.png
+++ b/data/icons/tme.png
diff --git a/data/icons/tmw.xpm b/data/icons/tme.xpm
index 06ec2865..06ec2865 100644
--- a/data/icons/tmw.xpm
+++ b/data/icons/tme.xpm
diff --git a/debian/control b/debian/control
index 4372aaea..2a77f351 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,16 @@
 Source: tmw
 Section: games
 Priority: optional
-Homepage: http://www.themanaworld.org/
+Homepage: http://209.168.213.109
 Maintainer: Patrick Matthäi <patrick.matthaei@web.de>
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
-Package: tmw
+Package: tme
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tmw-data (= ${source:Version})
-Recommends: tmw-music
-Description: The Mana World is a great Online Rolegame
+Depends: ${shlibs:Depends}, ${misc:Depends}, tme-data (= ${source:Version})
+Recommends: tme-music
+Description: The Mana Experiment is a great Online Rolegame
  based upon the Seiken Densetsu serie. It has its own universe, and its own
  character management system, which will give you the opportunity to play in a
  2D heroic-fantasy world forever.
diff --git a/debian/rules b/debian/rules
index 614ee701..68dd9400 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ binary-arch: build install
 	dh_install -a
 	dh_desktop -a
 	dh_installmenu -a
-	dh_strip -a --dbg-package=tmw-dbg
+	dh_strip -a --dbg-package=tme-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
diff --git a/debian/tme-data.install b/debian/tme-data.install
new file mode 100644
index 00000000..a836ce3d
--- /dev/null
+++ b/debian/tme-data.install
@@ -0,0 +1,5 @@
+data/graphics/gui/*.png usr/share/games/tme/data/graphics/gui
+data/graphics/images/*.png usr/share/games/tme/data/graphics/images
+data/graphics/images/ambient/*.png usr/share/games/tme/data/graphics/images/ambient
+data/graphics/tiles/*.png usr/share/games/tme/data/graphics/tiles
+data/help/*.txt usr/share/games/tme/data/help
diff --git a/debian/tmw.docs b/debian/tme.docs
index d622a527..d622a527 100644
--- a/debian/tmw.docs
+++ b/debian/tme.docs
diff --git a/debian/tme.install b/debian/tme.install
new file mode 100644
index 00000000..6c9ced58
--- /dev/null
+++ b/debian/tme.install
@@ -0,0 +1,5 @@
+debian/tme.desktop usr/share/applications
+debian/tme.xpm usr/share/pixmaps
+data/icons/tme.png usr/share/icons
+docs/tme.6 usr/share/man/man6
+src/tme usr/games
diff --git a/debian/tmw.menu b/debian/tme.menu
index 4af5ad0a..4af5ad0a 100644
--- a/debian/tmw.menu
+++ b/debian/tme.menu
diff --git a/debian/tmw.sgml b/debian/tme.sgml
index 0ed18199..0ed18199 100644
--- a/debian/tmw.sgml
+++ b/debian/tme.sgml
diff --git a/debian/tmw.xpm b/debian/tme.xpm
index 46ce5c87..e7c2222a 100644
--- a/debian/tmw.xpm
+++ b/debian/tme.xpm
@@ -1,98 +1,98 @@
 /* XPM */
-static char * tmw_xpm[] = {
+static char * tme_xpm[] = {
 "32 32 741 2",
-"  	c None",
-". 	c #E8ED72",
-"+ 	c #E7ED6A",
-"@ 	c #E1EB62",
-"# 	c #D4E758",
-"$ 	c #D2E750",
-"% 	c #CDE748",
-"& 	c #F5F4A1",
-"* 	c #F3F294",
-"= 	c #EBEE81",
-"- 	c #EAEE77",
-"; 	c #E6ED6F",
-"> 	c #E1EB68",
-", 	c #D9E859",
-"' 	c #D3E851",
-") 	c #CCE549",
-"! 	c #C7E643",
-"~ 	c #BEE239",
-"{ 	c #B3DF32",
-"] 	c #F8F8C4",
-"^ 	c #F9F7B3",
-"/ 	c #F4F3A2",
-"( 	c #F4F397",
-"_ 	c #F5F39A",
-": 	c #F2F399",
-"< 	c #E2EA6D",
-"[ 	c #DFEA66",
-"} 	c #DAE95C",
-"| 	c #D3E753",
-"1 	c #CAE54B",
-"2 	c #C7E545",
-"3 	c #BFE23C",
-"4 	c #B7E034",
-"5 	c #B1E130",
-"6 	c #A5DC28",
-"7 	c #F9F9DA",
-"8 	c #F9F8CA",
-"9 	c #F8F7C9",
-"0 	c #F8F7CD",
-"a 	c #F9F7C7",
-"b 	c #F9F7B8",
-"c 	c #F7F5A8",
-"d 	c #E6EC73",
-"e 	c #E0EA68",
-"f 	c #DBE95D",
-"g 	c #D8E956",
-"h 	c #D2E850",
-"i 	c #C4E343",
-"j 	c #BEE23D",
-"k 	c #B2E036",
-"l 	c #A9DE2E",
-"m 	c #A0DC29",
-"n 	c #91D823",
-"o 	c #F9F9F5",
-"p 	c #F9F9EA",
-"q 	c #F9F9E2",
-"r 	c #F9F8E9",
-"s 	c #F9F8E1",
-"t 	c #F9F7D3",
-"u 	c #F9F7BC",
-"v 	c #F9F7AF",
-"w 	c #E8EE80",
-"x 	c #E2EC6F",
-"y 	c #DBEA61",
-"z 	c #D3E755",
-"A 	c #CAE44C",
-"B 	c #C6E446",
-"C 	c #BDE441",
-"D 	c #B8E337",
-"E 	c #AADE30",
-"F 	c #9DDA2A",
-"G 	c #91D722",
-"H 	c #87D61F",
-"I 	c #7FD61B",
-"J 	c #F9F9F8",
-"K 	c #F9F9F7",
-"L 	c #F9F9F0",
-"M 	c #F9F8EC",
-"N 	c #F9F7E1",
-"O 	c #F9F7D7",
-"P 	c #F9F7C9",
-"Q 	c #F9F7B4",
-"R 	c #EBF092",
-"S 	c #E1EB69",
-"T 	c #DBE95F",
-"U 	c #D3E654",
-"V 	c #CCE44A",
-"W 	c #C9E647",
-"X 	c #BDE13D",
-"Y 	c #B1DE35",
-"Z 	c #A8DD30",
-"` 	c #9BDA29",
+"	c None",
+".	c #E8ED72",
+"+	c #E7ED6A",
+"@	c #E1EB62",
+"#	c #D4E758",
+"$	c #D2E750",
+"%	c #CDE748",
+"&	c #F5F4A1",
+"*	c #F3F294",
+"=	c #EBEE81",
+"-	c #EAEE77",
+";	c #E6ED6F",
+">	c #E1EB68",
+",	c #D9E859",
+"'	c #D3E851",
+")	c #CCE549",
+"!	c #C7E643",
+"~	c #BEE239",
+"{	c #B3DF32",
+"]	c #F8F8C4",
+"^	c #F9F7B3",
+"/	c #F4F3A2",
+"(	c #F4F397",
+"_	c #F5F39A",
+":	c #F2F399",
+"<	c #E2EA6D",
+"[	c #DFEA66",
+"}	c #DAE95C",
+"|	c #D3E753",
+"1	c #CAE54B",
+"2	c #C7E545",
+"3	c #BFE23C",
+"4	c #B7E034",
+"5	c #B1E130",
+"6	c #A5DC28",
+"7	c #F9F9DA",
+"8	c #F9F8CA",
+"9	c #F8F7C9",
+"0	c #F8F7CD",
+"a	c #F9F7C7",
+"b	c #F9F7B8",
+"c	c #F7F5A8",
+"d	c #E6EC73",
+"e	c #E0EA68",
+"f	c #DBE95D",
+"g	c #D8E956",
+"h	c #D2E850",
+"i	c #C4E343",
+"j	c #BEE23D",
+"k	c #B2E036",
+"l	c #A9DE2E",
+"m	c #A0DC29",
+"n	c #91D823",
+"o	c #F9F9F5",
+"p	c #F9F9EA",
+"q	c #F9F9E2",
+"r	c #F9F8E9",
+"s	c #F9F8E1",
+"t	c #F9F7D3",
+"u	c #F9F7BC",
+"v	c #F9F7AF",
+"w	c #E8EE80",
+"x	c #E2EC6F",
+"y	c #DBEA61",
+"z	c #D3E755",
+"A	c #CAE44C",
+"B	c #C6E446",
+"C	c #BDE441",
+"D	c #B8E337",
+"E	c #AADE30",
+"F	c #9DDA2A",
+"G	c #91D722",
+"H	c #87D61F",
+"I	c #7FD61B",
+"J	c #F9F9F8",
+"K	c #F9F9F7",
+"L	c #F9F9F0",
+"M	c #F9F8EC",
+"N	c #F9F7E1",
+"O	c #F9F7D7",
+"P	c #F9F7C9",
+"Q	c #F9F7B4",
+"R	c #EBF092",
+"S	c #E1EB69",
+"T	c #DBE95F",
+"U	c #D3E654",
+"V	c #CCE44A",
+"W	c #C9E647",
+"X	c #BDE13D",
+"Y	c #B1DE35",
+"Z	c #A8DD30",
+"`	c #9BDA29",
 " .	c #94D823",
 "..	c #8CD921",
 "+.	c #82D71C",
diff --git a/debian/tmw-data.install b/debian/tmw-data.install
deleted file mode 100644
index c9f6cb7b..00000000
--- a/debian/tmw-data.install
+++ /dev/null
@@ -1,5 +0,0 @@
-data/graphics/gui/*.png usr/share/games/tmw/data/graphics/gui
-data/graphics/images/*.png usr/share/games/tmw/data/graphics/images
-data/graphics/images/ambient/*.png usr/share/games/tmw/data/graphics/images/ambient
-data/graphics/tiles/*.png usr/share/games/tmw/data/graphics/tiles
-data/help/*.txt usr/share/games/tmw/data/help
diff --git a/debian/tmw.desktop b/debian/tmw.desktop
deleted file mode 100644
index f094f668..00000000
--- a/debian/tmw.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=The Mana World
-Name[fr]=Le Monde de Mana
-Comment=An online fantasy role playing game
-Comment[fr]=Un jeu en ligne dans un univers fantastique
-Comment[de]=ein Online Fantasy Spiel
-Comment[it]=Un gioco fantasy online
-Comment[nl]=Een online role playing game
-Exec=tmw
-StartupNotify=false
-Terminal=false
-Type=Game
-Icon=tmw.png
-Categories=Game
diff --git a/debian/tmw.install b/debian/tmw.install
deleted file mode 100644
index 037ccf54..00000000
--- a/debian/tmw.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmw.desktop usr/share/applications
-debian/tmw.xpm usr/share/pixmaps
-data/icons/tmw.png usr/share/icons
-docs/tmw.6 usr/share/man/man6
-src/tmw usr/games
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index 6055513c..db3eb491 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -7,10 +7,10 @@ Q: How to get help?
 
 A: The fastest way is to come on our IRC channel. There you can find a lot of
    nice people that will help you until you solve your problem. Server:
-   irc.freenode.net Channel: #themanaworld.
+   irc.freenode.net Channel: #themanaexperiment.
    If you don't like IRC just come to our forums:
-   http://forums.themanaworld.org. Ok, do you think forums are evil? Don't
-   worry, send me an e-mail at elvenprogrammer@gmail.com and you're done.
+   http://tme.onlinegamecore.com/forums. Ok, do you think forums are evil?
+   Don't worry, send me an e-mail at elvenprogrammer@gmail.com and you're done.
    That's not enough? No, I won't give you my phone number! ;P
    
 GAME
@@ -36,15 +36,6 @@ A: Did you read README? Are you really sure? If not go read it and you'll find
    README/ingame help is not up to date/wrong, please report it to the
    developers.
 
-Q: I just typed /<command> in the chat window and then I saw "Your account has
-   been banished until ..." and TMW closed. Now when I try to log in nothing
-   happens?
-
-A: That's because /<commands> are not implemented at the moment of writing.
-   Please avoid using such commands (i.e. /help) until they're added.
-   Anyway the ban is temp, just wait some minutes and you should be able to
-   connect again.
-
 Q: I can't recover HP anymore.
 
 A: Check your inventory, if you've got lots of stuff probably you're
@@ -77,14 +68,10 @@ A: There are a lot of ways:
    - If you're a programmer, an artist or just willing to help in any way, you
      can become part of the development team. Send an e-mail to
      elvenprogrammer@gmail.com explaining what you want to do, or join our irc
-     channel: #themanaworld @ irc.freenode.net.
-   
-   - You can donate money. Follow the link on the project page:
-	http://sourceforge.net/projects/themanaworld.
+     channel: #themanaexperiment @ irc.freenode.net.
    
-   - You can be a beta tester. Just play with The Mana World and report every
-     error to the tracker. Read for more infos on the project page:
-	http://themanaworld.org.
+   - You can be a beta tester. Just play with The Mana Experiment and report
+     every error on the forum.
    
-   - Play with The Mana World: more players, more fun! Simple as that! ;-)
+   - Play with The Mana Experiment: more players, more fun! Simple as that! ;-)
 
diff --git a/docs/HACKING.txt b/docs/HACKING.txt
index f2ae8b2b..fdec32a6 100644
--- a/docs/HACKING.txt
+++ b/docs/HACKING.txt
@@ -1,6 +1,6 @@
-----------------------------
-The Mana World Hacking Guide
-----------------------------
+---------------------------------
+The Mana Experiment Hacking Guide
+---------------------------------
 
 With multiple coders working on the same source files, there needs to be a
 standard specifying how code is written down. Not doing so can cause quite some
diff --git a/docs/INSTALL/debian.txt b/docs/INSTALL/debian.txt
index 9a74d91b..59e2376e 100644
--- a/docs/INSTALL/debian.txt
+++ b/docs/INSTALL/debian.txt
@@ -1,24 +1,24 @@
-How to install TMW on my GNU/Debian Box
+How to install TME on my GNU/Debian Box
 ==================================================
 
 Author:   FERREIRA Yohann (Bertram)
 Email:    Bertram@cegetel.net
 
-The Mana World project
+The Mana Experiment project
 ======================
-Homepage: http://themanaworld.org/
-IRC:      irc.freenode.net / #themanaworld
+Homepage: http://209.168.213.109/
+IRC:      irc.freenode.net / #themanaexperiment
 
-1) Installing The Mana World and dependencies
+1) Installing The Mana Experiment and dependencies
 2) Creating a Debian Package using DebHelper Tools
 3) Notes
 
 
-1. Installing The Mana World and Dependencies
+1. Installing The Mana Experiment and Dependencies
 =============================================
 
-The Mana World Debian Package can be installed under the Debian Testing and
-Unstable (Sarge/Sid). In order to have Mana World working, you'll need
+The Mana Experiment Debian Package can be installed under the Debian Testing and
+Unstable (Sarge/Sid). In order to have Mana Experiment working, you'll need
 packages for SDL, SDL_mixer, SDL_image, libxml2, libphysfs and libguichan0.
 
 To install the dependencies, you can do type (as root):
@@ -41,9 +41,9 @@ And the debhelper tools:
 Download tmw from Subversion using the command (You'll need Subversion
 installed on your system):
 
-   svn https://svn.sourceforge.net/svnroot/themanaworld/tmw/trunk tmw
+   svn svn://209.168.213.109 tme
 
-Rename the tmw folder into tmw-XXX and open a console in it.
+Rename the tme folder into tme-XXX and open a console in it.
 You can now type:
 
     fakeroot dpkg-buildpackage
@@ -53,16 +53,16 @@ file.
 
 Install it:
 
-    dpkg -i tmw_XXXXXX_i386.deb
+    dpkg -i tme_XXXXXX_i386.deb
 
 (If you've got a previous one already installed with the same version number,
 don't forget to remove it with :)
 
-    apt-get remove tmw
+    apt-get remove tme
 
 (Don't worry, you configuration files are not removed...)
 
-And now the final step: type 'tmw' as a normal user in a shell and you're in!
+And now the final step: type 'tme' as a normal user in a shell and you're in!
 
 KDE/GNOME menu entries are created in Arcade Games upon installation.
 
@@ -79,9 +79,9 @@ Simply add in your /etc/apt/sources.list file:
 Then, as root, do:
 
     apt-get update
-    apt-get install tmw
+    apt-get install tme
 
 and you're done!
 
-N.B.: The tmw-music, libguichan0, and libguichan0-dev packages are also
+N.B.: The tme-music, libguichan0, and libguichan0-dev packages are also
 provided in this repository.
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index 1a1e527f..88f47034 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -1,10 +1,10 @@
-How setup Dev-C++ to compile TMW on a Win32 Box
+How setup Dev-C++ to compile TME on a Win32 Box
 ===============================================
 
-The Mana World project
-======================
-Homepage: themanaworld.sourceforge.net
-IRC:      irc.freenode.net / #themanaworld
+The Mana Experiment project
+===========================
+Homepage: http://209.168.213.109
+IRC:      irc.freenode.net / #themanaexperiment
 
 
 0. Index
@@ -12,7 +12,7 @@ IRC:      irc.freenode.net / #themanaworld
 1. Requirements
 2. Installing Dev-C++
 3. Installing the required libraries
-4. Compiling The Mana World
+4. Compiling The Mana Experiment
 
 
 1. Requirements
@@ -23,7 +23,7 @@ free IDE for Win32 built around GCC. Remember, Win32 was not meant for GCC and
 stuff so you will probably run into trouble unless you really know what you're
 doing, so best stick with Dev-C++.
 
-Besides a C++ compiler, TMW depends on the following libraries:
+Besides a C++ compiler, TME depends on the following libraries:
 
 1) SDL
 2) SDL_mixer
@@ -95,36 +95,36 @@ Install them all through the Dev-C++ package manager.
         iconv-1.9.1.win32.zip
 
      From each file, copy the headers to your include directory, the libs to
-     the lib direcotry and the dlls (in bin direcotry) to your tmw directory.
+     the lib direcotry and the dlls (in bin direcotry) to your tme directory.
 
 **) For PhysFS copy the headers to your include directory, the libs to
-    the lib directory and the dlls (in bin direcotry) to your tmw directory.
+    the lib directory and the dlls (in bin direcotry) to your tme directory.
 
 ***) Download developer files and put headers and libs in to include and lib
-     directories of Dev-Cpp. Download binaries and place the dll inside tmw
+     directories of Dev-Cpp. Download binaries and place the dll inside tme
      folder.
 
 ****) Get latest win32 - mingw package and install as usual.
 
-You should now be fully equipped for compiling the latest TMW development
+You should now be fully equipped for compiling the latest TME development
 code!
 
 
-4. Compiling The Mana World
-===========================
+4. Compiling The Mana Experiment
+================================
 
-Check out The Mana World from Subversion using either the command line svn
+Check out The Mana Experiment from Subversion using either the command line svn
 tool or TortoiseSVN, pick what you like to use most and install that. Next,
 check out the following directory from our repository:
 
-  https://svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
+  svn://209.168.213.109/client/trunk
 
-Open "The Mana World.dev" in Dev-C++. From there on you should be able to
-start compilition with Excute -> Compile. A file called tmw.exe should appear
+Open "The Mana Experiment.dev" in Dev-C++. From there on you should be able to
+start compilition with Excute -> Compile. A file called tme.exe should appear
 in the same directory as where you opened the .dev from.
 
 Before you can actually run the executable be sure to copy over the following
-DLLs from your Dev-Cpp/dll directory to the directory containing tmw.exe (or 
+DLLs from your Dev-Cpp/dll directory to the directory containing tme.exe (or 
 alternatively into your c:\windows\system\ for a more universal solution):
 
  SDL.dll
@@ -143,7 +143,7 @@ And also make sure you have:
  zlib1.dll
 
 Additionally don't forget to copy any updated .dll (when libs are updated,
-the dll are usually updated too) to the folder containing tmw.exe (or to the
+the dll are usually updated too) to the folder containing tme.exe (or to the
 c:\windows\system\).
 
-Have fun hacking The Mana World!
+Have fun hacking The Mana Experiment!
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 43c0f6cc..4ea96959 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,8 +4,8 @@ EXTRA_DIST = $(man6_MANS) \
 	     packages.txt \
 	     FAQ.txt \
 	     HACKING.txt \
-	     SOURCE/tmwdox.sh \
-	     SOURCE/tmw.doxcfg \
+	     SOURCE/tmedox.sh \
+	     SOURCE/tme.doxcfg \
 	     items.txt \
 	     progression.txt \
 	     INSTALL/debian.txt \
diff --git a/docs/SOURCE/tmw.doxcfg b/docs/SOURCE/tme.doxcfg
index fe5039fb..f3f90af9 100644
--- a/docs/SOURCE/tmw.doxcfg
+++ b/docs/SOURCE/tme.doxcfg
@@ -17,7 +17,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = The Mana World
+PROJECT_NAME           = The Mana Experiment
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
@@ -625,7 +625,7 @@ GENERATE_HTMLHELP      = NO
 # can add a path in front of the file if the result should not be
 # written to the html output directory.
 
-CHM_FILE               = tmw.chm
+CHM_FILE               = tme.chm
 
 # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
 # be used to specify the location (absolute path including file name) of
diff --git a/docs/SOURCE/tmedox.sh b/docs/SOURCE/tmedox.sh
new file mode 100644
index 00000000..7ab9ea74
--- /dev/null
+++ b/docs/SOURCE/tmedox.sh
@@ -0,0 +1 @@
+cd ../../src/ && doxygen ../docs/SOURCE/tme.doxcfg
diff --git a/docs/SOURCE/tmwdox.sh b/docs/SOURCE/tmwdox.sh
deleted file mode 100644
index 541f8bee..00000000
--- a/docs/SOURCE/tmwdox.sh
+++ /dev/null
@@ -1 +0,0 @@
-cd ../../src/ && doxygen ../docs/SOURCE/tmw.doxcfg
diff --git a/docs/packages.txt b/docs/packages.txt
index 40ade7f9..46c35f51 100644
--- a/docs/packages.txt
+++ b/docs/packages.txt
@@ -1,6 +1,6 @@
------------------------------
-THE MANA WORLD PACKAGE SYSTEM
------------------------------
+----------------------------------
+THE MANA EXPERIMENT PACKAGE SYSTEM
+----------------------------------
 
 1. INTRODUCTION
 2. LOCATION OF DATA
@@ -13,36 +13,38 @@ THE MANA WORLD PACKAGE SYSTEM
 
 1. INTRODUCTION
 
-The Mana World is expected to grow continuously with updates to the game world
-occurring relatively frequently. More often so than for example new releases
-of the game client. To make sure players don't have to update their data
-manually all the time, by for example downloading the latest from the website,
-the TMW client should be able to automatically obtain new data packages from
-the server.
+The Mana Experiment is expected to grow continuously with updates to the game
+world occurring relatively frequently. More often so than for example new
+releases of the game client. To make sure players don't have to update their
+data manually all the time, by for example downloading the latest from the
+website, the TME client should be able to automatically obtain new data
+packages from the server.
 
  Note: To reduce the load on the server (which isn't expected to have huge
  free uploading resources), the idea is that the server will only send a
  torrent file to the client and that the file is subsequently downloaded from
- several locations that have volunteered to spread TMW data files. Ultimately
+ several locations that have volunteered to spread TME data files. Ultimately
  a simple option on the client will even allow players to contribute their
  excess bandwidth to help other players get the updates faster.
 
 
 2. LOCATION OF DATA
 
-There are two locations where TMW can look for game data. The install data
+There are two locations where TME can look for game data. The install data
 directory and the data directory in the user's home directory. The latter one
 doesn't have to be used for Windows users, but is required for dynamic updates
 for UNIX users, who generally won't have write permissions to the install
 data directory. So for UNIX the two locations are:
 
- /usr/local/share/manaworld/data/*
+ /usr/local/share/tme/data/*
 
- ~/.manaworld/data/*
+ ~/.tme/updates/*
+
+ ~/.tme/customdata
 
 While for Windows all the data will be located at:
 
- C:\Program Files\The Mana World\data\*
+ C:\Program Files\The Mana Experiment\data\*
 
 In the UNIX case it doesn't matter in which order the data directories are
 examined.
@@ -83,7 +85,7 @@ package is irrelevant. An example of the contents is given by:
 
 5. INITIALIZING PACKAGE MANAGEMENT
 
-When TMW starts it will scan its data directories for both packages (archives)
+When TME starts it will scan its data directories for both packages (archives)
 and directories. When a directory is found with the same name as a package, the
 directory is the preferred location to load data from as it is assumed to be
 more up to date.
@@ -127,7 +129,7 @@ The resource management technique is critical to the overall success of the
 package management system as a whole.  Resources are loaded at runtime as they
 are needed, and unloaded as they become unused.  In order to ensure the 
 autonomous functioning of this process reference counting is the agreed upon 
-technique for managing loaded resources in TMW.  
+technique for managing loaded resources in TME.  
 
 For those unfamiliar with the practice of reference counting, it involves 
 every resource object having a variable containing the number of references to
diff --git a/docs/sounddev.txt b/docs/sounddev.txt
index 149150ba..ed2ae71e 100644
--- a/docs/sounddev.txt
+++ b/docs/sounddev.txt
@@ -1,6 +1,6 @@
---------------------------------
-THE MANA WORLD SOUND DEVELOPMENT
---------------------------------
+-------------------------------------
+THE MANA EXPERIMENT SOUND DEVELOPMENT
+-------------------------------------
 
 1. INTRODUCTION
 2. SPECS
@@ -9,7 +9,7 @@ THE MANA WORLD SOUND DEVELOPMENT
 
 1. INTRODUCTION
 
-In The Mana World we plan to have both background music and sound effects
+In The Mana Experiment we plan to have both background music and sound effects
 linked to beings actions.
 
 2. SPECS
@@ -35,4 +35,4 @@ all.
 
 4. SUGGESTIONS
 
-As placeholders we could use Wesnoth SFX/BGM to test the sound engine.
\ No newline at end of file
+As placeholders we could use Wesnoth SFX/BGM to test the sound engine.
diff --git a/docs/win32-release.txt b/docs/win32-release.txt
index a8696897..1c0577df 100644
--- a/docs/win32-release.txt
+++ b/docs/win32-release.txt
@@ -1,6 +1,6 @@
---------------------------------------
-THE MANA WORLD WIN32 RELEASE CHECKLIST
---------------------------------------
+-------------------------------------------
+THE MANA EXPERIMENT WIN32 RELEASE CHECKLIST
+-------------------------------------------
 
 Every Win32 releaser should follow this checklist when creating a new package.
 
@@ -11,7 +11,7 @@ Every Win32 releaser should follow this checklist when creating a new package.
     * Eventually Legal Copyright
 - Update README and ChangeLog if not already
 - Compile OpenGL version (Using -DUSE_OPENGL option) and rename the executable
-  from tmw.exe to tmw_opengl.exe
+  from tme.exe to tme_opengl.exe
 - Compile normal version (Do not use special flags as __DEBUG or USE_OPENGL)
 - Check if the dlls were compressed (SDL.dll, SDL_Image.dll, SDL_Mixer.dll)
 - Check config.xml for default values:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c2ef4cd..d7dcbc7a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ FIND_PACKAGE(PhysFS REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 
 SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"")
-SET(FLAGS "${FLAGS} -DTMW_DATADIR=\\\"${PKG_DATADIR}/\\\"")
+SET(FLAGS "${FLAGS} -DTME_DATADIR=\\\"${PKG_DATADIR}/\\\"")
 
 SET(GUICHAN_COMPONENTS "SDL")
 IF (WITH_OPENGL)
@@ -339,9 +339,9 @@ SET(SRCS
     vector.h
     )
 
-ADD_EXECUTABLE(tmw ${SRCS})
+ADD_EXECUTABLE(tme ${SRCS})
 
-TARGET_LINK_LIBRARIES(tmw
+TARGET_LINK_LIBRARIES(tme
     ${SDL_LIBRARY}
     ${SDLIMAGE_LIBRARY}
     ${SDLMIXER_LIBRARY}
@@ -354,6 +354,6 @@ TARGET_LINK_LIBRARIES(tmw
     ${OPENGL_LIBRARIES}
     )
 
-INSTALL(TARGETS tmw RUNTIME DESTINATION ${PKG_BINDIR})
+INSTALL(TARGETS tme RUNTIME DESTINATION ${PKG_BINDIR})
 
-SET_TARGET_PROPERTIES(tmw PROPERTIES COMPILE_FLAGS "${FLAGS}")
+SET_TARGET_PROPERTIES(tme PROPERTIES COMPILE_FLAGS "${FLAGS}")
diff --git a/src/Makefile.am b/src/Makefile.am
index f1352f9e..e750e214 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,8 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
               gui/widgets/dropdown.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
-	      gui/box.h \
 	      gui/box.cpp \
+	      gui/box.h \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/button.cpp \
@@ -17,10 +17,10 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/buysell.h \
 	      gui/chargedialog.cpp \
 	      gui/chargedialog.h \
-	      gui/char_server.cpp \
-	      gui/char_server.h \
 	      gui/char_select.cpp \
 	      gui/char_select.h \
+	      gui/char_server.cpp \
+	      gui/char_server.h \
 	      gui/chat.cpp \
 	      gui/chat.h \
 	      gui/chatinput.cpp \
@@ -41,8 +41,8 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/gccontainer.h \
 	      gui/gui.cpp \
 	      gui/gui.h \
-	      gui/hbox.h \
 	      gui/hbox.cpp \
+	      gui/hbox.h \
 	      gui/help.cpp \
 	      gui/help.h \
 	      gui/inttextbox.h \
@@ -117,10 +117,10 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/status.h \
 	      gui/tabbedcontainer.cpp \
 	      gui/tabbedcontainer.h \
-	      gui/table.h \
 	      gui/table.cpp \
-	      gui/table_model.h \
+	      gui/table.h \
 	      gui/table_model.cpp \
+	      gui/table_model.h \
 	      gui/textbox.cpp \
 	      gui/textbox.h \
 	      gui/textfield.cpp \
@@ -181,6 +181,8 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/ambientoverlay.h \
 	      resources/animation.cpp \
 	      resources/animation.h \
+	      resources/buddylist.cpp \
+	      resources/buddylist.h \
 	      resources/dye.cpp \
 	      resources/dye.h \
 	      resources/image.cpp \
@@ -213,8 +215,6 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/soundeffect.cpp \
 	      resources/spritedef.h \
 	      resources/spritedef.cpp \
-	      resources/buddylist.h \
-	      resources/buddylist.cpp \
 	      utils/base64.cpp \
 	      utils/base64.h \
 	      utils/dtor.h \
@@ -311,7 +311,7 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 # set the include path found by configure
 INCLUDES =					\
 	$(all_includes)				\
-	-DTMW_DATADIR=\""$(pkgdatadir)/"\"
+	-DTME_DATADIR=\""$(pkgdatadir)/"\"
 
 # the library search path.
 tme_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
diff --git a/src/main.cpp b/src/main.cpp
index 213e2939..cc30ec0a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -205,7 +205,7 @@ void init_engine(const Options &options)
 #elif defined __APPLE__
     // Use Application Directory instead of .tme
     homeDir = std::string(PHYSFS_getUserDir()) +
-        "/Library/Application Support/The Mana World";
+        "/Library/Application Support/The Mana Experiment";
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #else
@@ -224,9 +224,9 @@ void init_engine(const Options &options)
     logger->setLogFile(homeDir + std::string("/tme.log"));
 
     #ifdef PACKAGE_VERSION
-        logger->log("Starting The Mana World Version %s", PACKAGE_VERSION);
+        logger->log("Starting The Mana Experiment Version %s", PACKAGE_VERSION);
     #else
-        logger->log("Starting The Mana World - Version not defined");
+        logger->log("Starting The Mana Experiment - Version not defined");
     #endif
 
     // Initialize SDL
@@ -268,7 +268,7 @@ void init_engine(const Options &options)
     strncat(path, "/data", PATH_MAX - 1);
     resman->addToSearchPath(path, true);
 #else
-    resman->addToSearchPath(TMW_DATADIR "data", true);
+    resman->addToSearchPath(TME_DATADIR "data", true);
 #endif
 
     // Fill configuration with defaults
@@ -294,24 +294,24 @@ void init_engine(const Options &options)
 
     // Checking if the configuration file exists... otherwise creates it with
     // default options !
-    FILE *tmwFile = 0;
+    FILE *tmeFile = 0;
     std::string configPath = options.configPath;
 
     if (configPath.empty())
         configPath = homeDir + "/config.xml";
 
-    tmwFile = fopen(configPath.c_str(), "r");
+    tmeFile = fopen(configPath.c_str(), "r");
 
     // If we can't read it, it doesn't exist !
-    if (tmwFile == NULL) {
+    if (tmeFile == NULL) {
         // We reopen the file in write mode and we create it
-        tmwFile = fopen(configPath.c_str(), "wt");
+        tmeFile = fopen(configPath.c_str(), "wt");
     }
-    if (tmwFile == NULL) {
+    if (tmeFile == NULL) {
         std::cout << "Can't create " << configPath << ". "
             "Using Defaults." << std::endl;
     } else {
-        fclose(tmwFile);
+        fclose(tmeFile);
         config.init(configPath);
     }
 
@@ -325,7 +325,7 @@ void init_engine(const Options &options)
         SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
     }
 #else
-    SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png");
+    SDL_Surface *icon = IMG_Load(TME_DATADIR "data/icons/tme.png");
     if (icon)
     {
         SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
@@ -422,7 +422,7 @@ void exit_engine()
 void printHelp()
 {
     std::cout
-        << "tmw" << std::endl << std::endl
+        << "tme" << std::endl << std::endl
         << "Options: " << std::endl
         << "  -h --help       : Display this help" << std::endl
         << "  -v --version    : Display the version" << std::endl
@@ -439,9 +439,10 @@ void printHelp()
 void printVersion()
 {
 #ifdef PACKAGE_VERSION
-    std::cout << "The Mana World version " << PACKAGE_VERSION << std::endl;
+    std::cout << "The Mana Experiment version " << PACKAGE_VERSION <<
+        std::endl;
 #else
-    std::cout << "The Mana World version " <<
+    std::cout << "The Mana Experiment version " <<
              "(local build?, PACKAGE_VERSION is not defined)" << std::endl;
 #endif
 }
diff --git a/src/main.h b/src/main.h
index af59ea26..1f9aa9d0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -32,8 +32,8 @@
 #include "winver.h"
 #endif
 
-#ifndef TMW_DATADIR
-#define TMW_DATADIR ""
+#ifndef TME_DATADIR
+#define TME_DATADIR ""
 #endif
 
 /*
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 6b45c9d7..ae255144 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -210,7 +210,7 @@ ResourceManager::getPath(const std::string &file)
     // get the real path to the file
     const char* tmp = PHYSFS_getRealDir(file.c_str());
     std::string path;
-    
+
     // if the file is not in the search path, then its NULL
     if (tmp)
     {
@@ -219,9 +219,9 @@ ResourceManager::getPath(const std::string &file)
     else
     {
         // if not found in search path return the default path
-        path = std::string(TMW_DATADIR) + std::string("data") + "/" + file;
+        path = std::string(TME_DATADIR) + std::string("data") + "/" + file;
     }
-    
+
     return path;
 }
 
diff --git a/src/tmw.rc b/src/tme.rc
index 673b2387..495d0675 100644
--- a/src/tmw.rc
+++ b/src/tme.rc
@@ -2,7 +2,7 @@
 

 #include "winver.h"

 

-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"

+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tme.ico"

 

 1 VERSIONINFO

 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD

@@ -10,12 +10,12 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
 FILETYPE VFT_APP {

     BLOCK "StringFileInfo" {

         BLOCK "040904E4" {

-            VALUE "CompanyName", "The Mana World Development Team"

+            VALUE "CompanyName", "The Mana Experiment Development Team"

             VALUE "FileVersion", PACKAGE_VERSION

-            VALUE "FileDescription", "The Mana World"

-            VALUE "LegalCopyright", "2004-2006 (C)"

-            VALUE "OriginalFilename", "tmw.exe"

-            VALUE "ProductName", "The Mana World MMORPG"

+            VALUE "FileDescription", "The Mana Experiment"

+            VALUE "LegalCopyright", "2008 (C)"

+            VALUE "OriginalFilename", "tme.exe"

+            VALUE "ProductName", "The Mana Experiment MMORPG"

             VALUE "ProductVersion", PACKAGE_VERSION

         }

     }

diff --git a/tmw.cbp b/tme.cbp
index ba49b449..e51141a2 100644
--- a/tmw.cbp
+++ b/tme.cbp
@@ -2,7 +2,7 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="The Mana World" />
+		<Option title="The Mana Experiment" />
 		<Option pch_mode="0" />
 		<Option compiler="gcc" />
 		<Build>
@@ -37,7 +37,7 @@
 			</Target>
 			<Target title="unix">
 				<Option platforms="Unix;" />
-				<Option output="tmw" prefix_auto="1" extension_auto="1" />
+				<Option output="tme" prefix_auto="1" extension_auto="1" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -101,6 +101,8 @@
 		<Unit filename="src/gui/buy.h" />
 		<Unit filename="src/gui/buysell.cpp" />
 		<Unit filename="src/gui/buysell.h" />
+		<Unit filename="src/gui/chargedialog.cpp" />
+		<Unit filename="src/gui/chargedialog.h" />
 		<Unit filename="src/gui/char_select.cpp" />
 		<Unit filename="src/gui/char_select.h" />
 		<Unit filename="src/gui/char_server.cpp" />
@@ -133,14 +135,14 @@
 		<Unit filename="src/gui/inttextbox.h" />
 		<Unit filename="src/gui/inventorywindow.cpp" />
 		<Unit filename="src/gui/inventorywindow.h" />
-		<Unit filename="src/gui/item_amount.cpp" />
-		<Unit filename="src/gui/item_amount.h" />
 		<Unit filename="src/gui/itemcontainer.cpp" />
 		<Unit filename="src/gui/itemcontainer.h" />
 		<Unit filename="src/gui/itemshortcutcontainer.cpp" />
 		<Unit filename="src/gui/itemshortcutcontainer.h" />
 		<Unit filename="src/gui/itemshortcutwindow.cpp" />
 		<Unit filename="src/gui/itemshortcutwindow.h" />
+		<Unit filename="src/gui/item_amount.cpp" />
+		<Unit filename="src/gui/item_amount.h" />
 		<Unit filename="src/gui/linkhandler.h" />
 		<Unit filename="src/gui/listbox.cpp" />
 		<Unit filename="src/gui/listbox.h" />
@@ -162,8 +164,6 @@
 		<Unit filename="src/gui/passwordfield.h" />
 		<Unit filename="src/gui/playerbox.cpp" />
 		<Unit filename="src/gui/playerbox.h" />
-		<Unit filename="src/gui/popup_box.cpp" />
-		<Unit filename="src/gui/popup_box.h" />
 		<Unit filename="src/gui/popupmenu.cpp" />
 		<Unit filename="src/gui/popupmenu.h" />
 		<Unit filename="src/gui/progressbar.cpp" />
@@ -217,6 +217,8 @@
 		<Unit filename="src/gui/vbox.h" />
 		<Unit filename="src/gui/viewport.cpp" />
 		<Unit filename="src/gui/viewport.h" />
+		<Unit filename="src/gui/widgets/dropdown.cpp"/>
+		<Unit filename="src/gui/widgets/dropdown.h" />
 		<Unit filename="src/gui/widgets/resizegrip.cpp" />
 		<Unit filename="src/gui/widgets/resizegrip.h" />
 		<Unit filename="src/gui/window.cpp" />
@@ -276,6 +278,8 @@
 		<Unit filename="src/net/network.h" />
 		<Unit filename="src/net/npchandler.cpp" />
 		<Unit filename="src/net/npchandler.h" />
+		<Unit filename="src/net/partyhandler.cpp"/>
+		<Unit filename="src/net/partyhandler.h" />
 		<Unit filename="src/net/playerhandler.cpp" />
 		<Unit filename="src/net/playerhandler.h" />
 		<Unit filename="src/net/protocol.cpp" />
@@ -292,17 +296,23 @@
 		<Unit filename="src/particle.h" />
 		<Unit filename="src/particleemitter.cpp" />
 		<Unit filename="src/particleemitter.h" />
+                <Unit filename="src/party.cpp" />
+		<Unit filename="src/party.h" />
 		<Unit filename="src/player.cpp" />
 		<Unit filename="src/player.h" />
 		<Unit filename="src/player_relations.cpp" />
 		<Unit filename="src/player_relations.h" />
 		<Unit filename="src/properties.h" />
+		<Unit filename="src/recorder.cpp" />
+		<Unit filename="src/recorder.h" />
 		<Unit filename="src/resources/action.cpp" />
 		<Unit filename="src/resources/action.h" />
 		<Unit filename="src/resources/ambientoverlay.cpp" />
 		<Unit filename="src/resources/ambientoverlay.h" />
 		<Unit filename="src/resources/animation.cpp" />
 		<Unit filename="src/resources/animation.h" />
+		<Unit filename="src/resources/buddylist.cpp"/>
+		<Unit filename="src/resources/buddylist.h" />
 		<Unit filename="src/resources/dye.cpp" />
 		<Unit filename="src/resources/dye.h" />
 		<Unit filename="src/resources/image.cpp" />
@@ -325,6 +335,8 @@
 		<Unit filename="src/resources/monsterinfo.h" />
 		<Unit filename="src/resources/music.cpp" />
 		<Unit filename="src/resources/music.h" />
+		<Unit filename="src/resources/npcdb.cpp" />
+		<Unit filename="src/resources/npcdb.h" />
 		<Unit filename="src/resources/resource.cpp" />
 		<Unit filename="src/resources/resource.h" />
 		<Unit filename="src/resources/resourcemanager.cpp" />
@@ -339,16 +351,23 @@
 		<Unit filename="src/sound.cpp" />
 		<Unit filename="src/sound.h" />
 		<Unit filename="src/sprite.h" />
+		<Unit filename="src/text.cpp" />
+		<Unit filename="src/text.h" />
+		<Unit filename="src/textmanager.cpp" />
+		<Unit filename="src/textmanager.h" />
 		<Unit filename="src/textparticle.cpp" />
 		<Unit filename="src/textparticle.h" />
 		<Unit filename="src/tileset.h" />
-		<Unit filename="src/tmw.rc">
+		<Unit filename="src/tme.rc">
 			<Option compilerVar="WINDRES" />
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
 		<Unit filename="src/utils/base64.cpp" />
 		<Unit filename="src/utils/base64.h" />
 		<Unit filename="src/utils/dtor.h" />
+		<Unit filename="src/utils/fastsqrt.h" />
+		<Unit filename="src/utils/strprintf.cpp" />
+		<Unit filename="src/utils/strprintf.h" />
 		<Unit filename="src/utils/tostring.h" />
 		<Unit filename="src/utils/xml.cpp" />
 		<Unit filename="src/utils/xml.h" />