98 files changed, 23 insertions, 24 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8894498..c0bc463 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@
 ###############################################################################
 # IMPORTANT DEFINITIONS [PREFIX,...]
 ###############################################################################
-SET ( TUXANCI_VERSION "9999" CACHE STRING "Version" )
+SET ( TUXANCI_VERSION "svn" CACHE STRING "Version" )
 SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src )
 # data because some distributions want different data placement
 SET ( CMAKE_CONF_PATH "/etc" CACHE PATH "Config path prefix" )
@@ -35,11 +35,11 @@ PROJECT ( tuxanci )
 IF ( COMMAND cmake_policy )
 	cmake_policy( SET CMP0003 NEW )
 ENDIF ( COMMAND cmake_policy )
-
-SET ( APPNAME "tuxanci")
-IF ( Server )
-	SET ( APPNAME "tuxanci-server" )
-ENDIF ( Server )
+IF ( NOT Server )
+	SET ( APPNAME "tuxanci-${TUXANCI_VERSION}")
+ELSE ( NOT Server )
+	SET ( APPNAME "tuxanci-server-${TUXANCI_VERSION}" )
+ENDIF ( NOT Server )
 MESSAGE ( "<******************************>" )
 MESSAGE ( "Configure for ${APPNAME} Started" )
 MESSAGE ( "<******************************>" )
@@ -215,11 +215,11 @@ ADD_SUBDIRECTORY ( src )
 # path which user send us
 ADD_SUBDIRECTORY ( data )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/LICENCE
-	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/ )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/AUTHORS
-	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/ )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README
-	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/ )
 # windows quirk
 IF ( NOT Server )
 	IF ( Win )
diff --git a/README b/README
index 98491c4..aa4c3bf 100644
--- a/README
+++ b/README
@@ -97,13 +97,13 @@ HOWTO COMPILE
 
 GAME USAGE
 ==========
-	Starting game is simple tuxanci or tuxanci-server based on what we
+	Starting game is simple tuxanci-VERSION or tuxanci-server-V. based on what we
 	compiled (based on presumption user installed into directories where path
 	is set).
 	
-	If we are using bundled binary and tuxanci are reporting "File not found!"
+	If you are using bundled binary and tuxanci are reporting "File not found!"
 	error, you need to launch it directly from BIN directory 
-	(eg.: "$ cd tuxanci/bin && ./tuxanci").
+	(eg.: "$ cd tuxanci/bin && ./tuxanci-VERSION").
 
 	For client we create some configuration files in $HOME. There is created
 	".tuxanci" directory and in there are pretty selfexplaining .conf files.
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index daac5db..2e742d6 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -6,7 +6,7 @@
 ADD_SUBDIRECTORY ( arena )
 ADD_SUBDIRECTORY ( conf )
 ADD_SUBDIRECTORY ( font )
-ADD_SUBDIRECTORY ( image )
+ADD_SUBDIRECTORY ( images )
 ADD_SUBDIRECTORY ( lang )
 ADD_SUBDIRECTORY ( music )
 ADD_SUBDIRECTORY ( sound )
@@ -15,10 +15,10 @@ ADD_SUBDIRECTORY ( sound )
 ###############################################################################
 IF ( NOT Server )
 	INSTALL ( FILES tuxanci.desktop
-		DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/)
+		DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/)
 	IF ( NOT Win )
 		INSTALL ( FILES tuxanci.ico
-			DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}-${TUXANCI_VERSION}/ )
+			DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/ )
 	ENDIF ( NOT Win )
 ENDIF ( NOT Server )
 ###############################################################################
\ No newline at end of file
diff --git a/data/arena/CMakeLists.txt b/data/arena/CMakeLists.txt
index aa57bf3..36cdae3 100644
--- a/data/arena/CMakeLists.txt
+++ b/data/arena/CMakeLists.txt
@@ -9,5 +9,5 @@
 ###############################################################################
 FILE ( GLOB files "*.map" )
 INSTALL ( FILES ${files}
-	DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/arena/ )
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/arena/ )
 ###############################################################################
\ No newline at end of file
diff --git a/data/font/CMakeLists.txt b/data/font/CMakeLists.txt
index e1ed47d..14e173b 100644
--- a/data/font/CMakeLists.txt
+++ b/data/font/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT Server )
 	FILE ( GLOB files "*.ttf" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/font/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/font/ )
 ENDIF ( NOT Server )
 ###############################################################################
\ No newline at end of file
diff --git a/data/image/CMakeLists.txt b/data/images/CMakeLists.txt
index 703df68..48a7e27 100644
--- a/data/image/CMakeLists.txt
+++ b/data/images/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT Server )
 	FILE ( GLOB files "*.png" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/images/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/images/ )
 ENDIF ( NOT Server )
 ###############################################################################
\ No newline at end of file
diff --git a/data/image/ba_in_a_captivity_of_8-bit.png b/data/images/ba_in_a_captivity_of_8-bit.png
index 4d2158c..4d2158c 100644
--- a/data/image/ba_in_a_captivity_of_8-bit.png
+++ b/data/images/ba_in_a_captivity_of_8-bit.png
diff --git a/data/image/bal3.nic.png b/data/images/bal3.nic.png
index 0690ffc..0690ffc 100644
--- a/data/image/bal3.nic.png
+++ b/data/images/bal3.nic.png
diff --git a/data/image/big-explosion.png b/data/images/big-explosion.png
index a8d0586..a8d0586 100644
--- a/data/image/big-explosion.png
+++ b/data/images/big-explosion.png
diff --git a/data/image/bombball.png b/data/images/bombball.png
index bb3cda7..bb3cda7 100755
--- a/data/image/bombball.png
+++ b/data/images/bombball.png
diff --git a/data/image/button0.png b/data/images/button0.png
index 6dde5c6..6dde5c6 100644
--- a/data/image/button0.png
+++ b/data/images/button0.png
diff --git a/data/image/button1.png b/data/images/button1.png
index a60f343..a60f343 100644
--- a/data/image/button1.png
+++ b/data/images/button1.png
diff --git a/data/image/chat.png b/data/images/chat.png
index bb7d94f..bb7d94f 100644
--- a/data/image/chat.png
+++ b/data/images/chat.png
diff --git a/data/image/check.png b/data/images/check.png
index 1d905c5..1d905c5 100644
--- a/data/image/check.png
+++ b/data/images/check.png
diff --git a/data/image/choice.png b/data/images/choice.png
index b76ae41..b76ae41 100644
--- a/data/image/choice.png
+++ b/data/images/choice.png
diff --git a/data/image/construction_site.png b/data/images/construction_site.png
index c6aecc3..c6aecc3 100644
--- a/data/image/construction_site.png
+++ b/data/images/construction_site.png
diff --git a/data/image/cross.png b/data/images/cross.png
index 52636ef..52636ef 100644
--- a/data/image/cross.png
+++ b/data/images/cross.png
diff --git a/data/image/explosion.png b/data/images/explosion.png
index 6b71c36..6b71c36 100644
--- a/data/image/explosion.png
+++ b/data/images/explosion.png
diff --git a/data/image/for_a_good_night.png b/data/images/for_a_good_night.png
index da8e981..da8e981 100644
--- a/data/image/for_a_good_night.png
+++ b/data/images/for_a_good_night.png
diff --git a/data/image/graf.bonus.png b/data/images/graf.bonus.png
index 6f195b1..6f195b1 100644
--- a/data/image/graf.bonus.png
+++ b/data/images/graf.bonus.png
diff --git a/data/image/icon.bonus.4x.png b/data/images/icon.bonus.4x.png
index cd08e3f..cd08e3f 100644
--- a/data/image/icon.bonus.4x.png
+++ b/data/images/icon.bonus.4x.png
diff --git a/data/image/icon.bonus.ghost.png b/data/images/icon.bonus.ghost.png
index ff483f3..ff483f3 100644
--- a/data/image/icon.bonus.ghost.png
+++ b/data/images/icon.bonus.ghost.png
diff --git a/data/image/icon.bonus.hidden.png b/data/images/icon.bonus.hidden.png
index dfee367..dfee367 100644
--- a/data/image/icon.bonus.hidden.png
+++ b/data/images/icon.bonus.hidden.png
diff --git a/data/image/icon.bonus.shot.png b/data/images/icon.bonus.shot.png
index d10c84f..d10c84f 100644
--- a/data/image/icon.bonus.shot.png
+++ b/data/images/icon.bonus.shot.png
diff --git a/data/image/icon.bonus.speed.png b/data/images/icon.bonus.speed.png
index 1179ad6..1179ad6 100644
--- a/data/image/icon.bonus.speed.png
+++ b/data/images/icon.bonus.speed.png
diff --git a/data/image/icon.bonus.teleport.png b/data/images/icon.bonus.teleport.png
index 21c1f25..21c1f25 100644
--- a/data/image/icon.bonus.teleport.png
+++ b/data/images/icon.bonus.teleport.png
diff --git a/data/image/icon.gun.bombball.png b/data/images/icon.gun.bombball.png
index 65eb972..65eb972 100755
--- a/data/image/icon.gun.bombball.png
+++ b/data/images/icon.gun.bombball.png
diff --git a/data/image/icon.gun.dual.simple.png b/data/images/icon.gun.dual.simple.png
index 257c600..257c600 100644
--- a/data/image/icon.gun.dual.simple.png
+++ b/data/images/icon.gun.dual.simple.png
diff --git a/data/image/icon.gun.lasser.png b/data/images/icon.gun.lasser.png
index 5942665..5942665 100644
--- a/data/image/icon.gun.lasser.png
+++ b/data/images/icon.gun.lasser.png
diff --git a/data/image/icon.gun.mine.png b/data/images/icon.gun.mine.png
index 6af9154..6af9154 100644
--- a/data/image/icon.gun.mine.png
+++ b/data/images/icon.gun.mine.png
diff --git a/data/image/icon.gun.scatter.png b/data/images/icon.gun.scatter.png
index 30eb363..30eb363 100644
--- a/data/image/icon.gun.scatter.png
+++ b/data/images/icon.gun.scatter.png
diff --git a/data/image/icon.gun.simple.png b/data/images/icon.gun.simple.png
index 0b7b491..0b7b491 100644
--- a/data/image/icon.gun.simple.png
+++ b/data/images/icon.gun.simple.png
diff --git a/data/image/icon.gun.tommy.png b/data/images/icon.gun.tommy.png
index dafc7a5..dafc7a5 100644
--- a/data/image/icon.gun.tommy.png
+++ b/data/images/icon.gun.tommy.png
diff --git a/data/image/in_a_captivity_of_8-bit.png b/data/images/in_a_captivity_of_8-bit.png
index 922786e..922786e 100644
--- a/data/image/in_a_captivity_of_8-bit.png
+++ b/data/images/in_a_captivity_of_8-bit.png
diff --git a/data/image/item.bombball.png b/data/images/item.bombball.png
index d310d8f..d310d8f 100755
--- a/data/image/item.bombball.png
+++ b/data/images/item.bombball.png
diff --git a/data/image/item.bonus.4x.png b/data/images/item.bonus.4x.png
index a74241e..a74241e 100644
--- a/data/image/item.bonus.4x.png
+++ b/data/images/item.bonus.4x.png
diff --git a/data/image/item.bonus.ghost.png b/data/images/item.bonus.ghost.png
index bee6542..bee6542 100644
--- a/data/image/item.bonus.ghost.png
+++ b/data/images/item.bonus.ghost.png
diff --git a/data/image/item.bonus.hidden.png b/data/images/item.bonus.hidden.png
index 3ac96db..3ac96db 100644
--- a/data/image/item.bonus.hidden.png
+++ b/data/images/item.bonus.hidden.png
diff --git a/data/image/item.bonus.shot.png b/data/images/item.bonus.shot.png
index c899209..c899209 100644
--- a/data/image/item.bonus.shot.png
+++ b/data/images/item.bonus.shot.png
diff --git a/data/image/item.bonus.speed.png b/data/images/item.bonus.speed.png
index d228128..d228128 100644
--- a/data/image/item.bonus.speed.png
+++ b/data/images/item.bonus.speed.png
diff --git a/data/image/item.bonus.teleport.png b/data/images/item.bonus.teleport.png
index b2202bf..b2202bf 100644
--- a/data/image/item.bonus.teleport.png
+++ b/data/images/item.bonus.teleport.png
diff --git a/data/image/item.dual.png b/data/images/item.dual.png
index 7747ca1..7747ca1 100644
--- a/data/image/item.dual.png
+++ b/data/images/item.dual.png
diff --git a/data/image/item.lasser.png b/data/images/item.lasser.png
index d3f7f30..d3f7f30 100644
--- a/data/image/item.lasser.png
+++ b/data/images/item.lasser.png
diff --git a/data/image/item.mine.png b/data/images/item.mine.png
index b774d44..b774d44 100644
--- a/data/image/item.mine.png
+++ b/data/images/item.mine.png
diff --git a/data/image/item.scatter.png b/data/images/item.scatter.png
index 7568270..7568270 100644
--- a/data/image/item.scatter.png
+++ b/data/images/item.scatter.png
diff --git a/data/image/item.tommy.png b/data/images/item.tommy.png
index ca0fd85..ca0fd85 100644
--- a/data/image/item.tommy.png
+++ b/data/images/item.tommy.png
diff --git a/data/image/l1.grow.png b/data/images/l1.grow.png
index 14a110e..14a110e 100644
--- a/data/image/l1.grow.png
+++ b/data/images/l1.grow.png
diff --git a/data/image/l1.hut.png b/data/images/l1.hut.png
index 7e42da6..7e42da6 100644
--- a/data/image/l1.hut.png
+++ b/data/images/l1.hut.png
diff --git a/data/image/l1.peduncle.png b/data/images/l1.peduncle.png
index 258f34c..258f34c 100644
--- a/data/image/l1.peduncle.png
+++ b/data/images/l1.peduncle.png
diff --git a/data/image/l1.tree.png b/data/images/l1.tree.png
index 5e3995e..5e3995e 100644
--- a/data/image/l1.tree.png
+++ b/data/images/l1.tree.png
diff --git a/data/image/l1.wood.png b/data/images/l1.wood.png
index ae1550a..ae1550a 100644
--- a/data/image/l1.wood.png
+++ b/data/images/l1.wood.png
diff --git a/data/image/l2.barel.png b/data/images/l2.barel.png
index 8da54ef..8da54ef 100644
--- a/data/image/l2.barel.png
+++ b/data/images/l2.barel.png
diff --git a/data/image/l2.nadrz.png b/data/images/l2.nadrz.png
index 4bc0a42..4bc0a42 100644
--- a/data/image/l2.nadrz.png
+++ b/data/images/l2.nadrz.png
diff --git a/data/image/l2.pitch.png b/data/images/l2.pitch.png
index 15150ba..15150ba 100644
--- a/data/image/l2.pitch.png
+++ b/data/images/l2.pitch.png
diff --git a/data/image/l2.potrubi.png b/data/images/l2.potrubi.png
index 3afa5ff..3afa5ff 100644
--- a/data/image/l2.potrubi.png
+++ b/data/images/l2.potrubi.png
diff --git a/data/image/l2.retez.png b/data/images/l2.retez.png
index c97ea24..c97ea24 100644
--- a/data/image/l2.retez.png
+++ b/data/images/l2.retez.png
diff --git a/data/image/l2.trubka2.png b/data/images/l2.trubka2.png
index f874ccc..f874ccc 100644
--- a/data/image/l2.trubka2.png
+++ b/data/images/l2.trubka2.png
diff --git a/data/image/l2.trubka4.png b/data/images/l2.trubka4.png
index 7be65d2..7be65d2 100644
--- a/data/image/l2.trubka4.png
+++ b/data/images/l2.trubka4.png
diff --git a/data/image/l2.trubka6.png b/data/images/l2.trubka6.png
index 29755ae..29755ae 100644
--- a/data/image/l2.trubka6.png
+++ b/data/images/l2.trubka6.png
diff --git a/data/image/l2.trubka8.png b/data/images/l2.trubka8.png
index 6026467..6026467 100644
--- a/data/image/l2.trubka8.png
+++ b/data/images/l2.trubka8.png
diff --git a/data/image/l2.trubky.png b/data/images/l2.trubky.png
index 5d405ad..5d405ad 100644
--- a/data/image/l2.trubky.png
+++ b/data/images/l2.trubky.png
diff --git a/data/image/l3.ihlan.png b/data/images/l3.ihlan.png
index 20cb373..20cb373 100644
--- a/data/image/l3.ihlan.png
+++ b/data/images/l3.ihlan.png
diff --git a/data/image/l3.kvader1.png b/data/images/l3.kvader1.png
index 67973a9..67973a9 100644
--- a/data/image/l3.kvader1.png
+++ b/data/images/l3.kvader1.png
diff --git a/data/image/l3.kvader2.png b/data/images/l3.kvader2.png
index d0df146..d0df146 100644
--- a/data/image/l3.kvader2.png
+++ b/data/images/l3.kvader2.png
diff --git a/data/image/l3.nic.png b/data/images/l3.nic.png
index 3852007..3852007 100644
--- a/data/image/l3.nic.png
+++ b/data/images/l3.nic.png
diff --git a/data/image/l3.teleport.png b/data/images/l3.teleport.png
index f901589..f901589 100644
--- a/data/image/l3.teleport.png
+++ b/data/images/l3.teleport.png
diff --git a/data/image/l4.anim.blikacka.png b/data/images/l4.anim.blikacka.png
index da353c6..da353c6 100644
--- a/data/image/l4.anim.blikacka.png
+++ b/data/images/l4.anim.blikacka.png
diff --git a/data/image/l4.bagr.png b/data/images/l4.bagr.png
index a9f6a13..a9f6a13 100644
--- a/data/image/l4.bagr.png
+++ b/data/images/l4.bagr.png
diff --git a/data/image/l4.overlay.png b/data/images/l4.overlay.png
index a8f8507..a8f8507 100644
--- a/data/image/l4.overlay.png
+++ b/data/images/l4.overlay.png
diff --git a/data/image/l4.palety.png b/data/images/l4.palety.png
index 3a3e797..3a3e797 100644
--- a/data/image/l4.palety.png
+++ b/data/images/l4.palety.png
diff --git a/data/image/l4.pozadi.png b/data/images/l4.pozadi.png
index 9d9b214..9d9b214 100644
--- a/data/image/l4.pozadi.png
+++ b/data/images/l4.pozadi.png
diff --git a/data/image/l4.pytle.png b/data/images/l4.pytle.png
index ea6a1f3..ea6a1f3 100644
--- a/data/image/l4.pytle.png
+++ b/data/images/l4.pytle.png
diff --git a/data/image/l4.tvarnice.png b/data/images/l4.tvarnice.png
index 0f2d99a..0f2d99a 100644
--- a/data/image/l4.tvarnice.png
+++ b/data/images/l4.tvarnice.png
diff --git a/data/image/lasserX.png b/data/images/lasserX.png
index a9be26a..a9be26a 100644
--- a/data/image/lasserX.png
+++ b/data/images/lasserX.png
diff --git a/data/image/lasserY.png b/data/images/lasserY.png
index cff390f..cff390f 100644
--- a/data/image/lasserY.png
+++ b/data/images/lasserY.png
diff --git a/data/image/level4.png b/data/images/level4.png
index 0136b2b..0136b2b 100644
--- a/data/image/level4.png
+++ b/data/images/level4.png
diff --git a/data/image/mine.png b/data/images/mine.png
index 6e8b373..6e8b373 100644
--- a/data/image/mine.png
+++ b/data/images/mine.png
diff --git a/data/image/naboj.png b/data/images/naboj.png
index 2985273..2985273 100644
--- a/data/image/naboj.png
+++ b/data/images/naboj.png
diff --git a/data/image/night_workshift.png b/data/images/night_workshift.png
index 08f4c42..08f4c42 100644
--- a/data/image/night_workshift.png
+++ b/data/images/night_workshift.png
diff --git a/data/image/panel.png b/data/images/panel.png
index 24a8e6c..24a8e6c 100644
--- a/data/image/panel.png
+++ b/data/images/panel.png
diff --git a/data/image/panel_shot.png b/data/images/panel_shot.png
index 2985273..2985273 100644
--- a/data/image/panel_shot.png
+++ b/data/images/panel_shot.png
diff --git a/data/image/pauza.png b/data/images/pauza.png
index 933ff85..933ff85 100755
--- a/data/image/pauza.png
+++ b/data/images/pauza.png
diff --git a/data/image/pokus.png b/data/images/pokus.png
index 9e66d2e..9e66d2e 100644
--- a/data/image/pokus.png
+++ b/data/images/pokus.png
diff --git a/data/image/radar.png b/data/images/radar.png
index f7d6f62..f7d6f62 100644
--- a/data/image/radar.png
+++ b/data/images/radar.png
diff --git a/data/image/screen_main.png b/data/images/screen_main.png
index 9734d1a..9734d1a 100644
--- a/data/image/screen_main.png
+++ b/data/images/screen_main.png
diff --git a/data/image/screen_table.png b/data/images/screen_table.png
index 769496e..769496e 100644
--- a/data/image/screen_table.png
+++ b/data/images/screen_table.png
diff --git a/data/image/shot.png b/data/images/shot.png
index 3d6ebc7..3d6ebc7 100644
--- a/data/image/shot.png
+++ b/data/images/shot.png
diff --git a/data/image/textfield0.png b/data/images/textfield0.png
index a0ed2a7..a0ed2a7 100644
--- a/data/image/textfield0.png
+++ b/data/images/textfield0.png
diff --git a/data/image/textfield1.png b/data/images/textfield1.png
index 2745e3c..2745e3c 100644
--- a/data/image/textfield1.png
+++ b/data/images/textfield1.png
diff --git a/data/image/tux2.png b/data/images/tux2.png
index cae602b..cae602b 100644
--- a/data/image/tux2.png
+++ b/data/images/tux2.png
diff --git a/data/image/tux4.png b/data/images/tux4.png
index f5e46fb..f5e46fb 100644
--- a/data/image/tux4.png
+++ b/data/images/tux4.png
diff --git a/data/image/tux6.png b/data/images/tux6.png
index 286b80a..286b80a 100644
--- a/data/image/tux6.png
+++ b/data/images/tux6.png
diff --git a/data/image/tux8.png b/data/images/tux8.png
index cfbf80a..cfbf80a 100644
--- a/data/image/tux8.png
+++ b/data/images/tux8.png
diff --git a/data/image/tuxanci.png b/data/images/tuxanci.png
index 34b770b..34b770b 100644
--- a/data/image/tuxanci.png
+++ b/data/images/tuxanci.png
diff --git a/data/lang/CMakeLists.txt b/data/lang/CMakeLists.txt
index f4bc71d..749a747 100644
--- a/data/lang/CMakeLists.txt
+++ b/data/lang/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT NO_Audio )
 	FILE ( GLOB files "*.lang" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/lang/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/lang/ )
 ENDIF ( NOT NO_Audio )
 ###############################################################################
\ No newline at end of file
diff --git a/data/music/CMakeLists.txt b/data/music/CMakeLists.txt
index 0818994..140cbf3 100644
--- a/data/music/CMakeLists.txt
+++ b/data/music/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT NO_Audio )
 	FILE ( GLOB files "*.ogg" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/music/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/music/ )
 ENDIF ( NOT NO_Audio )
 ###############################################################################
\ No newline at end of file
diff --git a/data/sound/CMakeLists.txt b/data/sound/CMakeLists.txt
index 51134a3..9e60aa7 100644
--- a/data/sound/CMakeLists.txt
+++ b/data/sound/CMakeLists.txt
@@ -10,6 +10,6 @@
 IF ( NOT NO_Audio )
 	FILE ( GLOB files "*.ogg" )
 	INSTALL ( FILES ${files}
-		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}-${TUXANCI_VERSION}/sound/ )
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/sound/ )
 ENDIF ( NOT NO_Audio )
 ###############################################################################
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d08989d..a15fb35 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,7 +101,7 @@ IF ( Server )
 	MESSAGE ( STATUS "<Building server as requested>" )
 	MESSAGE ( STATUS "<******************************>" )
 	SET ( SRC_compile ${SRC_base} ${SRC_server} )
-	ADD_EXECUTABLE ( tuxanci-server ${SRC_compile} )
+	ADD_EXECUTABLE ( ${APPNAME} ${SRC_compile} )
 ENDIF ( Server )
 ###############################################################################
 # CLIENT COMPILATION
@@ -109,8 +109,7 @@ ENDIF ( Server )
 IF ( NOT Server )
 	MESSAGE ( STATUS "<Building client as requested>" )
 	MESSAGE ( STATUS "<******************************>" )
-	ADD_EXECUTABLE ( tuxanci ${SRC_compile} )
-	SET (TUX_BIN "tuxanci")
+	ADD_EXECUTABLE ( ${APPNAME} ${SRC_compile} )
 ENDIF ( NOT Server )
 ################################################################################
 # INSTALLATION OF BINARY