Removed translations that are too incomplete (0.7 branch only)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/0.7@7126 178a84e3-b1eb-0310-8ba1-8eac791a3b58
Updated version number to 0.7.
2010-12-21 00:15:00 +00:00 · 2010-12-20 23:38:25 +00:00 · 2010-12-20 23:14:05 +00:00 · 2010-12-20 23:03:34 +00:00 · 2010-12-20 22:46:04 +00:00 · 2010-12-20 22:05:22 +00:00
957 changed files with 55115 additions and 130398 deletions
--- a/4
+++ b/4
@@ -1,11 +1,11 @@

 The SuperTuxKart code is released under GNU GPL (see full text below).
-SuperTuxKart data files (textures, models, sounds, music, etc.) are released under various licenses, see 'license.txt' files
-through the various data subdirectories. Data files are released under a mixture of the following licenses :
+SuperTuxKart data files (textures, models, sounds, music, etc.) are released under various licenses, see 'license.txt' files through the various data subdirectories. Data files are released under a mixture of the following licenses :

 Gnu GPL 2.0 and 3.0+
 Creative-Commons-BY(-SA) 3.0
 Creative-Commons-Sampling+ 1.0
+FreeArt License
 SoundSnap license
 Public Domain

--- a/36
+++ b/36
@@ -1,39 +1,3 @@
-SuperTuxKart 0.7.2
-~~~~~~~~~~~~~~~~~~
-* Added in-game addon manager
-* Fixed major memory leaks
-* New Snow Peak track by Samuncle
-* Improved star track UFO by Rudy
-* New Beastie kart.
-* Show when you get a highscore
-* Improve gamepad configuration under Windows (add ability to tell gamepads apart)
-* Various other tweaks done and glitches fixed
-
-SuperTuxkart 0.7.1b
-~~~~~~~~~~~~~~~~~~~
-* Fix circular dependency in challenges
-* Updated translations
-
-SuperTuxKart 0.7.1
-~~~~~~~~~~~~~~~~~~
-* Particle  (smoke, splash, fire) and weather effects
-* New Fort Magma by Samuncle, new Shiny Suburbs track by Horace
-* New Beagle kart by wolterh
-* Added internet news
-* Support for live language switch
-* Added optional minimal race UI
-* Temporary invincibility after being hit
-* Added support for full-screen anti-aliasing
-* Clearer multiplayer setup
-* Renamed many tracks to nicer names
-* Basic level-of-detail (LOD) support
-* Debug features for track makers
-* Update to bullet 2.77
-* Replace more sounds to be DFSG-compliant
-* Fixed character names that contain non-ASCII characters
-* Full RTL (right to left) support
-* Various other tweaks done and glitches fixed
-
 SuperTuxKart 0.7 (December 2010)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Too many to list them all. Main points:
--- a/183
+++ b/183
@@ -0,0 +1,183 @@
+SuperTuxKart 0.7 (December 2010)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* New graphics using the irrlicht engine
+* New GUI
+* Animated karts, tracks, items
+
+SuperTuxkart 0.6.2a (October 2009)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bugfix: STK would crash while trying to save the config file
+          on Windows Vista.
+
+SuperTuxkart 0.6.2 (July 2009)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bugfix: battle mode would not display track groups.
+
+SuperTuxkart 0.6.1 (Feburary 2009)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added new kart ("Puffy"), new battle map ("Cave"), and new music
+  for Snow Mountain.
+* Added slow-down for karts driving backwards.
+* Somewhat reduced 'shaking' of AI driven karts.
+* Fixed several bugs, including incorrect rescues, and track
+  and kart selection issues.
+
+
+SuperTuxKart 0.5 (May 2008)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Six new tracks and one improved track: Fort Magma, SnowTux Peak, Amazonian Journey, City, 
+   Canyon, Crescent Crossing and StarTrack
+* Complete Challenges to unlock game modes, new tracks and a skidding preview
+* New Follow the Leader game mode
+* New Grand Prix
+* Improved User Interface
+* Improved game pad/joystick handling
+* German, French, Dutch, Spanish, Italian and Swedish translations
+* Additional music
+* Many Bugfixes including:
+	a memory leak fix (Charlie Head)
+	an AI crash fix (Chris Morris)
+
+
+SuperTuxKart 0.4 (February 2008)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* New physics handling using the bullet physics engine
+* New kart: wilber
+* Improved 'Shifting Sands' and 'Lighthouse' tracks
+* Improved AI
+* New GUI handling, including resolution switching GUI
+* Improved input handling	
+* Jump and look-back featue
+* Additional music and main theme
+	
+	
+SuperTuxKart 0.3 (May 2007)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Highscore lists	
+* Shortcut detection 	
+* Improved AI
+* Fullscreen support
+* New track: the island
+* New penalty: bomb
+* MacOSX support
+* OpenAL and ogg-vorbis support
+* Two new Grand Prixs	
+* Improved user interface:
+  - New racing interface
+  - Better track map
+  - Player kart dots in the track map are bigger than AI dots
+  - Track selection screen has topview pictures
+  - Added "Setup new race" option when a track is finished
+  - Added "Restart race" option when a track is finished
+  - The keyboard can skip vertical spaces between buttons
+  - Better control configuration
+  - Better in-game help
+  - Added .desktop file for menus and icon
+* Bugfixes:
+  - Fixed bug in ssg_help::MinMax, which could cause a significant performance loss.
+  - Fixed bug that allowed the joystick to erase the main menu
+  - Fixed bug that allowed the joystick to "play the game while paused"
+  - Fixed screen_manager assert failure bug
+  - Fixed sound_manager assert failure bug
+  - Fixed keyboard keys unable to work on the first key press bug
+  - And others
+
+SuperTuxKart 0.2 (22. Sep 2006)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * Significant performance improvement by using display lists
+  * Improved AI
+  * Support for different grand prixs
+  * Too many bug fixes to list them all, but the important ones:
+    * Work around for 'karts fall through track' compiler bug
+    * Fixed rescue mode
+  * Two new collectables: parachute and anvil
+  * Track screen shots in the track select screen
+  * Keyboard handling allows gradual turning
+  * Improved physics (still work in progress)
+    * All hard-coded properties like maximum velocity have
+      been replaced by dynamically computed data dependent
+      on kart parameters, allowing for karts having different
+      characteristics.
+  * Added help and about screens, added credits to track designer
+  * Items were added to all tracks
+
+SuperTuxKart 0.1 (04. May 2006)  (not officially released)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * Significant speedup by using a new HOT and collision algorithm
+    --> all tracks are now playable
+  * Removed all SDL dependencies, only plib is needed
+  * Single and multi-window menu can be used
+  * Code structure changes
+  * Some bug fixes and small improvements
+  * Added profile option to support automatic profiling
+
+SuperTuxKart 0.0.0 (22. Dec 2004)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * new tracks
+  * new characters and karts
+  * new user-interface
+  * some additional effects (skid-marks, smoke)
+
+TuxKart v0.4.0 (March 19th 2004)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * Changes for compatibility with PLIB 1.8.0 and later.
+  * Removed some features that were only there to support
+    truly ancient graphics cards like 3Dfx Voodoo-1/2.
+
+TuxKart v0.3.0 (??)
+~~~~~~~~~~~~~~~~~~~
+  * Converted to use the new PLIB/PW library and thus
+    avoid the need to link to GLUT.
+
+TuxKart v0.2.0 (Sept 3rd 2002)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * Changes for compatibility with PLIB 1.6.0 and later.
+
+TuxKart v0.0.5 (??)
+~~~~~~~~~~~~~~~~~~~
+  * Changes for compatibility with PLIB 1.4.0 and later.
+
+TuxKart v0.0.4 (??)
+~~~~~~~~~~~~~~~~~~~
+  * Changes to suit rassin-frassin-Windoze-junk.
+
+  * Steady-cam camera - courtesy of cowtan@ysbl.york.ac.uk
+
+  * Changes for compatibility with PLIB 1.3.1 and later.
+
+  * Added new music courtesy of Matt Thomas.
+
+TuxKart v0.0.3 (July 4th 2000)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * Fixed bug in Keyboard driver when no
+    joystick driver is installed.
+
+  * More CygWin fixes.
+
+  * Started new feature to allow you to be
+    rescued from lava, etc.
+
+TuxKart v0.0.2 (July 2nd 2000)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * Added ability to add new tracks without
+    recompiling.
+
+  * Can now drive using keyboard only - no joystick
+    required.
+
+  * Should compile and run under Windoze using CygWin.
+
+TuxKart v0.0.1 (July 1st 2000)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * Fixed a couple of files missing in initial
+    Distro.
+
+TuxKart v0.0.0 (June 29th 2000)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * First CVS release.
+
+TuxKart (unnumbered) (April 13th 2000)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * First hack.
+
+# EOF #
--- a/3
+++ b/3
@@ -21,7 +21,8 @@ HARDWARE REQUIREMENTS
 =====================
 * You need a 3D graphics card that supports OpenGL or Mesa.
 * You should have a CPU that's running at 450MHz or better.
-* You'll need at least 600 MB of free RAM. 
+* You'll need at least 128Mb RAM. 
+* A sound card would be nice - but it's not essential.
 * Ideally, you want a joystick with at least 6 buttons.


--- a/52
+++ b/52
@@ -39,5 +39,53 @@ Thanks in advance!
   The SuperTuxKart-Team


-For details, see
-        http://supertuxkart.sourceforge.net/Get_involved
+********************************
+********************************
+**                            **
+**  Incomplete(!!) TODO List  **
+**                            **
+********************************
+********************************
+
+Things that would be nice to fix, but are not urgent
+=====================================================
+- Write some documentation.
+- Display skid marks again (currently disabled due to problems of 
+  skid marks being 'in the air').
+- Added settings menu (e.g. for MPH vs KPH (vs. KM/H), ...)
+- Add a tutorial course
+- Valgrind for memory bugs.
+- Update the web page, make more screen shots, ...
+- Tight/wide corner steering for AI. The AI is hitting the wall
+  in very tight corners (e.g. subseatrack) [coz]
+
+
+long term
+=========
+- Add network multiplayer
+- Make full use of OpenAL
+- Performance tuning
+  - Support for multi-core CPUs
+    (while this is not strictly necessary, it might be a nice headline
+    for news entries. The physics/collision detection would be
+    easy to parallelise)
+- More gadgets
+  - Positive: - squirt oil on track to make karts slip, ...
+  - Negative: - 'dirt on windscreen' - partial blackout of screen
+- More flexibility for items. E.g. 
+  - Tracks might hard code some items, change the distribution of some
+    others (e.g. only a rocket at a certain location, but random choice
+    which one the kart gets. Instead of just specifying 
+    GREENHERRING, one could write: ZIPPER:ANVIL and one of the listed
+    things would be picked randomly)
+  - Grand prixs might want to overwrite this, e.g.:
+    "war" grand prix: only rockets for all gadgets
+  - Perhaps make good and bad things indistinguishable?
+- sound/music manager needed
+  Make it easy to replace sounds (which are currently hardcoded), e.g
+  via a config file. Sound/music should be selectable for a track,
+  but a grand prix should be able to overwrite this to create a consistent
+  ambience, ...
+- More tracks
+- More grand prixs
+- Code cleanup
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autogen.sh to produce a configure script.

-AC_INIT(supertuxkart,0.7.2)
+AC_INIT(supertuxkart, 0.7)
 AC_CONFIG_SRCDIR([src/main.cpp])

 AC_PREREQ(2.61)
@@ -303,10 +303,9 @@ AC_TRY_RUN(
        #  include "irrlicht.h"
        int main() {
        #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR == 7)
-        #error "STK needs irrlicht 1.8* to work properly (which might be only available"
-        #error "as svn trunk atm"
-        #else
            // ok
+        #else
+        #error "You need irrLicht 1.7.* to build STK, irrlicht 1.8 is not supported yet"
        #endif
        return 0;
        }
@@ -316,9 +315,7 @@ AC_TRY_RUN(
 )

 if test x$irrlicht_min_version_met = xfalse; then
-    AC_MSG_ERROR([Your irrLicht is too old, please update irrLicht. 
-You need irrlicht 1.8.
-While irrlicht 1.8 is not released, we recommend using version 3843 from irrlicht SVN trunk.])
+    AC_MSG_ERROR([Your irrLicht is too old, please update irrLicht.])
 else
    echo "yes"
 fi
@@ -354,8 +351,6 @@ fi

 LIBS=$save_LIBS

-# Libcurl is needed in all build modes
-PKG_CHECK_MODULES(LIBCURL, libcurl >= 0.1)

 # ======================================================
 # Try to supply the SVN revision number for the compiler
@@ -370,6 +365,7 @@ fi
 # Bullet physics
 # ==============
 AC_DEFINE([BT_NO_PROFILE], [], [Disable bullet internal profiling])
+SUMMARY="$SUMMARY\nUsing bullet physics."
 BULLETTREE="src/bullet"
 bullet_LIBS="-Lbullet/src -lbulletdynamics -lbulletcollision -lbulletmath"

@@ -402,8 +398,21 @@ case "${host}" in
  enet_LIBS="-Lenet -lenet"
  ;;
 esac
+SUMMARY="$SUMMARY\nUsing enet network support."
 ENETTREE="src/enet"

+# =================
+# Check for gettext
+# =================
+CHECK_GETTEXT(external)
+#disable/enable addons support
+AC_ARG_WITH(addons,[AS_HELP_STRING([--with-addons],
+              [This option is used to enable/disable addons support])])
+if test "x$with_addons" == "xyes" ; then
+    PKG_CHECK_MODULES(LIBCURL, libcurl >= 0.1)
+    echo "STK will compile with addons support"
+    AC_DEFINE(ADDONS_MANAGER)
+fi
 # ==========================================
 # Check for a known compiler bug, details in 
 # src/bullet/src/Makefile.am
@@ -436,9 +445,7 @@ AC_SUBST(ENETTREE)
 AC_CONFIG_FILES([                   \
 Makefile                           \
 data/Makefile                      \
- data/challenges/Makefile           \
 data/fonts/Makefile                \
- data/gfx/Makefile                  \
 data/grandprix/Makefile            \
 data/gui/Makefile                  \
 data/karts/Makefile                \
--- a/data/CREDITS
+++ b/data/CREDITS
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 # data/

-SUBDIRS    = challenges fonts gfx gui karts models music po sfx textures tracks grandprix
+SUBDIRS    = fonts gui karts models music po sfx textures tracks grandprix
 pkgdatadir = $(datadir)/games/$(PACKAGE)/data

 dist_pkgdata_DATA = \
--- a/data/challenges/Makefile.am
+++ b/data/challenges/Makefile.am
@@ -1,5 +0,0 @@
-# challenges/
-
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/challenges
-
-nobase_dist_pkgdata_DATA =  $(shell find $(srcdir) -name "*.challenge") 
--- a/data/challenges/canyon.challenge
+++ b/data/challenges/canyon.challenge
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="tollway"
-    name="Win a race on Tux Tollway"
-    description="Win a 3 lap race on Tux Tollway against 4 Expert level AI karts."
-    depend-on="lighthousetime tothemoonandbackgp"
-    unlock-track="canyon"
-    major="single"
-    minor="quickrace"
-    track="tuxtollway"
-    difficulty="hard"
-    laps="3"
-    karts="5"
-    position="1"
-/>
-
--- a/data/challenges/crescentcrossing.challenge
+++ b/data/challenges/crescentcrossing.challenge
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="energymathclass"
-    name="Collect Nitro in Math Class"
-    description="Finish with at least 10 points of nitro on three laps of Oliver's Math Class in under 55 seconds."
-    unlock-track="crescentcrossing"
-    depend-on="penguinplaygroundgp"
-    major="single"
-    minor="quickrace"
-    track="olivermath"
-    difficulty="hard"
-    laps="3"
-    karts="1"
-    energy="10"
-    time="55"
-/>
-
--- a/data/challenges/fortmagma.challenge
+++ b/data/challenges/fortmagma.challenge
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="minestime"
-    name="Finish Mines in 3:00"
-    description="Finish 3 laps in mines with 3 expert AI karts in under 3:00 minutes."
-    depend-on="energyxr591"
-    unlock-track="fortmagma"
-    major="single"
-    minor="quickrace"
-    track="mines"
-    difficulty="hard"
-    laps="3"
-    karts="4"
-    time="180"
-/>
-
--- a/data/challenges/gnu.challenge
+++ b/data/challenges/gnu.challenge
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="fortmagma"
-    name="Win a race on Fort Magma"
-    description="Win a 3 lap race on Fort Magma against 3 Expert level AI karts."
-    depend-on="worldsend"
-    unlock-kart="gnu"
-    major="single"
-    minor="quickrace"
-    track="fortmagma"
-    difficulty="hard"
-    laps="3"
-    karts="4"
-    position="1"
-/>
-
--- a/data/challenges/hacienda.challenge
+++ b/data/challenges/hacienda.challenge
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="farmtracktime"
-    name="Finish Farm in 2:30"
-    description="Finish 3 laps in Farm with 3 easy AI karts in under 2:30 minutes."
-    unlock-track="hacienda"
-    major="single"
-    minor="quickrace"
-    track="farm"
-    difficulty="easy"
-    laps="3"
-    karts="4"
-    time="150"
-/>
-
--- a/data/challenges/island.challenge
+++ b/data/challenges/island.challenge
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="snowmountain"
-    name="Win a race on Snow Mountain"
-    description="Win a 3 lap race on Snow Mountain under 3:05 against 3 medium AI karts."
-    unlock-track="islandtrack"
-    major="single"
-    minor="quickrace"
-    track="snowmountain"
-    difficulty="medium"
-    laps="3"
-    karts="4"
-    time="185"
-/>
-
--- a/data/challenges/lighthouse.challenge
+++ b/data/challenges/lighthouse.challenge
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="starfollow"
-    name="Follow the Leader around the Solar System"
-    description="Win a Follow the Leader race with 5 AI karts on Star track"
-    unlock-track="lighthouse"
-    depend-on="farmtracktime penguinplaygroundgp"
-    major="single"
-    minor="followtheleader"
-    track="startrack"
-    difficulty="medium"
-    laps="3"
-    karts="6"
-    position="2"
-/>
-
-
--- a/data/challenges/mines.challenge
+++ b/data/challenges/mines.challenge
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="energyxr591"
-    name="Collect fuel for your rocket"
-    description="Finish with at least 16 nitro points on 2 laps of XR591 in under 2:30 minutes."
-    unlock-track="mines"
-    depend-on="lighthousetime canyon"
-    major="single"
-    minor="quickrace"
-    track="xr591"
-    difficulty="hard"
-    karts="1"
-    laps="2"
-    energy="16"
-    time="150"
-/>
-
--- a/data/challenges/skyline.challenge
+++ b/data/challenges/skyline.challenge
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="gardenhead"
-    name="Win a Head to Head in the Secret Garden"
-    description="Win a 1 lap Head to Head in the Secret Garden against 1 easy level AI kart."
-    depend-on="snowmountain"
-    unlock-track="skyline"
-    major="single"
-    minor="timetrial"
-    track="secretgarden"
-    difficulty="easy"
-    laps="1"
-    karts="2"
-    position="1"
-/>
-
--- a/data/challenges/tollway.challenge
+++ b/data/challenges/tollway.challenge
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="lighthousetime"
-    name="Finish Lighthouse in 1:30"
-    description="Finish 3 laps in Lighthouse with 3 Expert AI karts in under 1:30 minutes."
-    unlock-track="tuxtollway"
-    depend-on="starfollow"
-    major="single"
-    minor="quickrace"
-    track="lighthouse"
-    difficulty="hard"
-    laps="3"
-    karts="4"
-    time="90"
-/>
-
--- a/data/challenges/xr591.challenge
+++ b/data/challenges/xr591.challenge
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<challenge
-    version="1"
-    id="canyon"
-    name="Win a race on Canyon"
-    description="Win a 3 lap race on Canyon against 4 Expert level AI karts."
-    depend-on="tollway"
-    unlock-track="xr591"
-    major="single"
-    minor="quickrace"
-    track="canyon"
-    difficulty="hard"
-    laps="3"
-    karts="5"
-    position="1"
-/>
-
--- a/data/coin_sign.items
+++ b/data/coin_sign.items
@@ -0,0 +1,10 @@
+;; -*- mode: lisp -*-
+
+(item
+  (gold   "nitrotank-big"  )
+  (silver "nitrotank-small")
+  (green  "warning"    )
+  (red    "bonusblock2")
+)
+
+;; EOF ;;
--- a/data/challenges/followtheleader.challenge
+++ b/data/challenges/followtheleader.challenge
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>

 <challenge
-    version="1"
    id="penguinplaygroundgp"
    name="Win Penguin Playground Grand Prix"
    description="Win Penguin Playground Grand Prix with 3 Expert Level AI karts."
--- a/data/fonts/Rahel.png
+++ b/data/fonts/Rahel.png
--- a/data/fonts/StkChineseFont.xml
+++ b/data/fonts/StkChineseFont.xml
--- a/data/fonts/StkFont.xml
+++ b/data/fonts/StkFont.xml
--- a/data/fonts/comix.png
+++ b/data/fonts/comix.png
--- a/data/fonts/title_font.xml
+++ b/data/fonts/title_font.xml
--- a/data/fonts/title_font_2.png
+++ b/data/fonts/title_font_2.png
--- a/data/fonts/wqyMicroHei0.png
+++ b/data/fonts/wqyMicroHei0.png
--- a/data/fonts/wqyMicroHei1.png
+++ b/data/fonts/wqyMicroHei1.png
--- a/data/fonts/wqyMicroHei2.png
+++ b/data/fonts/wqyMicroHei2.png
--- a/data/fonts/wqyMicroHei3.png
+++ b/data/fonts/wqyMicroHei3.png
--- a/data/fonts/wqyMicroHei4.png
+++ b/data/fonts/wqyMicroHei4.png
--- a/data/fonts/wqyMicroHei5.png
+++ b/data/fonts/wqyMicroHei5.png
--- a/data/gfx/Makefile.am
+++ b/data/gfx/Makefile.am
@@ -1,5 +0,0 @@
-#data/gfx
-
-pkgdatadir   = $(datadir)/games/$(PACKAGE)/data/gfx
-dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.xml")
-
--- a/data/gfx/acid_splash.xml
+++ b/data/gfx/acid_splash.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="box" box_x="0.75" box_y="0.75" box_z="0.75">
-
-    <spreading angle="25"        />
-    
-    <velocity  x="0.000"
-               y="0.002"
-               z="0.000"         />
-    
-    <material  file="smoke_acid.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="300"
-               max="400"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="1000"
-               max="1000"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.2"
-               max="0.66"        />
-
-    <color     min="255 255 255"
-               max="0 0 0" />
-
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-</particles>
--- a/data/gfx/fire.xml
+++ b/data/gfx/fire.xml
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="point">
-
-    <spreading angle="24"      />
-    
-    <velocity  x="0.000"
-               y="0.005"
-               z="0.000"         />
-    
-    <material  file="explode.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="30"
-               max="50"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="300"
-               max="500"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.6"
-               max="0.8"        />
-    
-    <color     min="255 255 255"
-               max="255 255 255" />
-
-  <fadeout time="300" />
-
-</particles>
--- a/data/gfx/nitro.xml
+++ b/data/gfx/nitro.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="box" box_x="0.35" box_y="0.2" box_z="0.2">
-
-    <spreading angle="30"         />
-    
-    <velocity  x="0.0"
-               y="0.001"
-               z="-0.003"         />
-    
-    <material  file="nitro-particle.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="400"
-               max="600"          />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="400"
-               max="600"          />
-    
-    <!-- Size of the particles -->
-    <size      min="0.20"
-               max="0.40"         />
-    
-    <color     min="255 255 255"
-               max="255 255 255"  />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"         />
-
-</particles>
--- a/data/gfx/rain-ground.xml
+++ b/data/gfx/rain-ground.xml
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Particle system to simulate it's raining heavily in the ground.
-  Current tests done as kart particles, but this should be per camera
-  and placed like the cylinders that have rain drop textures, maybe
-  with some speed compensation, so it never wastes particles (out
-  of view) when camera moves really fast. Then rate can be trimmed
-  down to 150/180 or 100/120, with smaller box.
-->
-<particles emitter="box" box_x="12.0" box_y="0.5" box_z="12.0">
-
-    <spreading angle="20"       />
-    
-    <velocity  x="0.000"
-               y="0.005"
-               z="0.000"         />
-    
-    <material  file="water-splash.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="200"
-               max="240"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="1000"
-               max="1000"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.35"
-               max="0.70"        />
-
-    <color     min="255 255 255"
-               max="255 255 255" />
-
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="750"        />
-
-    <gravity   strength="-0.01"
-               only-force-time="500" />
-</particles>
--- a/data/gfx/rain.xml
+++ b/data/gfx/rain.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Particle system to simulate it's raining heavily over an item/kart.
-  It should be applied no matter if kart is flying or on (any) ground,
-  and rotate to always fire up, it just simulates the rain bouncing
-  off the kart and being fired by wheels. It could also be applied to
-  bowling balls, for example.
-->
-<particles emitter="box" box_x="0.5" box_y="1.0" box_z="1.0">
-
-    <spreading angle="10"       />
-    
-    <velocity  x="0.000"
-               y="0.009"
-               z="0.000"         />
-    
-    <material  file="water-splash.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="50"
-               max="60"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="1000"
-               max="1000"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.35"
-               max="0.70"        />
-
-    <color     min="255 255 255"
-               max="255 255 255" />
-
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="750"        />
-
-    <gravity   strength="-0.01"
-               only-force-time="500" />
-</particles>
--- a/data/gfx/smoke.xml
+++ b/data/gfx/smoke.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="point">
-
-    <spreading angle="90"        />
-    
-    <velocity  x="0.003"
-               y="0.003"
-               z="0.003"         />
-    
-    <material  file="smoke.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="100"
-               max="250"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="300"
-               max="500"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.2"
-               max="0.66"        />
-
-    <color     min="255 255 255"
-               max="255 255 255" />
-
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-</particles>
--- a/data/gfx/smoke_brown.xml
+++ b/data/gfx/smoke_brown.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="point">
-
-    <spreading angle="90"       />
-    
-    <velocity  x="0.003"
-               y="0.0047"
-               z="0.003"         />
-    
-    <material  file="smoke_brown.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="150"
-               max="300"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="300"
-               max="500"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.6"
-               max="0.9"        />
-
-    <color     min="255 255 255"
-               max="255 255 255" />
-
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-</particles>
--- a/data/gfx/smoke_red.xml
+++ b/data/gfx/smoke_red.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="point">
-
-    <spreading angle="90"        />
-    
-    <velocity  x="0.003"
-               y="0.0047"
-               z="0.003"         />
-    
-    <material  file="smoke_red.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="150"
-               max="300"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="300"
-               max="500"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.6"
-               max="0.9"        />
-    
-    <color     min="255 255 255"
-               max="255 255 255" />
-
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-</particles>
--- a/data/gfx/smoke_yellow.xml
+++ b/data/gfx/smoke_yellow.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="point">
-
-    <spreading angle="90"        />
-    
-    <velocity  x="0.003"
-               y="0.0047"
-               z="0.003"         />
-    
-    <material  file="smoke_yellow.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="150"
-               max="300"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="300"
-               max="500"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.6"
-               max="0.9"        />
-
-    <color     min="255 255 255"
-               max="255 255 255" />
-
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-</particles>
--- a/data/gfx/snow.xml
+++ b/data/gfx/snow.xml
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- For sky particles, the size of the box is ignored -->
-<particles emitter="box">
-
-    <spreading angle="3"           />
-    
-    <velocity  x="0.0"
-               y="-0.01"
-               z="0.0"             />
-    
-    <material  file="snowflake.png"/>
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="400"
-               max="500"           />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="9000"
-               max="9000"          />
-    
-    <!-- Size of the particles -->
-    <size      min="0.40"
-               max="0.60"          />
-    
-    <color     min="255 255 255"
-               max="255 255 255"   />
-    
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="100"          />
-
-</particles>
--- a/data/gfx/splash.xml
+++ b/data/gfx/splash.xml
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<particles emitter="box" box_x="0.75" box_y="0.75" box_z="0.75">
-
-    <spreading angle="120"       />
-    
-    <velocity  x="0.000"
-               y="0.009"
-               z="0.000"         />
-    
-    <material  file="water-splash.png"  />
-    
-    <!-- Amount of particles emitted per second -->
-    <rate      min="1000"
-               max="1200"         />
-    
-    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="1600"
-               max="1900"         />
-    
-    <!-- Size of the particles -->
-    <size      min="0.60"
-               max="0.90"        />
-
-    <color     min="255 255 255"
-               max="255 255 255" />
-
-    <!-- How much time in milliseconds before the particle is fully faded out  -->
-    <fadeout   time="500"        />
-
-    <gravity   strength="-0.01"
-               only-force-time="1000" />
-</particles>
--- a/data/grandprix/Makefile.am
+++ b/data/grandprix/Makefile.am
@@ -3,5 +3,4 @@
 pkgdatadir = $(datadir)/games/$(PACKAGE)/data/grandprix

 dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.grandprix")  \
-                    $(shell find $(srcdir) -name "*.challenge")  \
-                    $(shell find $(srcdir) -name "*.tutorial" )
+                    $(shell find $(srcdir) -name "*.challenge")
--- a/data/challenges/alltracks.challenge
+++ b/data/challenges/alltracks.challenge
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>

 <challenge
-    version="1"
    id="worldsend"
    name="Win the At World's End Grand Prix"
    description="Come first in the At World's End Grand Prix with 3 Expert AI karts."
    unlock-gp="alltracks"
-    depend-on="islandfollow minestime"
+    depend-on="islandfollow"
    major="grandprix"
    minor="quickrace"
    gp="atworldsend"
--- a/data/grandprix/alltracks.grandprix
+++ b/data/grandprix/alltracks.grandprix
@@ -1,5 +1,5 @@

-<supertuxkart_grand_prix name="All Tracks">
+<supertuxkart_grand_prix name="All tracks">

    <track id="hacienda"         laps="3" />
    <track id="scotland"         laps="3" />
@@ -15,7 +15,6 @@
    <track id="olivermath"       laps="4" />
    <track id="farm"             laps="3" />
    <track id="secretgarden"     laps="3" />
-    <track id="city"             laps="3" />
    <track id="xr591"            laps="3" />
    <track id="canyon"           laps="2" />
    <track id="snowmountain"     laps="3" />
--- a/data/challenges/atworldsend.challenge
+++ b/data/challenges/atworldsend.challenge
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>

 <challenge
-    version="1"
    id="islandfollow"
    name="Follow the Leader on a Desert Island"
    description="Win a Follow the Leader race with 3 AI karts on a Desert Island."
--- a/data/grandprix/atworldsend.grandprix
+++ b/data/grandprix/atworldsend.grandprix
@@ -4,8 +4,7 @@
    <track id="fortmagma"    laps="3" />
    <track id="canyon"       laps="2" />
    <track id="xr591"        laps="3" />
-    <track id="mines"        laps="3" />
-    <track id="city"         laps="3" />
+    <track id="mines"            laps="3" />
    
 </supertuxkart_grand_prix>

--- a/data/grandprix/basic_drive.tutorial
+++ b/data/grandprix/basic_drive.tutorial
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<tutorial
-    id="basicdriving"
-    name="Win the At World's End Grand Prix"
-    description="Come first in the At World's End Grand Prix with 3 Expert AI karts."
-    major="single"
-    minor="normal"
-    gp="canyon"
-    difficulty="easy"
-    karts="1"
-    position="1"
-    num_laps="99"
-    num_players="1"
-/>
--- a/data/challenges/snagdrive.challenge
+++ b/data/challenges/snagdrive.challenge
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>

 <challenge
-    version="1"
    id="tothemoonandbackgp"
    name="Win To the Moon and Back Grand Prix"
    description="Win the To the Moon and Back Grand Prix with 3 Expert Level AI karts."
--- a/data/challenges/tothemoonandback.challenge
+++ b/data/challenges/tothemoonandback.challenge
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>

 <challenge
-    version="1"
    id="energyshiftingsands"
    name="Collect the Pharaohs Treasure"
    description="Finish with at least 12 nitro points on 3 laps of Shifting Sands in under 2:20 minutes."
--- a/data/gui/License.txt
+++ b/data/gui/License.txt
@@ -4,8 +4,7 @@ released under CC-BY-SA 3+


 Except :
-main_*.png icons, hourglass, back, back_addons, next_addons, package.png
-    released under Creative-Commons BY-SA 3, By yeKcim (Anthony Carré)
+main_*.png icons, released under Creative-Commons BY-SA 3, By yeKcim (Anthony Carré)

 mode_tt, released under Creative-Commons BY-SA 3, incorporatings artwork from yeKcim and onyum.com

@@ -17,8 +16,6 @@ title_font, by Marianne Gagnon (Auria), released under CC-BY-SA 3+

 screen*.png, by Marianne Gagnon (Auria), including elements from the public domain Tango icon set

-Gauge and bar by Dakal, released under CC-BY-SA 3
-
 ====

 Glass Skin by Auria, under CC-BY-SA 3+
--- a/data/gui/addons.png
+++ b/data/gui/addons.png
--- a/data/gui/addons.stkgui
+++ b/data/gui/addons.stkgui
@@ -0,0 +1,30 @@
+<stkgui>
+
+<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
+
+    <header text_align="center" width="100%" text="SuperTuxKart Addons"/>
+    <spacer height="15" width="10"/>
+
+    <tabs id="category" height="10%" max_height="110" width="100%" align="center">
+        <icon-button id="tab_kart" width="128" height="128" icon="gui/karts.png"
+                I18N="Section in the addons menu" text="Karts"/>
+        <icon-button id="tab_track" width="128" height="128" icon="gui/mode_normal.png"
+                I18N="Section in the addons menu" text="Tracks"/>
+        <icon-button id="tab_update" width="128" height="128" icon="gui/package.png"
+                I18N="Section in the addons menu" text="Update"/>
+    </tabs>
+    
+    <box proportion="1" width="100%" layout="vertical-row">
+        <label id="update_status" width="100%" height="10%" text_align="left" />
+        <spacer height="5%" width="100%"/>
+        <list id="list_addons" height="50%" proportion="5" width="100%" align="center"/>
+        <spacer height="15%" width="100%"/>
+    </box>
+    
+    <spacer width="50" height="45" /> 
+</div>
+
+<button id="back" x="20" y="-40" width="250" height="35" align="left"
+        I18N="In the options menu, to go back to the main menu or game" text="Back"/>
+
+</stkgui>
--- a/data/gui/addons_loading.stkgui
+++ b/data/gui/addons_loading.stkgui
@@ -1,32 +0,0 @@
-<stkgui>
-
-<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
-  
-  
-  <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row" >
-    <div width="50%" height="100%" layout="vertical-row" >
-        <icon id="icon" align="center" proportion="8" width="100%" icon="gui/loading.png"/>
-        <spacer proportion="1" /> 
-    </div>
-    <spacer proportion="1" />
-    <div width="50%" height="50%" layout="vertical-row" >
-        <label id="name"     width="100%" text_align="left"/>
-        <label id="size"     width="100%" text=""/>
-        <label id="revision" width="100%" text=""/>
-        <spacer height="10"/>
-        <label id="flags"    width="100%" text="" word_wrap="true"/>
-    </div>
-  </div>
-
-  <bubble word_wrap="true" id="description" height="100%" width="90%" proportion="6" align="center" />
-
-  <div width="90%" proportion="2" align="center">
-    <button      id="install"  x="0" y="0" width="100%" height="100%" I18N="Addons" text="Install"/>
-    <progressbar id="progress" x="0" y="20%" width="100%" height="60%"  />
-  </div>
-  
-  <spacer height="10" />
-  
-  <button id="cancel" proportion="2" width="90%" I18N="Addons" text="Back" align="center"/>
-</div>
-</stkgui>
--- a/data/gui/addons_screen.stkgui
+++ b/data/gui/addons_screen.stkgui
@@ -1,28 +0,0 @@
-<stkgui>
-
-<div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
-
-    <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
-        <icon-button id="back"   height="100%" icon="gui/back.png"/>
-        <header text_align="center" proportion="1" text="SuperTuxKart Addons" align="center"/>
-        <button      id="reload" I18N="Reload button to reload addon data" text="Reload" />
-        <spacer width="15" height="10" />
-    </div>
-    
-    <spacer height="15" width="10"/>
-
-    <tabs id="category" height="10%" max_height="110" width="90%" align="center">
-        <icon-button id="tab_kart" width="128" height="128" icon="gui/karts.png"
-                I18N="Section in the addons menu" text="Karts"/>
-        <icon-button id="tab_track" width="128" height="128" icon="gui/mode_normal.png"
-                I18N="Section in the addons menu" text="Tracks"/>
-    </tabs>
-    <spacer height="5" width="10"/>
-    
-    <list id="list_addons" proportion="1" width="97%" align="center"/>
-        
-    <spacer width="1" height="8" /> 
-        
-</div>
-
-</stkgui>
--- a/data/gui/addons_update.stkgui
+++ b/data/gui/addons_update.stkgui
@@ -0,0 +1,30 @@
+<stkgui>
+
+<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
+
+    <header text_align="center" width="100%" text="SuperTuxKart Addons"/>
+    <spacer height="15" width="10"/>
+
+    <tabs id="category" height="10%" max_height="110" width="100%" align="center">
+        <icon-button id="tab_kart" width="128" height="128" icon="gui/karts.png"
+                I18N="Section in the addons menu" text="Karts"/>
+        <icon-button id="tab_track" width="128" height="128" icon="gui/mode_normal.png"
+                I18N="Section in the addons menu" text="Tracks"/>
+        <icon-button id="tab_update" width="128" height="128" icon="gui/package.png"
+                I18N="Section in the addons menu" text="Update"/>
+    </tabs>
+    
+    <box proportion="1" width="100%" layout="vertical-row">
+        <label id="update_status" width="100%" height="10%" text_align="left" />
+        <spacer height="5%" width="100%"/>
+        <list id="list_addons" height="50%" proportion="5" width="100%" align="center"/>
+        <spacer height="15%" width="100%"/>
+    </box>
+    
+    <spacer width="50" height="45" /> 
+</div>
+
+<button id="back" x="20" y="-40" width="250" height="35" align="left"
+        I18N="In the options menu, to go back to the main menu or game" text="Back"/>
+
+</stkgui>
--- a/data/gui/addons_view_dialog.stkgui
+++ b/data/gui/addons_view_dialog.stkgui
@@ -0,0 +1,27 @@
+<stkgui>
+
+<div x="5%" y="0%" width="90%" height="80%" layout="horizontal-row" >
+    <div width="50%" height="90%" layout="vertical-row" >
+    <spacer height="22%" /> 
+        <icon id="icon" align="center" proportion="8" width="100%" icon="gui/loading.png"/>
+    </div>
+    <div width="50%" height="90%" layout="vertical-row" >
+        <label id="name" width="100%" text="Name:" proportion="1" />
+        <label word_wrap="true" id="description" width="100%" text="Description:" proportion="1" />
+        <label id="version" width="100%" text="Version:" proportion="1" />
+
+    </div>
+
+</div>
+
+<div x="5%" y="80%" width="40%" height="10%" layout="horizontal-row">
+<spacer proportion="1" /> 
+    <button id="cancel" width="70%"  I18N="Addons" text="Back" align="center"/>
+<spacer proportion="1" /> 
+</div>
+<div x="50%" y="80%" width="40%" height="10%" layout="horizontal-row" >
+<spacer proportion="1" /> 
+    <button id="install" width="70%"   I18N="Addons" text="Install" align="center"/>
+<spacer proportion="1" /> 
+</div>
+</stkgui>
--- a/data/gui/arenas.stkgui
+++ b/data/gui/arenas.stkgui
@@ -1,14 +1,10 @@
 <stkgui>

-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
 <div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >

-    <header width="80%" I18N="Section in arena tracks selection screen" text="Arenas"
+    <header width="100%" I18N="Section in arena tracks selection screen" text="Arenas"
            align="center" text_align="center" />
    
-    <spacer width="20" height="5" />
-    
    <box proportion="1" width="100%" layout="vertical-row">
        <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true" 
            label_location="bottom" align="center" child_width="160" child_height="120" />
@@ -21,7 +17,7 @@
        <button id="all" I18N="track group" text="All"/>
    </tabs>

-    <spacer width="20" height="3%" />
+    <spacer width="20" height="13" />
    
 </div>

--- a/data/gui/bar.png
+++ b/data/gui/bar.png
--- a/data/gui/challenges.stkgui
+++ b/data/gui/challenges.stkgui
@@ -1,20 +1,22 @@
 <stkgui>

-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-    
    <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
            
-        <header I18N="Title for challenges screen" text="Challenges : Trophy Room" text_align="center" align="center" width="80%" />
+        <header I18N="Title for challenges screen" text="Challenges : Trophy Room" text_align="center" width="100%" />
        
-        <spacer height="5" width="100%"/>
+        <box id="animated_area" width="100%" proportion="1" layout="vertical-row">
        
-        <box width="100%" proportion="5" layout="vertical-row">
+        <ribbon_grid id="challenges" proportion="3" width="100%"
+            label_location="bottom" align="center" child_width="128" child_height="128" />
        
-            <ribbon_grid id="challenges" proportion="8" width="100%"
-                label_location="bottom" align="center" child_width="128" child_height="128" />
-            
-   
-            <spacer proportion="1" width="100%"/>
+        <spacer proportion="1" width="100%"/>
+                
        </box>
+
+        <spacer width="100%" height="45"/>
+
    </div>
+        
+    <button id="back" x="20" y="-40" height="35" align="left" text="Back to main menu"/>
+
 </stkgui>
--- a/data/gui/credits.stkgui
+++ b/data/gui/credits.stkgui
@@ -1,6 +1,4 @@
 <stkgui>
-    
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>

    <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
    
@@ -11,7 +9,11 @@
        <box id="animated_area" width="100%" proportion="10">
        
        </box>
-
+    
+        <spacer width="50" height="45" /> 
+    
    </div>
+    
+    <button id="back" x="20" y="-40" height="35" align="left" text="Back to main menu"/>

 </stkgui>
--- a/data/gui/dropdown.png
+++ b/data/gui/dropdown.png
--- a/data/gui/enter_player_name_dialog.stkgui
+++ b/data/gui/enter_player_name_dialog.stkgui
@@ -15,7 +15,7 @@
    
    <button id="cancel"    I18N="When configuring input" text="Press ESC to cancel" align="center"/>

-    <spacer height="15" width="20" />
+    <spacer height="20" width="20" />

 </div>

--- a/data/gui/gauge_empty.png
+++ b/data/gui/gauge_empty.png
--- a/data/gui/gauge_full.png
+++ b/data/gui/gauge_full.png
--- a/data/gui/gauge_goal.png
+++ b/data/gui/gauge_goal.png
--- a/data/gui/help1.stkgui
+++ b/data/gui/help1.stkgui
--- a/data/gui/help2.stkgui
+++ b/data/gui/help2.stkgui
--- a/data/gui/help3.stkgui
+++ b/data/gui/help3.stkgui
--- a/data/gui/help4.stkgui
+++ b/data/gui/help4.stkgui
--- a/data/gui/hourglass.png
+++ b/data/gui/hourglass.png
--- a/data/gui/karts.stkgui
+++ b/data/gui/karts.stkgui
@@ -2,12 +2,20 @@

 <div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >

-    <header width="80%"
+    <header width="100%"
           I18N="In the kart selection (player setup) screen"
           text="Choose a Kart"
           align="center" text_align="center" />
+    
+    <!-- FIXME: don't hardcode height -->
+    <box height="30" width="100%" layout="vertical-row">
+        <label width="100%" proportion="1"
+               I18N="In the kart selection (player setup) screen"
+               text="(more players can join by pressing 'fire' now)"
+               align="center" text_align="center" />
+    </box>
      
-    <placeholder id="playerskarts" width="100%" align="center" proportion="4">
+    <placeholder id="playerskarts" width="100%" proportion="4">
        <!-- Contents is added programatically -->
    </placeholder>
    
@@ -15,15 +23,21 @@
    
    <box proportion="2" width="100%" layout="vertical-row">
        <ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center"
-                     child_width="90" child_height="90" max_rows="3"/>
+                     child_width="80" child_height="80" max_rows="3"/>
    </box>
    
    <!-- Groups will be added dynamically at runtime -->
    <tabs width="100%" height="25" id="kartgroups">
+    <!--
+        <button id="standard" I18N="Kart group" text="Standard"/>
+        <button id="addons" I18N="Kart group" text="Add-Ons"/>
+        <button id="special" I18N="Kart group" text="Special"/>
+        <button id="all" I18N="Kart group" text="All"/>
+        -->
    </tabs>
-    <spacer width="100%" height="2%"/>
+        
+    <spacer height="15" width="25"/>
+    
 </div>

-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
 </stkgui>
--- a/data/gui/main.stkgui
+++ b/data/gui/main.stkgui
@@ -1,26 +1,22 @@
 <stkgui>

-    <div x="5%" y="0" width="90%" height="100%" layout="vertical-row" >
+    <div x="5%" y="0" width="90%" height="98%" layout="vertical-row" >
    
        <icon id="logo" align="center" proportion="8" width="100%" icon="gui/logo.png"/>
+        
        <buttonbar id="menu_toprow" proportion="3" width="75%" align="center">
            <icon-button id="new" width="128" height="128" icon="gui/main_race.png"
                    I18N="Main menu button" text="Race"/>
-            <icon-button id="multiplayer" width="128" height="128" icon="gui/main_race_multi.png"
-                    I18N="Main menu button" text="Multiplayer Race"/>
            <icon-button id="challenges" width="128" height="128"
                         icon="gui/challenge.png"
                         I18N="Main menu button"  text="Challenges"/>
-            <icon-button id="addons" width="128" height="128"
-                         icon="gui/addons.png"
-                         I18N="Main menu button"  text="Addons"/>
+            <icon-button id="options" width="128" height="128" icon="gui/main_options.png"
+                    I18N="Main menu button"  text="Options"/>
        </buttonbar>
        
        <spacer width="10" proportion="1"/>
        
        <buttonbar id="menu_bottomrow" proportion="3" width="85%" align="center">
-            <icon-button id="options" width="128" height="128" icon="gui/main_options.png"
-                    I18N="Main menu button"  text="Options"/>
            <icon-button id="help" width="128" height="128" icon="gui/main_help.png"
                    I18N="Main menu button" text="Help"/>
            <icon-button id="about" width="128" height="128" icon="gui/main_about.png"
@@ -31,24 +27,6 @@
        
        <spacer width="10" proportion="1"/>
        
-        <bottombar width="100%" height="10%" layout="horizontal-row">
-            <div proportion="1" height="100%" layout="horizontal-row">
-                <icon-button id="lang_combo" icon="gui/dropdown.png" height="100%" align="center"/>
-            </div>
-            
-            <spacer width="10" height="10" />
-            
-            <label proportion="3" height="100%" id="info_addons"
-                   I18N="In the main screen"
-                   text=""
-                   align="center" text_align="left" />
-               
-            <spacer width="10" height="10" />
-            
-            <placeholder id="empty_for_now" proportion="1">
-            </placeholder>
-        </bottombar>
-        
    </div>

-</stkgui>
+</stkgui>
--- a/data/gui/main_race_multi.png
+++ b/data/gui/main_race_multi.png
--- a/data/gui/mainaddons.stkgui
+++ b/data/gui/mainaddons.stkgui
@@ -0,0 +1,40 @@
+<stkgui>
+
+    <div x="5%" y="0" width="90%" height="98%" layout="vertical-row" >
+    
+        <icon id="logo" align="center" proportion="8" width="100%" icon="gui/logo.png"/>
+            <label width="100%" height="10%" id="info_addons"
+           I18N="In the main screen"
+           text="Loading news from stkaddons..."
+           align="center" text_align="center" />
+        <buttonbar id="menu_toprow" proportion="3" width="75%" align="center">
+            <icon-button id="new" width="128" height="128" icon="gui/main_race.png"
+                    I18N="Main menu button" text="Race"/>
+            <icon-button id="network" width="128" height="128" icon="gui/main_options.png"
+                    I18N="Main menu button" text="DEBUG"/>
+            <icon-button id="challenges" width="128" height="128"
+                         icon="gui/challenge.png"
+                         I18N="Main menu button"  text="Challenges"/>
+            <icon-button id="addons" width="128" height="128"
+                         icon="gui/addons.png"
+                         I18N="Main menu button"  text="Addons"/>
+        </buttonbar>
+        
+        <spacer width="10" proportion="1"/>
+        
+        <buttonbar id="menu_bottomrow" proportion="3" width="85%" align="center">
+            <icon-button id="options" width="128" height="128" icon="gui/main_options.png"
+                    I18N="Main menu button"  text="Options"/>
+            <icon-button id="help" width="128" height="128" icon="gui/main_help.png"
+                    I18N="Main menu button" text="Help"/>
+            <icon-button id="about" width="128" height="128" icon="gui/main_about.png"
+                    I18N="Main menu button" text="About"/>
+            <icon-button id="quit" width="128" height="128" icon="gui/main_quit.png"
+                    I18N="Main menu button" text="Quit"/>
+        </buttonbar>
+        
+        <spacer width="10" proportion="1"/>
+        
+    </div>
+
+</stkgui>
--- a/data/gui/no-package-featured.png
+++ b/data/gui/no-package-featured.png
--- a/data/gui/no-package.png
+++ b/data/gui/no-package.png
--- a/data/gui/options_audio.stkgui
+++ b/data/gui/options_audio.stkgui
@@ -1,61 +1,60 @@
 <stkgui>

-<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
+<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >

-    <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
+    <header text_align="center" width="100%" text="SuperTuxKart Options"/>
    <spacer height="15" width="10"/>
    
    <tabs id="options_choice" height="10%" max_height="110" width="100%" align="center">
-        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
+        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                I18N="Section in the settings menu" text="Graphics"/>
        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
                I18N="Section in the settings menu" text="Audio"/>
-        <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/>
-        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"/>
-        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"/>
+        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                I18N="Section in the settings menu" text="Players"/>
+        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                I18N="Section in the settings menu" text="Controls"/>
    </tabs>
    
    <box proportion="1" width="100%" layout="vertical-row">
        
        <spacer height="15" width="10"/>
        
-        <!-- ******** Music ******** -->
        <label width="100%" I18N="Section in the audio/video settings submenu" text="Music"/>
        
-        <div width="75%" height="fit" layout="horizontal-row" >
+        <!-- FIXME: don't hardcode height! -->
+        <div width="75%" height="40" layout="horizontal-row" >
            <label proportion="1" height="100%" text_align="right" I18N="Next to checkbox in settings menu" text="Enabled"/>
            
-            <div proportion="1" height="fit" layout="horizontal-row" >
+            <div proportion="1" height="40" layout="horizontal-row" >
                <spacer width="40" height="100%" />
-                <!-- FIXME: don't hardcode height -->
                <checkbox id="music_enabled" width="40" height="40"/>
            </div>
        </div>
-        <div width="75%" height="fit" layout="horizontal-row" >
+        <div width="75%" height="30" layout="horizontal-row" >
            <label proportion="1" height="100%" text_align="right" I18N="Music volume in options" text="Volume"/>
-            <div proportion="1" height="fit" layout="horizontal-row" >
+            <div proportion="1" height="40" layout="horizontal-row" >
                <spacer width="40" height="100%" />
-                <gauge id="music_volume" proportion="1" min_value="1" max_value="10"/>
+                <gauge id="music_volume" proportion="1" height="100%" min_value="1" max_value="10"/>
            </div>
        </div>
        
        <spacer height="15" width="10"/>
        
-        <!-- ******** SFX ******** -->
        <label width="100%" I18N="Section in audio/video settings submenu" text="Sound Effects"/>
                    
-        <div width="75%" height="fit" layout="horizontal-row" >
+        <div width="75%" height="40" layout="horizontal-row" >
            <label proportion="1" height="100%" text_align="right" I18N="Next to checkbox in settings menu" text="Enabled"/>
-            <div proportion="1" height="fit" layout="horizontal-row" >
+            <div proportion="1" height="40" layout="horizontal-row" >
                <spacer width="40" height="100%" />
-                <!-- FIXME: don't hardcode height -->
                <checkbox id="sfx_enabled" width="40" height="40"/>
            </div>
        </div>
-        <div width="75%" height="fit" layout="horizontal-row" >
+        <div width="75%" height="30" layout="horizontal-row" >
            <label proportion="1" height="100%" text_align="right" I18N="Sound volume in options" text="Volume"/>
-            <div proportion="1" height="fit" layout="horizontal-row" >
+            <div proportion="1" height="40" layout="horizontal-row" >
                <spacer width="40" height="100%" />
-                <gauge id="sfx_volume" proportion="1" min_value="1" max_value="10"/>
+                <gauge id="sfx_volume" proportion="1" height="100%" min_value="1" max_value="10"/>
            </div>
        </div>
        
@@ -63,8 +62,11 @@
        <spacer height="20" width="10"/>
        
    </box>
+    
+    <spacer width="50" height="10" /> 
+    <button id="back" x="20" width="250"  align="left"
+        I18N="In the options menu, to go back to the main menu or game" text="Back"/>
+
 </div>

-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
 </stkgui>
--- a/data/gui/options_device.stkgui
+++ b/data/gui/options_device.stkgui
@@ -1,15 +1,17 @@
 <stkgui>

-<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
+<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >

-    <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
+    <header text_align="center" width="100%" text="SuperTuxKart Options"/>
    <spacer height="15" width="10"/>
    
    <tabs id="options_choice" height="10%" max_height="110" width="100%" align="center">
-        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
-        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
-        <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/>
-        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"/>
+        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                I18N="Section in the settings menu" text="Graphics"/>
+        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                I18N="Section in the settings menu" text="Audio"/>
+        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                I18N="Section in the settings menu"  text="Players"/>
        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
                I18N="Section in the settings menu" text="Controls"/>
    </tabs>
@@ -33,8 +35,11 @@
        
        <spacer width="50" height="10" /> 
    </box>
+    
+    <spacer width="50" height="10" /> 
+    <button id="back" x="20" width="250" align="left"
+            I18N="In the options menu, to go back to the main menu or game" text="Back"/>
+
 </div>

-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
 </stkgui>
--- a/data/gui/options_input.stkgui
+++ b/data/gui/options_input.stkgui
@@ -1,15 +1,17 @@
 <stkgui>

-<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
+<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >

-    <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
+    <header text_align="center" width="100%" text="SuperTuxKart Options"/>
    <spacer height="15" width="10"/>
    
    <tabs id="options_choice" height="10%" max_height="110" width="100%" align="center">
-        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
-        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
-        <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/>
-        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"/>
+        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                I18N="Section in the settings menu" text="Graphics"/>
+        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                I18N="Section in the settings menu" text="Audio"/>
+        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                I18N="Section in the settings menu"  text="Players"/>
        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
                I18N="Section in the settings menu" text="Controls"/>
    </tabs>
@@ -27,13 +29,16 @@
        <list id="devices" proportion="5" width="75%" align="center"/>
        <spacer width="50" height="25" /> 
 
-        <button id="add_device" I18N="In the input configuration screen"  text="Add a device" align="center"/>
+        <button id="add_device" I18N="In the input configuration screen"  text="Add a device"/>
       
        <label text="* Which config to use will be inferred from which 'fire' key is pressed to join the game."
               proportion="2" word_wrap="true"/>
    </box>
+    
+    <spacer width="50" height="10" /> 
+    <button id="back" x="20" width="250" align="left"
+            I18N="In the options menu, to go back to the main menu or game" text="Back"/>
+
 </div>

-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
 </stkgui>
--- a/data/gui/options_players.stkgui
+++ b/data/gui/options_players.stkgui
@@ -1,17 +1,19 @@
 <stkgui>

-<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
+<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >

-    <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
+    <header text_align="center" width="100%" text="SuperTuxKart Options"/>
    <spacer height="15" width="10"/>
    
    <tabs id="options_choice" height="10%" max_height="110" width="100%" align="center">
-        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
-        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
-        <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/>
+        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                I18N="Section in the settings menu" text="Graphics"/>
+        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                I18N="Section in the settings menu" text="Audio"/>
        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
                I18N="Section in the settings menu" text="Players"/>
-        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"/>
+        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                I18N="Section in the settings menu" text="Controls"/>
    </tabs>
    
    <box proportion="1" width="100%" layout="vertical-row">
@@ -30,11 +32,20 @@
        <button id="addplayer" x="20"
                I18N="In players configuration menu"  
                text="Add Player" align="center"/>
-
+        <!--
+        <spacer width="50" height="10" /> 
+        <button id="renameplayer" x="20" width="35%" height="30" text="Rename Player" align="center"/>
+        <spacer width="50" height="10" /> 
+        <button id="rempayer" x="20" width="35%" height="30" text="Remove Player" align="center"/>
+        -->
+        
        <spacer width="20" height="15"/>
    </box>
+
+    <spacer width="50" height="10" /> 
+    <button id="back" x="20" width="250" align="left"
+            I18N="In the options menu, to go back to the main menu or game" text="Back"/>
+
 </div>

-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
 </stkgui>
--- a/data/gui/options_ui.png
+++ b/data/gui/options_ui.png
--- a/data/gui/options_ui.stkgui
+++ b/data/gui/options_ui.stkgui
@@ -1,53 +0,0 @@
-<stkgui>
-
-<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
-
-    <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
-    <spacer height="15" width="10"/>
-    
-    <tabs id="options_choice" height="10%" max_height="110" width="100%" align="center">
-        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
-        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
-        <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"
-                I18N="Section in the settings menu" text="User Interface"/>
-        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"/>
-        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"/>
-    </tabs>
-    
-    <box proportion="1" width="100%" layout="vertical-row">
-        
-        <spacer height="20" width="10"/>
-
-        <!-- ************ SKIN CHOICE ************ -->
-        <label I18N="In the graphics settings" text="Skin"/>
-        
-        <spinner id="skinchoice" width="30%"/>
-        
-        <spacer width="20" height="40" />
-        
-        <div width="75%" height="fit" layout="horizontal-row" >
-            <checkbox id="showfps"/>
-            <spacer width="20" height="100%" />
-            <label height="100%" I18N="In the ui settings" text="Display FPS"/>
-        </div>
-
-        <div width="75%" height="fit" layout="horizontal-row" >
-            <checkbox id="enable-internet"/>
-            <spacer width="20" height="100%" />
-            <label height="100%" I18N="In the ui settings" text="Internet STK news"/>
-        </div>
-
-        <div width="75%" height="fit" layout="horizontal-row" >
-            <checkbox id="minimal-racegui"/>
-            <spacer width="20" height="100%" />
-            <label height="100%" I18N="In the ui settings" text="Minimal Race GUI"/>
-        </div>
-
-        <spacer height="4" width="4"/>
-        
-    </box>
-</div>
-
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
-</stkgui>
--- a/data/gui/options_video.stkgui
+++ b/data/gui/options_video.stkgui
@@ -1,50 +1,55 @@
 <stkgui>

-<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
+<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >

-    <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
+    <header text_align="center" width="100%" text="SuperTuxKart Options"/>
    <spacer height="15" width="10"/>
    
    <tabs id="options_choice" height="10%" max_height="110" width="100%" align="center">
        <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
                I18N="Section in the settings menu" text="Graphics"/>
-        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
-        <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/>
-        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"/>
-        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"/>
+        <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                I18N="Section in the settings menu" text="Audio"/>
+        <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                I18N="Section in the settings menu" text="Players"/>
+        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                I18N="Section in the settings menu" text="Controls"/>
    </tabs>
    
    <box proportion="1" width="100%" layout="vertical-row">
        
        <spacer height="20" width="10"/>

-        <!-- ************ GRAPHICAL EFFECTS SETTINGS ************ -->
-        <div width="75%" height="50" layout="horizontal-row" >
-            <label I18N="In the graphics settings" text="Graphical Effects Level" align="center"/>
-            <spacer width="20" height="20"/>
-            <gauge id="gfx_level" min_value="1" max_value="5" width="300" />
+        <!-- FIXME don't hardcode height, should depend on text height -->
+        <div width="100%" proportion="2" layout="horizontal-row" >
+            
+            <!-- ************ SKIN CHOICE ************ -->
+            <div layout="vertical-row" proportion="2" height="100%">
+                <label width="100%" I18N="In the graphics settings" text="Skin"/>
+            
+                <!-- FIXME: don't hardcode size -->
+                <spinner id="skinchoice" width="300" height="50" />
+            </div>
+            
+            <!-- ************ GRAPHICAL EFFECTS SETTINGS ************ -->
+            <div layout="vertical-row" proportion="3" height="100%">
+                
+                <label width="100%" I18N="In the graphics settings" text="Graphical Effects Settings"/>
+                
+                <div width="100%" proportion="1" layout="horizontal-row" >
+                    <checkbox id="anim" width="40" height="40" />
+                    <spacer width="20" height="100%" />
+                    <label proportion="1" height="100%" I18N="In the video settings" text="Animated Karts"/>
+                </div>
+                
+                <div width="100%" proportion="1" layout="horizontal-row" >
+                    <checkbox id="gfx" width="40" height="40" />
+                    <spacer width="20" height="100%" />
+                    <label proportion="1" height="100%" I18N="In the video settings" text="Animated Effects and Scenery"/>
+                </div>
+            </div>
        </div>
        
-        <spacer height="10" width="10"/>
-        
-        <!-- ************ VSYNC ************ -->
-        <div width="75%" height="fit" layout="horizontal-row" >
-            <checkbox id="vsync"/>
-            <spacer width="20" height="100%" />
-            <label height="100%" I18N="In the video settings" text="Vertical Sync (requires restart)"/>
-        </div>
-        
-        <spacer height="5" width="10"/>
-        
-        <!-- ************ FBO ************ -->
-        <div width="75%" height="fit" layout="horizontal-row" >
-            <checkbox id="fbos"/>
-            <spacer width="20" height="100%" />
-            <label height="100%" I18N="In the video settings" text="Use Frame Buffer Objects (requires restart)"/>
-        </div>
-        
-        <spacer height="10" width="10"/>
-        
        <!-- ************ RESOLUTION CHOICE ************ -->
        <spacer height="10" width="10"/>
        <label width="100%" I18N="In the graphics settings" text="Resolution"/>
@@ -55,26 +60,27 @@
        
        <spacer height="10" width="10"/>
        
-        <div width="75%" height="fit" layout="horizontal-row" >
+        <!-- FIXME don't hardcode height, should depend on text height -->
+        <div width="75%" height="40" layout="horizontal-row" >
            <spacer width="40" height="100%" />
-            <checkbox id="fullscreen"/>
+            <checkbox id="fullscreen" width="40" height="40"/>
            <spacer width="20" height="100%" />
-            <label height="100%" I18N="In the video settings" text="Fullscreen"/>
+            <label proportion="1" height="100%" I18N="In the video settings" text="Fullscreen"/>
        </div>
        
        <spacer height="10" width="10"/>

-        <div width="100%" height="fit" layout="horizontal-row" >
-            <spacer width="40" height="100%" />
-            <button id="apply_resolution"
+        <button id="apply_resolution"
                I18N="In the video settings menu" text="Apply new resolution" />
-        </div>
        
        <spacer height="4" width="4"/>
        
    </box>
+    
+    <spacer width="50" height="10" /> 
+    <button id="back" x="20" width="250" align="left"
+            I18N="In the options menu, to go back to the main menu or game" text="Back"/>
+     
 </div>

-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
 </stkgui>
--- a/data/gui/package-featured.png
+++ b/data/gui/package-featured.png
--- a/data/gui/package-update.png
+++ b/data/gui/package-update.png
--- a/data/gui/package.png
+++ b/data/gui/package.png
--- a/data/gui/racesetup.stkgui
+++ b/data/gui/racesetup.stkgui
@@ -2,7 +2,7 @@

 <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >

-    <header width="80%" text="Race Setup" align="center" text_align="center" />
+    <header width="100%" text="Race Setup" align="center" text_align="center" />
    
    <spacer proportion="1" width="25"/>
    
@@ -33,9 +33,9 @@

    <scrollable_toolbar id="gamemode" height="135" width="85%" label_location="bottom" align="center"
                        child_width="135" child_height="135" />
-    <spacer proportion="1" width="25" />
+
+    
+    <spacer proportion="2" width="25"/>
 </div>

-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
 </stkgui>
--- a/data/gui/skins/Glass.stkskin
+++ b/data/gui/skins/Glass.stkskin
@@ -2,7 +2,6 @@

 Glass skin by Marianne Gagnon, released under creative-commons BY-SA 3.0+
 Except background.jpg, by elisee
-Except left_arrow, right_arrow and list_sort_up by Dakal

 To make your own skin, I suggest simply duplicating this file and modifying it as needed.
 There are two types of images : some will be simply stretched as a whole, others will
@@ -78,12 +77,12 @@ when the border that intersect at this corner are enabled.


 <element type="textbubble" state="neutral" image="glass/textbubble.png"
-      left_border="13" right_border="13" top_border="13" bottom_border="13"
-      hborder_out_portion="0.7" vborder_out_portion="0.3" />
+      left_border="28" right_border="28" top_border="28" bottom_border="28"
+      hborder_out_portion="0.1" vborder_out_portion="0.1" />

 <element type="textbubble" state="focused" image="glass/textbubble2.png"
-      left_border="13" right_border="13" top_border="13" bottom_border="13"
-      hborder_out_portion="0.7" vborder_out_portion="0.3" />
+      left_border="28" right_border="28" top_border="28" bottom_border="28"
+      hborder_out_portion="0.1" vborder_out_portion="0.1" />
      
 <element type="progress" state="fill" image="glass/glassprogress_fill.png"
      left_border="80" right_border="80" top_border="0" bottom_border="36"
@@ -156,6 +155,11 @@ when the border that intersect at this corner are enabled.
 <element type="listitem" state="focused" image="glass/glasssgauge_fill.png"
    left_border="0" right_border="0" top_border="0" bottom_border="0"
    hborder_out_portion="0.0" vborder_out_portion="0.0" />
+    
+<element type="listitem" state="down" image="glass/glassbutton.png"
+    left_border="80" right_border="80" top_border="0" bottom_border="36"
+    hborder_out_portion="1.0" vborder_out_portion="1.0"
+    areas="body" />

 <!-- Scrollbars. Background and thumb have no state (always neutral state).
     The buttons are the top and bottom arrows. Image must be top arrow, will
@@ -167,15 +171,6 @@ when the border that intersect at this corner are enabled.
 <element type="scrollbar_button"              image="glass/scrollbar_btn.png" />
 <element type="scrollbar_button" state="down" image="glass/scrollbar_btn_down.png" />

-<element type="left_arrow"  state="neutral"  image="glass/left_arrow.png" />
-<element type="right_arrow" state="neutral"  image="glass/right_arrow.png" />
-<element type="left_arrow"  state="focus"    image="glass/left_arrow_focus.png" />
-<element type="right_arrow" state="focus"    image="glass/right_arrow_focus.png" />
-
-<element type="list_header"  state="neutral" image="glass/table_header.png" />
-<element type="list_header"  state="down"    image="glass/table_header_down.png" />
-<element type="list_sort_up" state="neutral" image="glass/list_sort_up.png" />
-
 <!-- Stateless -->
 <element type="section" image="glass/glass_section.png"
      left_border="15" right_border="15" top_border="15" bottom_border="15"
@@ -190,12 +185,7 @@ when the border that intersect at this corner are enabled.
 <element type="window" image="glass/dialog.png"
      left_border="7" right_border="7" top_border="50" bottom_border="50"
      hborder_out_portion="1.0" vborder_out_portion="0.2" />
-
-<!-- Stateless -->
-<element type="tooltip" image="glass/tooltip.png"
-    left_border="10" right_border="10" top_border="10" bottom_border="10"
-    hborder_out_portion="1.0" vborder_out_portion="1.0" />
-    
+          
 <!--                   Colors                  -->
 <color type="text" state="neutral" r="0" g="0" b="0" />
 <color type="brighttext" state="neutral" r="255" g="145" b="0" />
--- a/data/gui/skins/Ocean.stkskin
+++ b/data/gui/skins/Ocean.stkskin
@@ -76,12 +76,12 @@ when the border that intersect at this corner are enabled.
 <!-- TODO : buttons could support 'pressed' state -->

 <element type="textbubble" state="neutral" image="ocean/textbubble.png"
-      left_border="13" right_border="13" top_border="13" bottom_border="13"
-      hborder_out_portion="0.7" vborder_out_portion="0.3" />
+      left_border="28" right_border="28" top_border="28" bottom_border="28"
+      hborder_out_portion="0.1" vborder_out_portion="0.1" />

 <element type="textbubble" state="focused" image="ocean/textbubble2.png"
-      left_border="13" right_border="13" top_border="13" bottom_border="13"
-      hborder_out_portion="0.7" vborder_out_portion="0.3" />
+      left_border="28" right_border="28" top_border="28" bottom_border="28"
+      hborder_out_portion="0.1" vborder_out_portion="0.1" />
      
 <element type="progress" state="fill" image="ocean/glasssgauge_fill.png"
      left_border="20" right_border="20" top_border="0" bottom_border="0"
@@ -149,13 +149,17 @@ when the border that intersect at this corner are enabled.

 <!-- Lists are always in neutral state for now -->
 <element type="list" image="ocean/glass_section.png"
-    left_border="15" right_border="15" top_border="7" bottom_border="7"
+    left_border="15" right_border="15" top_border="15" bottom_border="15"
    hborder_out_portion="0.5" vborder_out_portion="1.0" />
    
 <element type="listitem" state="focused" image="ocean/select.png"
    left_border="0" right_border="0" top_border="0" bottom_border="0"
    hborder_out_portion="0.0" vborder_out_portion="0.0" />
    
+<element type="listitem" state="down" image="ocean/glassbutton.png"
+    left_border="80" right_border="80" top_border="0" bottom_border="36"
+    hborder_out_portion="1.0" vborder_out_portion="1.0"
+    areas="body" />

 <!-- Scrollbars. Background and thumb have no state (always neutral state).
     The buttons are the top and bottom arrows. Image must be top arrow, will
@@ -167,15 +171,6 @@ when the border that intersect at this corner are enabled.
 <element type="scrollbar_button"              image="ocean/scrollbar_btn.png" />
 <element type="scrollbar_button" state="down" image="ocean/scrollbar_btn_down.png" />

-<element type="left_arrow"  state="neutral" image="ocean/left_arrow.png" />
-<element type="right_arrow" state="neutral" image="ocean/right_arrow.png" />
-<element type="left_arrow"  state="focus"   image="ocean/left_arrow_focus.png" />
-<element type="right_arrow" state="focus"   image="ocean/right_arrow_focus.png" />
-
-<element type="list_header"  state="neutral" image="ocean/table_header.png" />
-<element type="list_sort_up" state="neutral" image="ocean/list_sort_up.png" />
-<element type="list_header"  state="down"    image="ocean/table_header_down.png" />
-
 <!-- Stateless -->
 <element type="section" image="ocean/glass_section.png"
      left_border="15" right_border="15" top_border="15" bottom_border="15"
@@ -190,12 +185,7 @@ when the border that intersect at this corner are enabled.
 <element type="window" image="ocean/dialog.png"
      left_border="7" right_border="7" top_border="50" bottom_border="50"
      hborder_out_portion="1.0" vborder_out_portion="0.2" />
-
-<!-- Stateless -->
-<element type="tooltip" image="ocean/tooltip.png"
-    left_border="10" right_border="10" top_border="10" bottom_border="10"
-    hborder_out_portion="1.0" vborder_out_portion="1.0" />
-    
+          
 <!--                   Colors                  -->
 <color type="text" state="neutral" r="0" g="0" b="0" />
 <color type="brighttext" state="neutral" r="28" g="176" b="255" />
--- a/data/gui/skins/Peach.stkskin
+++ b/data/gui/skins/Peach.stkskin
@@ -76,12 +76,12 @@ when the border that intersect at this corner are enabled.
 <!-- TODO : buttons could support 'pressed' state -->

 <element type="textbubble" state="neutral" image="peach/textbubble.png"
-      left_border="13" right_border="13" top_border="13" bottom_border="13"
-      hborder_out_portion="0.7" vborder_out_portion="0.3" />
+      left_border="28" right_border="28" top_border="28" bottom_border="28"
+      hborder_out_portion="0.1" vborder_out_portion="0.1" />

 <element type="textbubble" state="focused" image="peach/textbubble2.png"
-      left_border="13" right_border="13" top_border="13" bottom_border="13"
-      hborder_out_portion="0.7" vborder_out_portion="0.3" />
+      left_border="28" right_border="28" top_border="28" bottom_border="28"
+      hborder_out_portion="0.1" vborder_out_portion="0.1" />

 <element type="progress" state="fill" image="peach/glasssgauge_fill.png"
      left_border="15" right_border="15" top_border="15" bottom_border="15"
@@ -149,13 +149,18 @@ when the border that intersect at this corner are enabled.

 <!-- Lists are always in neutral state for now -->
 <element type="list" image="peach/glass_section.png"
-    left_border="15" right_border="15" top_border="7" bottom_border="7"
+    left_border="15" right_border="15" top_border="15" bottom_border="15"
    hborder_out_portion="0.5" vborder_out_portion="1.0" />
    
 <element type="listitem" state="focused" image="peach/select.png"
    left_border="0" right_border="0" top_border="0" bottom_border="0"
    hborder_out_portion="0.0" vborder_out_portion="0.0" />
    
+<element type="listitem" state="down" image="peach/glassbutton.png"
+    left_border="80" right_border="80" top_border="0" bottom_border="36"
+    hborder_out_portion="1.0" vborder_out_portion="1.0"
+    areas="body" />
+
 <!-- Scrollbars. Background and thumb have no state (always neutral state).
     The buttons are the top and bottom arrows. Image must be top arrow, will
     be mirrorred for bottom. Buttons can be in neutral or down state.
@@ -166,15 +171,6 @@ when the border that intersect at this corner are enabled.
 <element type="scrollbar_button"              image="peach/scrollbar_btn.png" />
 <element type="scrollbar_button" state="down" image="peach/scrollbar_btn_down.png" />

-<element type="left_arrow"  state="neutral" image="peach/left_arrow.png" />
-<element type="right_arrow" state="neutral" image="peach/right_arrow.png" />
-<element type="left_arrow"  state="focus"   image="peach/left_arrow_focus.png" />
-<element type="right_arrow" state="focus"   image="peach/right_arrow_focus.png" />
-
-<element type="list_header"  state="neutral" image="peach/table_header.png" />
-<element type="list_sort_up" state="neutral" image="peach/list_sort_up.png" />
-<element type="list_header"  state="down"    image="peach/table_header_down.png" />
-
 <!-- Stateless -->
 <element type="section" image="peach/glass_section.png"
      left_border="15" right_border="15" top_border="15" bottom_border="15"
@@ -189,12 +185,7 @@ when the border that intersect at this corner are enabled.
 <element type="window" image="peach/dialog.png"
      left_border="7" right_border="7" top_border="50" bottom_border="50"
      hborder_out_portion="1.0" vborder_out_portion="0.2" />
-
-<!-- Stateless -->
-<element type="tooltip" image="peach/tooltip.png"
-    left_border="10" right_border="10" top_border="10" bottom_border="10"
-    hborder_out_portion="1.0" vborder_out_portion="1.0" />
-    
+          
 <!--                   Colors                  -->
 <color type="text" state="neutral" r="0" g="0" b="0" />
 <color type="brighttext" state="neutral" r="255" g="145" b="0" />
--- a/data/gui/skins/glass/left_arrow.png
+++ b/data/gui/skins/glass/left_arrow.png
--- a/data/gui/skins/glass/left_arrow_focus.png
+++ b/data/gui/skins/glass/left_arrow_focus.png
--- a/data/gui/skins/glass/list_sort_up.png
+++ b/data/gui/skins/glass/list_sort_up.png
--- a/data/gui/skins/glass/right_arrow.png
+++ b/data/gui/skins/glass/right_arrow.png
--- a/data/gui/skins/glass/right_arrow_focus.png
+++ b/data/gui/skins/glass/right_arrow_focus.png
--- a/Show More
+++ b/Show More