diff --git a/data/fonts/BigDigitFont.xml b/data/fonts/BigDigitFont.xml
old mode 100644
new mode 100755
index 41536824d..8ae41eeeb
Binary files a/data/fonts/BigDigitFont.xml and b/data/fonts/BigDigitFont.xml differ
diff --git a/data/fonts/sigmar0.png b/data/fonts/sigmar0.png
new file mode 100755
index 000000000..1b6939531
Binary files /dev/null and b/data/fonts/sigmar0.png differ
diff --git a/data/gfx/gfx_sparkFire_a.xml b/data/gfx/gfx_sparkFire_a.xml
new file mode 100644
index 000000000..af9f4d14d
--- /dev/null
+++ b/data/gfx/gfx_sparkFire_a.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="box" box_x="0.1" box_y="0.5" box_z="0.1">
+
+    <spreading angle="30"           />
+    
+    <velocity  x="-0.000"
+               y="0.002"
+               z="-0.000"             />
+    
+    <material  file="gfx_sparkFire_a.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="20"
+               max="50"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="3000"
+               max="3000"          />
+    
+    <!-- Size of the particles -->
+    <size      min="0.2"
+               max="0.3"          />
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+    <wind      speed="0.16"
+               flips="Y"           />
+
+</particles>
diff --git a/data/gui/addons_loading.stkgui b/data/gui/addons_loading.stkgui
index 66d721b87..98c4eb543 100644
--- a/data/gui/addons_loading.stkgui
+++ b/data/gui/addons_loading.stkgui
@@ -1,45 +1,45 @@
-<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="40%" 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="60%" height="50%" layout="vertical-row" >
-        <label id="name" width="100%" text_align="left"/>
-        <div width="100%" height="100%" layout="horizontal-row" >
-            <div width="50%" height="100%" layout="vertical-row" >
-                <label id="size"     width="100%" text=""/>
-                <label id="revision" width="100%" text=""/>
-            </div>
-            <div width="50%" height="32" layout="vertical-row" >
-                <ratingbar id="rating" height="64" width="100%" /> 
-            </div>
-        </div>
-        <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="5" align="center" />
-
-  <div width="80%" proportion="5" align="center">
-    <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
-        <icon-button id="install" width="128" height="128"
-                     icon="gui/package-update.png"
-                     I18N="Add-on screen action"  text="Install"/>
-        <icon-button id="uninstall" width="128" height="128"
-                     icon="gui/package-uninstall.png"
-                     I18N="Add-on screen action" text="Uninstall"/>
-        <icon-button id="back" width="128" height="128"
-                     icon="gui/back.png"
-                     I18N="Add-ons screen action" text="Back"/>
-    </buttonbar>
-    <progressbar id="progress" x="0" y="20%" width="100%" height="30%"  />
-  </div>
-</div>
-</stkgui>
+<?xml version="1.0" encoding="UTF-8"?>
+<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="40%" 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="60%" height="50%" layout="vertical-row" >
+            <label id="name" width="100%" text_align="left"/>
+            <div width="100%" height="100%" layout="horizontal-row" >
+                <div width="50%" height="100%" layout="vertical-row" >
+                    <label id="size"     width="100%" text=""/>
+                    <label id="revision" width="100%" text=""/>
+                </div>
+                <div width="50%" height="32" layout="vertical-row" >
+                    <ratingbar id="rating" height="64" width="100%" />
+                </div>
+            </div>
+            <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="5" align="center" />
+
+      <div width="80%" proportion="5" align="center">
+        <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
+            <icon-button id="install" width="128" height="128"
+                         icon="gui/package-update.png"
+                         I18N="Add-on screen action"  text="Install"/>
+            <icon-button id="uninstall" width="128" height="128"
+                         icon="gui/package-uninstall.png"
+                         I18N="Add-on screen action" text="Uninstall"/>
+            <icon-button id="back" width="128" height="128"
+                         icon="gui/back.png"
+                         I18N="Add-ons screen action" text="Back"/>
+        </buttonbar>
+        <progressbar id="progress" x="0" y="20%" width="100%" height="30%"  />
+      </div>
+    </div>
+</stkgui>
diff --git a/data/gui/addons_screen.stkgui b/data/gui/addons_screen.stkgui
index acec405f6..708f6bff9 100644
--- a/data/gui/addons_screen.stkgui
+++ b/data/gui/addons_screen.stkgui
@@ -1,40 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
 
-<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"/>
-        <icon-button id="reload"   height="90%" icon="gui/restart.png"/>
-    </div>
-    
-    <box id="filter_box" width="97%" height="75" layout="vertical-row" align="center">
-        <div x="0" y="0" width="98%" height="100%" layout="horizontal-row" align="center">
-            <textbox id="filter_name" proportion="7" align="center" />
-            <spacer width="10" />
-            <label text="Updated" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently updated items"/>
-            <spinner id="filter_date" proportion="8" align="center" min_value="0" wrap_around="true"/>
-            <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating"/>
-            <spinner id="filter_rating" proportion="3" align="center" min_value="0" wrap_around="true"/>
-            <icon-button id="filter_search" height="100%" icon="gui/search.png"/>
+        <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"/>
+            <icon-button id="reload"   height="90%" icon="gui/restart.png"/>
         </div>
-    </box>
-    
-    <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"/>
-        <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
-                I18N="Section in the addons menu" text="Arenas"/>
-    </tabs>
+        <box id="filter_box" width="97%" height="75" layout="vertical-row" align="center">
+            <div x="0" y="0" width="98%" height="100%" layout="horizontal-row" align="center">
+                <textbox id="filter_name" proportion="7" align="center" />
+                <spacer width="10" />
+                <label text="Updated" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently updated items"/>
+                <spinner id="filter_date" proportion="8" align="center" min_value="0" wrap_around="true"/>
+                <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating"/>
+                <spinner id="filter_rating" proportion="3" align="center" min_value="0" wrap_around="true"/>
+                <icon-button id="filter_search" height="100%" icon="gui/search.png"/>
+            </div>
+        </box>
 
-    <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
-        <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
-    </box>
-       
-</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"/>
+            <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
+                    I18N="Section in the addons menu" text="Arenas"/>
+        </tabs>
+
+        <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
+            <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
+        </box>
+
+    </div>
 </stkgui>
diff --git a/data/gui/arenas.stkgui b/data/gui/arenas.stkgui
index 74fd7ff20..174bf2d2b 100644
--- a/data/gui/arenas.stkgui
+++ b/data/gui/arenas.stkgui
@@ -1,28 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-<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" >
 
-<div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
+        <header width="80%" I18N="Section in arena tracks selection screen" text="Arenas"
+                align="center" text_align="center" />
 
-    <header width="80%" 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" padding="2">
-        <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true" 
-            label_location="bottom" align="center" child_width="160" child_height="120" />
-        <spacer width="20" height="13" />
-    </box>
+        <spacer width="20" height="5" />
 
-    <tabs width="100%" height="25" id="trackgroups">
-        <button id="standard" I18N="track group" text="Standard"/>
-        <button id="addons" I18N="track group" text="Add-Ons"/>
-        <button id="all" I18N="track group" text="All"/>
-    </tabs>
+        <box proportion="1" width="100%" layout="vertical-row" padding="2">
+            <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
+                label_location="bottom" align="center" child_width="160" child_height="120" />
+            <spacer width="20" height="13" />
+        </box>
 
-    <spacer width="20" height="3%" />
-    
-</div>
+        <tabs width="100%" height="25" id="trackgroups">
+            <button id="standard" I18N="track group" text="Standard"/>
+            <button id="addons" I18N="track group" text="Add-Ons"/>
+            <button id="all" I18N="track group" text="All"/>
+        </tabs>
 
-</stkgui>
\ No newline at end of file
+        <spacer width="20" height="3%" />
+
+    </div>
+</stkgui>
diff --git a/data/gui/challenges.stkgui b/data/gui/challenges.stkgui
index a006bb26d..a109ad5a8 100644
--- a/data/gui/challenges.stkgui
+++ b/data/gui/challenges.stkgui
@@ -1,20 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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%" />
-        
+
         <spacer height="5" width="100%"/>
-        
+
         <box width="100%" proportion="5" layout="vertical-row">
-        
+
             <ribbon_grid id="challenges" proportion="8" width="100%"
                 label_location="bottom" align="center" child_width="128" child_height="128" />
-            
-   
+
+
             <spacer proportion="1" width="100%"/>
         </box>
     </div>
-</stkgui>
\ No newline at end of file
+</stkgui>
diff --git a/data/gui/confirm_dialog.stkgui b/data/gui/confirm_dialog.stkgui
index ecf5f40bf..b1f57e61d 100644
--- a/data/gui/confirm_dialog.stkgui
+++ b/data/gui/confirm_dialog.stkgui
@@ -1,19 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />
 
-<div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        <spacer height="25" width="10" />
 
-    <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />
+        <button id="confirm" I18N="In a 'are you sure?' dialog" text="Yes" align="center"/>
 
-    <spacer height="25" width="10" />
+        <spacer height="15" width="10" />
 
-    <button id="confirm" I18N="In a 'are you sure?' dialog" text="Yes" align="center"/>
-    
-    <spacer height="15" width="10" />
-    
-    <button id="cancel" I18N="In a 'are you sure?' dialog" text="Cancel" align="center"/>
-
-    <spacer height="10" width="10" />
-    
-</div>
+        <button id="cancel" I18N="In a 'are you sure?' dialog" text="Cancel" align="center"/>
 
+        <spacer height="10" width="10" />
+    </div>
 </stkgui>
diff --git a/data/gui/confirm_resolution_dialog.stkgui b/data/gui/confirm_resolution_dialog.stkgui
index 988680b42..f0fdf2d15 100644
--- a/data/gui/confirm_resolution_dialog.stkgui
+++ b/data/gui/confirm_resolution_dialog.stkgui
@@ -1,21 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />
 
-<div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        <spacer height="25" width="10" />
 
-    <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />
+        <button id="accept" I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton"
+                text="Keep this resolution" align="center"/>
 
-    <spacer height="25" width="10" />
+        <spacer height="15" width="10" />
 
-    <button id="accept" I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton"
-            text="Keep this resolution" align="center"/>
-    
-    <spacer height="15" width="10" />
-    
-    <button id="cancel" I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton"
-            text="Cancel" align="center"/>
-
-    <spacer height="10" width="10" />
-    
-</div>
+        <button id="cancel" I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton"
+                text="Cancel" align="center"/>
 
+        <spacer height="10" width="10" />
+    </div>
 </stkgui>
diff --git a/data/gui/credits.stkgui b/data/gui/credits.stkgui
index 0c1afd656..988f09c14 100644
--- a/data/gui/credits.stkgui
+++ b/data/gui/credits.stkgui
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
     <div x="2%" y="2%" width="98%" height="96%" layout="vertical-row" >
-    
+
         <icon id="logo" align="center" proportion="4" width="100%" icon="gui/logo_slim.png"/>
-        
+
         <header I18N="Title in credits screen" text="Credits" width="100%" />
-        
+
         <box id="animated_area" width="100%" proportion="10" padding="0">
-        
         </box>
-
     </div>
-
-</stkgui>
\ No newline at end of file
+</stkgui>
diff --git a/data/gui/custom_video_settings.stkgui b/data/gui/custom_video_settings.stkgui
index 2a5a4ecee..2942c4312 100644
--- a/data/gui/custom_video_settings.stkgui
+++ b/data/gui/custom_video_settings.stkgui
@@ -1,190 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
+        <header id="title" width="100%" height="fit" text_align="center" word_wrap="true" text="Graphics Settings" />
 
-<div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
+        <spacer height="20" width="10" />
 
-    <header id="title" width="100%" height="fit" text_align="center" word_wrap="true" text="Graphics Settings" />
-
-    <spacer height="20" width="10" />
-
-    <!--
-    <div layout="horizontal-row" width="100%" height="fit">
-        <checkbox id="pixelshaders"/>
-        <spacer width="10" height="10"/>
-        <label text="Pixel Shaders" I18N="Video settings"/>
-    </div>
-
-    <spacer height="4" width="10" />
-    -->
-    
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <checkbox id="dynamiclight"/>
-        <spacer width="10" height="10"/>
-        <label text="Advanced pipeline (lights, etc.)" I18N="Video settings"/>
-    </div>
-    
-    <spacer height="4" width="10" />
-
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <spacer width="70" height="10" />
-        <label text="Shadows" I18N="Video settings"/>
-        <spacer width="10" height="10"/>
-        <gauge id="shadows" min_value="0" max_value="2" width="50%"/>
-    </div>
-    
-    <spacer height="4" width="10" />
-
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <spacer width="70" height="10"/>
-        
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="bloom"/>
-            <spacer width="10" height="10"/>
-            <label text="Bloom" I18N="Video settings"/>
-        </div>
-        
-        <spacer height="4" width="10" />
-        
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="lightshaft"/>
-            <spacer width="10" height="10"/>
-            <label text="Light shaft (God rays)" I18N="Video settings"/>
-        </div>
-    </div>
-    
-    <spacer height="4" width="10" />
-    
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <spacer width="70" height="10"/>
-        
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="ssao"/>
-            <spacer width="10" height="10"/>
-            <label text="Ambient Occlusion" I18N="Video settings"/>
-        </div>
-        
-        <spacer height="4" width="10" />
-        
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="global_illumination"/>
-            <spacer width="10" height="10"/>
-            <label text="Global illumination" I18N="Video settings"/>
-        </div>
-    </div>
-    
-    <spacer height="20" width="10" />
-    
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="motionblur"/>
-            <spacer width="10" height="10"/>
-            <label text="Motion blur" I18N="Video settings"/>
-        </div>
-        
-        <spacer height="4" width="10" />
-        
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="texture_compression"/>
-            <spacer width="10" height="10"/>
-            <label text="Texture compression" I18N="Video settings"/>
-        </div>
-    </div>
-    
-    <spacer height="4" width="10" />
-
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="glow"/>
-            <spacer width="10" height="10"/>
-            <label text="Glow (outlines)" I18N="Video settings"/>
-        </div>
-        
-        <spacer height="4" width="10" />
-
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="mlaa"/>
-            <spacer width="10" height="10"/>
-            <label text="Anti-aliasing" I18N="Video settings"/>
-        </div>
-    </div>
-    
-    <spacer height="4" width="10" />
-    
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="weather_gfx"/>
-            <spacer width="10" height="10"/>
-            <label text="Weather Effects" I18N="Video settings"/>
-        </div>
-        
-        <spacer height="4" width="10" />
-
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="anim_gfx"/>
-            <spacer width="10" height="10"/>
-            <label text="Animated Scenery" I18N="Video settings"/>
-        </div>
-    </div>
-    
-    <spacer height="4" width="10" />
-    
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="ubo"/>
-            <spacer width="10" height="10"/>
-            <label text="Uniform buffer objects" I18N="Video settings"/>
-        </div>
-        
-        <spacer height="4" width="10" />
-        
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="dof"/>
-            <spacer width="10" height="10"/>
-            <label text="Depth of field" I18N="Video settings"/>
-        </div>
-    </div>
-	
-    <spacer height="4" width="10" />
-    
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="hd-textures"/>
-            <spacer width="10" height="10"/>
-            <label text="Use high definition textures" I18N="Video settings"/>
-        </div>
-        
-        <spacer height="4" width="10" />
         <!--
-        <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="anim_gfx"/>
+        <div layout="horizontal-row" width="100%" height="fit">
+            <checkbox id="pixelshaders"/>
             <spacer width="10" height="10"/>
-            <label text="Animated Scenery" I18N="Video settings"/>
+            <label text="Pixel Shaders" I18N="Video settings"/>
         </div>
+
+        <spacer height="4" width="10" />
         -->
-    </div>
-    
-    <spacer height="20" width="10" />
-    
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <label text="Animated Characters" I18N="Video settings" width="40%"/>
-        <spacer width="10" height="10"/>
-        <gauge id="steering_animations" min_value="0" max_value="2" width="50%" />
-    </div>
-    
-    <spacer height="4" width="10" />
-    
-    <div layout="horizontal-row" width="100%" proportion="1">
-        <label text="Texture filtering" I18N="Video settings" width="40%"/>
-        <spacer width="10" height="10"/>
-        <gauge id="filtering" min_value="0" max_value="5" width="50%" />
-    </div>
-    
-    <spacer height="10" width="10" />
 
-    <label text="* Restart STK to apply new settings" width="100%" text_align="center" I18N="Video settings"/>
-    
-    <spacer proportion="1"/>
-    
-    <button id="close" text="Apply" align="center"/>
-</div>
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <checkbox id="dynamiclight"/>
+            <spacer width="10" height="10"/>
+            <label text="Advanced pipeline (lights, etc.)" I18N="Video settings"/>
+        </div>
 
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <spacer width="70" height="10" />
+            <label text="Shadows" I18N="Video settings"/>
+            <spacer width="10" height="10"/>
+            <gauge id="shadows" min_value="0" max_value="2" width="50%"/>
+        </div>
+
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <spacer width="70" height="10"/>
+
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="bloom"/>
+                <spacer width="10" height="10"/>
+                <label text="Bloom" I18N="Video settings"/>
+            </div>
+
+            <spacer height="4" width="10" />
+
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="lightshaft"/>
+                <spacer width="10" height="10"/>
+                <label text="Light shaft (God rays)" I18N="Video settings"/>
+            </div>
+        </div>
+
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <spacer width="70" height="10"/>
+
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="ssao"/>
+                <spacer width="10" height="10"/>
+                <label text="Ambient Occlusion" I18N="Video settings"/>
+            </div>
+
+            <spacer height="4" width="10" />
+
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="global_illumination"/>
+                <spacer width="10" height="10"/>
+                <label text="Global illumination" I18N="Video settings"/>
+            </div>
+        </div>
+
+        <spacer height="20" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="motionblur"/>
+                <spacer width="10" height="10"/>
+                <label text="Motion blur" I18N="Video settings"/>
+            </div>
+
+            <spacer height="4" width="10" />
+
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="texture_compression"/>
+                <spacer width="10" height="10"/>
+                <label text="Texture compression" I18N="Video settings"/>
+            </div>
+        </div>
+
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="glow"/>
+                <spacer width="10" height="10"/>
+                <label text="Glow (outlines)" I18N="Video settings"/>
+            </div>
+
+            <spacer height="4" width="10" />
+
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="mlaa"/>
+                <spacer width="10" height="10"/>
+                <label text="Anti-aliasing" I18N="Video settings"/>
+            </div>
+        </div>
+
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="weather_gfx"/>
+                <spacer width="10" height="10"/>
+                <label text="Weather Effects" I18N="Video settings"/>
+            </div>
+
+            <spacer height="4" width="10" />
+
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="anim_gfx"/>
+                <spacer width="10" height="10"/>
+                <label text="Animated Scenery" I18N="Video settings"/>
+            </div>
+        </div>
+
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="ubo"/>
+                <spacer width="10" height="10"/>
+                <label text="Uniform buffer objects" I18N="Video settings"/>
+            </div>
+
+            <spacer height="4" width="10" />
+
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="dof"/>
+                <spacer width="10" height="10"/>
+                <label text="Depth of field" I18N="Video settings"/>
+            </div>
+        </div>
+
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="hd-textures"/>
+                <spacer width="10" height="10"/>
+                <label text="Use high definition textures" I18N="Video settings"/>
+            </div>
+
+            <spacer height="4" width="10" />
+            <!--
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="anim_gfx"/>
+                <spacer width="10" height="10"/>
+                <label text="Animated Scenery" I18N="Video settings"/>
+            </div>
+            -->
+        </div>
+
+        <spacer height="20" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <label text="Animated Characters" I18N="Video settings" width="40%"/>
+            <spacer width="10" height="10"/>
+            <gauge id="steering_animations" min_value="0" max_value="2" width="50%" />
+        </div>
+
+        <spacer height="4" width="10" />
+
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <label text="Texture filtering" I18N="Video settings" width="40%"/>
+            <spacer width="10" height="10"/>
+            <gauge id="filtering" min_value="0" max_value="5" width="50%" />
+        </div>
+
+        <spacer height="10" width="10" />
+
+        <label text="* Restart STK to apply new settings" width="100%" text_align="center" I18N="Video settings"/>
+
+        <spacer proportion="1"/>
+
+        <button id="close" text="Apply" align="center"/>
+    </div>
 </stkgui>
diff --git a/data/gui/debug_slider.stkgui b/data/gui/debug_slider.stkgui
index c4d25a954..2fb46728a 100644
--- a/data/gui/debug_slider.stkgui
+++ b/data/gui/debug_slider.stkgui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
         <label id="title" width="100%"/>
diff --git a/data/gui/easter_egg.stkgui b/data/gui/easter_egg.stkgui
index d14583978..348cce76c 100644
--- a/data/gui/easter_egg.stkgui
+++ b/data/gui/easter_egg.stkgui
@@ -1,28 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-<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" >
 
-<div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
+        <header width="80%" I18N="Section in easter egg tracks selection screen" text="All Tracks"
+                align="center" text_align="center" />
 
-    <header width="80%" I18N="Section in easter egg tracks selection screen" text="All Tracks"
-            align="center" text_align="center" />
-    
-    <spacer width="20" height="5" />
-    
-    <box proportion="1" width="100%" layout="vertical-row" padding="2">
-        <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true" 
-            label_location="bottom" align="center" child_width="160" child_height="120" />
-        <spacer width="20" height="13" />
-    </box>
+        <spacer width="20" height="5" />
 
-    <tabs width="100%" height="25" id="trackgroups">
-        <button id="standard" I18N="track group" text="Standard"/>
-        <button id="addons" I18N="track group" text="Add-Ons"/>
-        <button id="all" I18N="track group" text="All"/>
-    </tabs>
+        <box proportion="1" width="100%" layout="vertical-row" padding="2">
+            <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
+                label_location="bottom" align="center" child_width="160" child_height="120" />
+            <spacer width="20" height="13" />
+        </box>
 
-    <spacer width="20" height="3%" />
-    
-</div>
+        <tabs width="100%" height="25" id="trackgroups">
+            <button id="standard" I18N="track group" text="Standard"/>
+            <button id="addons" I18N="track group" text="Add-Ons"/>
+            <button id="all" I18N="track group" text="All"/>
+        </tabs>
 
+        <spacer width="20" height="3%" />
+
+    </div>
 </stkgui>
diff --git a/data/gui/edit_track.stkgui b/data/gui/edit_track.stkgui
index 41c8800b6..14cbf01b0 100644
--- a/data/gui/edit_track.stkgui
+++ b/data/gui/edit_track.stkgui
@@ -1,54 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" padding="10">
 
-<div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" padding="10">
+        <header id="selected_track" width="80%" height="30"
+            I18N="No neeed to translate this, it will be overwritten by the track name"
+            text="" align="center" text_align="center" />
 
-    <header id="selected_track" width="80%" height="30"
-        I18N="No neeed to translate this, it will be overwritten by the track name"
-        text="" align="center" text_align="center" />
+        <spacer height="20" />
 
-    <spacer height="20" />
+        <!-- Track selection -->
+        <box width="100%" height="60%" layout="vertical-row">
+            <ribbon_grid id="tracks" proportion="1" width="100%" height="100%" square_items="true"
+                label_location="each" align="center" child_width="240" child_height="160" />
+        </box>
 
-    <!-- Track selection -->
-    <box width="100%" height="60%" layout="vertical-row">
-        <ribbon_grid id="tracks" proportion="1" width="100%" height="100%" square_items="true"
-            label_location="each" align="center" child_width="240" child_height="160" />
-    </box>
+        <!-- Populated dynamically at runtime -->
+        <tabs width="100%" height="30" id="trackgroups"> </tabs>
 
-    <!-- Populated dynamically at runtime -->
-    <tabs width="100%" height="30" id="trackgroups"> </tabs>
+        <spacer height="50" />
 
-    <spacer height="50" />
+        <!-- Laps and reverse -->
+        <div width="100%" height="100" layout="horizontal-row" align="center">
 
-    <!-- Laps and reverse -->
-    <div width="100%" height="100" layout="horizontal-row" align="center">
+            <spacer proportion="1" />
 
-        <spacer proportion="1" />
+            <label id="laps_label" text_align="left"
+                I18N="In the edit track screen" text="Number of laps:" />
+            <spacer width="20" />
+            <spinner id="laps" proportion="1" width="100" min_value="1"
+                max_value="99" wrap_around="false" />
 
-        <label id="laps_label" text_align="left"
-            I18N="In the edit track screen" text="Number of laps:" />
-        <spacer width="20" />
-        <spinner id="laps" proportion="1" width="100" min_value="1"
-            max_value="99" wrap_around="false" />
+            <spacer proportion="1" />
 
-        <spacer proportion="1" />
+            <label id="reverse_label" text_align="left"
+                I18N="In the edit track screen" text="Reverse:" />
+            <spacer width="20" />
+            <checkbox id="reverse" />
 
-        <label id="reverse_label" text_align="left"
-            I18N="In the edit track screen" text="Reverse:" />
-        <spacer width="20" />
-        <checkbox id="reverse" />
+            <spacer proportion="1" />
+        </div>
+
+        <!-- Dialog buttons -->
+        <div width="100%" height="60" layout="horizontal-row">
+            <spacer proportion="2" />
+            <button id="ok" text="OK" proportion="1" />
+            <spacer proportion="1" />
+            <button id="cancel" text="Cancel" proportion="1" />
+            <spacer proportion="2" />
+        </div>
 
-        <spacer proportion="1" />
     </div>
-
-    <!-- Dialog buttons -->
-    <div width="100%" height="60" layout="horizontal-row">
-        <spacer proportion="2" />
-        <button id="ok" text="OK" proportion="1" />
-        <spacer proportion="1" />
-        <button id="cancel" text="Cancel" proportion="1" />
-        <spacer proportion="2" />
-    </div>
-
-</div>
-
-</stkgui>
\ No newline at end of file
+</stkgui>
diff --git a/data/gui/enter_gp_name_dialog.stkgui b/data/gui/enter_gp_name_dialog.stkgui
index 0c69499b2..2508f6565 100644
--- a/data/gui/enter_gp_name_dialog.stkgui
+++ b/data/gui/enter_gp_name_dialog.stkgui
@@ -1,21 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
 
-<div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        <label id="title" width="100%" text_align="center" word_wrap="true"
+               I18N="In the 'add new grand prix' dialog"
+               text="Please enter the name of the grand prix" proportion="1" />
 
-    <label id="title" width="100%" text_align="center" word_wrap="true"
-           I18N="In the 'add new grand prix' dialog"
-           text="Please enter the name of the grand prix" proportion="1" />
+        <spacer height="25" width="10" />
 
-    <spacer height="25" width="10" />
+        <textbox id="textfield" width="75%" I18N="In the 'add new grand prix' dialog" align="center"/>
 
-    <textbox id="textfield" width="75%" I18N="In the 'add new grand prix' dialog" align="center"/>
+        <spacer height="20" width="20" />
 
-    <spacer height="20" width="20" />
+        <button id="cancel" I18N="When configuring input" text="Press ESC to cancel" align="center"/>
 
-    <button id="cancel" I18N="When configuring input" text="Press ESC to cancel" align="center"/>
+        <spacer height="15" width="20" />
 
-    <spacer height="15" width="20" />
-
-</div>
-
-</stkgui>
\ No newline at end of file
+    </div>
+</stkgui>
diff --git a/data/gui/enter_player_name_dialog.stkgui b/data/gui/enter_player_name_dialog.stkgui
index e8385bf25..4c0f9f013 100644
--- a/data/gui/enter_player_name_dialog.stkgui
+++ b/data/gui/enter_player_name_dialog.stkgui
@@ -1,22 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
 
-<div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        <label id="title" width="100%" text_align="center" word_wrap="true"
+               I18N="In the 'add new player' dialog" text="Enter the new player's name" proportion="1" />
 
-    <label id="title" width="100%" text_align="center" word_wrap="true"
-           I18N="In the 'add new player' dialog" text="Enter the new player's name" proportion="1" />
+        <spacer height="25" width="10" />
 
-    <spacer height="25" width="10" />
-    
-    <textbox id="textfield" width="75%" I18N="In the 'add new player' dialog" align="center"/>
+        <textbox id="textfield" width="75%" I18N="In the 'add new player' dialog" align="center"/>
 
-    <spacer height="20" width="20" />
-    
-    <buttonbar proportion="1" id="options" width="100%" height="100%">
-        <button id="ok"     I18N="When configuring input" text="OK" align="center"/>
-        <button id="cancel" I18N="When configuring input" text="Cancel" align="center"/>
-    </buttonbar>
-    <spacer height="15" width="20" />
+        <spacer height="20" width="20" />
 
-</div>
+        <buttonbar proportion="1" id="options" width="100%" height="100%">
+            <button id="ok"     I18N="When configuring input" text="OK" align="center"/>
+            <button id="cancel" I18N="When configuring input" text="Cancel" align="center"/>
+        </buttonbar>
+        <spacer height="15" width="20" />
 
+    </div>
 </stkgui>
diff --git a/data/gui/feature_unlocked.stkgui b/data/gui/feature_unlocked.stkgui
index 5cdb9dc30..743196dae 100644
--- a/data/gui/feature_unlocked.stkgui
+++ b/data/gui/feature_unlocked.stkgui
@@ -1,11 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-
         <spacer width="10" proportion="1"/>
-        
         <button id="continue" x="20" width="250" align="left" text="Continue"/>
-
     </div>
-
-</stkgui>
\ No newline at end of file
+</stkgui>
diff --git a/data/gui/gpedit.stkgui b/data/gui/gpedit.stkgui
index 890e5e300..d3ded67b2 100644
--- a/data/gui/gpedit.stkgui
+++ b/data/gui/gpedit.stkgui
@@ -1,35 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png" />
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png" />
+    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row">
 
-<div x="2%" y="1%" width="96%" height="98%" layout="vertical-row">
+        <header id="title" width="80%" I18N="Title in edit grand prix screen"
+            text="Edit Grand Prix" align="center" text_align="center" />
 
-    <header id="title" width="80%" I18N="Title in edit grand prix screen"
-        text="Edit Grand Prix" align="center" text_align="center" />
+        <spacer width="100%" height="2%" />
 
-    <spacer width="100%" height="2%" />
+        <box proportion="5" width="98%" align="center" layout="vertical-row" padding="6">
+            <list id="tracks" x="0" y="0" width="100%" height="100%" keep_selection="true" />
+        </box>
 
-    <box proportion="5" width="98%" align="center" layout="vertical-row" padding="6">
-        <list id="tracks" x="0" y="0" width="100%" height="100%" keep_selection="true" />
-    </box>
+        <spacer width="100%" height="2%" />
 
-    <spacer width="100%" height="2%" />
-
-    <buttonbar proportion="1" id="menu" height="135" width="100%" align="center">
-        <icon-button id="up" width="128" height="128" icon="gui/up.png"
-            I18N="Menu item" text="Move up" />
-        <icon-button id="down" width="128" height="128" icon="gui/down.png"
-            I18N="Menu item" text="Move down" />
-        <icon-button id="add" width="128" height="128" icon="gui/gp_add_track.png"
-            I18N="Menu item" text="Add" />
-        <icon-button id="edit" width="128" height="128" icon="gui/gp_edit_track.png"
-            I18N="Menu item" text="Edit" />
-        <icon-button id="remove" width="128" height="128" icon="gui/gp_remove_track.png"
-            I18N="Menu item" text="Remove" />
-        <icon-button id="save" width="128" height="128" icon="gui/gp_save.png"
-            I18N="Menu item" text="Save" />
-    </buttonbar>
-
-</div>
-
-</stkgui>
\ No newline at end of file
+        <buttonbar proportion="1" id="menu" height="135" width="100%" align="center">
+            <icon-button id="up" width="128" height="128" icon="gui/up.png"
+                I18N="Menu item" text="Move up" />
+            <icon-button id="down" width="128" height="128" icon="gui/down.png"
+                I18N="Menu item" text="Move down" />
+            <icon-button id="add" width="128" height="128" icon="gui/gp_add_track.png"
+                I18N="Menu item" text="Add" />
+            <icon-button id="edit" width="128" height="128" icon="gui/gp_edit_track.png"
+                I18N="Menu item" text="Edit" />
+            <icon-button id="remove" width="128" height="128" icon="gui/gp_remove_track.png"
+                I18N="Menu item" text="Remove" />
+            <icon-button id="save" width="128" height="128" icon="gui/gp_save.png"
+                I18N="Menu item" text="Save" />
+        </buttonbar>
+    </div>
+</stkgui>
diff --git a/data/gui/gpeditor.stkgui b/data/gui/gpeditor.stkgui
index c830525a5..06d78e572 100644
--- a/data/gui/gpeditor.stkgui
+++ b/data/gui/gpeditor.stkgui
@@ -1,45 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
 
-<div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
+        <header width="80%" I18N="Title in grand prix editor screen" text="Grand Prix editor"
+                align="center" text_align="center" />
 
-    <header width="80%" I18N="Title in grand prix editor screen" text="Grand Prix editor"
-            align="center" text_align="center" />
+        <spacer height="20" />
 
-    <spacer height="20" />
+        <box proportion="4" width="100%" layout="vertical-row">
+            <ribbon_grid id="gplist" proportion="1" width="100%" square_items="true"
+                label_location="each" align="left" max_rows="2" child_width="160"
+                child_height="120" keep_selection="true" />
+        </box>
 
-    <box proportion="4" width="100%" layout="vertical-row">
-        <ribbon_grid id="gplist" proportion="1" width="100%" square_items="true"
-            label_location="each" align="left" max_rows="2" child_width="160"
-            child_height="120" keep_selection="true" />
-    </box>
+        <spacer height="10" />
 
-    <spacer height="10" />
+        <box proportion="2" width="100%" layout="vertical-row">
+            <label id="gpname" text_align="center" width="100%"
+                I18N="In the grand prix editor screen" text="" />
+            <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
+                label_location="each" align="left" max_rows="1"
+                child_width="160" child_height="120" />
+        </box>
 
-    <box proportion="2" width="100%" layout="vertical-row">
-        <label id="gpname" text_align="center" width="100%"
-            I18N="In the grand prix editor screen" text="" />
-        <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
-            label_location="each" align="left" max_rows="1"
-            child_width="160" child_height="120" />
-    </box>
+        <spacer height="20" />
 
-    <spacer height="20" />
+        <buttonbar proportion="1" id="menu" height="135" width="100%" align="center">
+            <icon-button id="new" width="128" height="128" icon="gui/gp_new.png"
+                I18N="Menu item" text="New" />
+            <icon-button id="copy" width="128" height="128" icon="gui/gp_copy.png"
+                I18N="Menu item" text="Copy" />
+            <icon-button id="edit" width="128" height="128" icon="gui/gp_edit.png"
+                I18N="Menu item" text="Edit" />
+            <icon-button id="remove" width="128" height="128" icon="gui/gp_remove.png"
+                I18N="Menu item" text="Remove" />
+            <icon-button id="rename" width="128" height="128" icon="gui/gp_rename.png"
+                I18N="Menu item" text="Rename" />
+        </buttonbar>
 
-    <buttonbar proportion="1" id="menu" height="135" width="100%" align="center">
-        <icon-button id="new" width="128" height="128" icon="gui/gp_new.png"
-            I18N="Menu item" text="New" />
-        <icon-button id="copy" width="128" height="128" icon="gui/gp_copy.png"
-            I18N="Menu item" text="Copy" />
-        <icon-button id="edit" width="128" height="128" icon="gui/gp_edit.png"
-            I18N="Menu item" text="Edit" />
-        <icon-button id="remove" width="128" height="128" icon="gui/gp_remove.png"
-            I18N="Menu item" text="Remove" />
-        <icon-button id="rename" width="128" height="128" icon="gui/gp_rename.png"
-            I18N="Menu item" text="Rename" />
-    </buttonbar>
-
-</div>
-
-</stkgui>
\ No newline at end of file
+    </div>
+</stkgui>
diff --git a/data/gui/grand_prix_lose.stkgui b/data/gui/grand_prix_lose.stkgui
index 9bc0fd5c9..743196dae 100644
--- a/data/gui/grand_prix_lose.stkgui
+++ b/data/gui/grand_prix_lose.stkgui
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
         <spacer width="10" proportion="1"/>
         <button id="continue" x="20" width="250" align="left" text="Continue"/>
     </div>
-</stkgui>
\ No newline at end of file
+</stkgui>
diff --git a/data/gui/grand_prix_win.stkgui b/data/gui/grand_prix_win.stkgui
index 9bc0fd5c9..743196dae 100644
--- a/data/gui/grand_prix_win.stkgui
+++ b/data/gui/grand_prix_win.stkgui
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
         <spacer width="10" proportion="1"/>
         <button id="continue" x="20" width="250" align="left" text="Continue"/>
     </div>
-</stkgui>
\ No newline at end of file
+</stkgui>
diff --git a/data/gui/help1.stkgui b/data/gui/help1.stkgui
index 46ee75fac..3b9be504b 100644
Binary files a/data/gui/help1.stkgui and b/data/gui/help1.stkgui differ
diff --git a/data/gui/help2.stkgui b/data/gui/help2.stkgui
index 26a390bcb..4eff122aa 100644
Binary files a/data/gui/help2.stkgui and b/data/gui/help2.stkgui differ
diff --git a/data/gui/help3.stkgui b/data/gui/help3.stkgui
index 4b5c30c84..cda9a7991 100644
Binary files a/data/gui/help3.stkgui and b/data/gui/help3.stkgui differ
diff --git a/data/gui/help4.stkgui b/data/gui/help4.stkgui
index 01785f3ad..cb0c50daf 100644
Binary files a/data/gui/help4.stkgui and b/data/gui/help4.stkgui differ
diff --git a/data/gui/karts.stkgui b/data/gui/karts.stkgui
index 0fc910355..03c349e27 100644
--- a/data/gui/karts.stkgui
+++ b/data/gui/karts.stkgui
@@ -1,29 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="99%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="99%" layout="vertical-row" >
+        <header width="80%"
+               I18N="In the kart selection (player setup) screen"
+               text="Choose a Kart"
+               align="center" text_align="center" />
 
-    <header width="80%"
-           I18N="In the kart selection (player setup) screen"
-           text="Choose a Kart"
-           align="center" text_align="center" />
-      
-    <placeholder id="playerskarts" width="100%" align="center" proportion="4">
-        <!-- Contents is added programatically -->
-    </placeholder>
-    
-    <spacer height="15" width="25"/>
-    
-    <box proportion="2" width="100%" layout="vertical-row" padding="2">
-        <ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center"
-                     child_width="90" child_height="90" max_rows="3"/>
-    </box>
-    
-    <!-- Groups will be added dynamically at runtime -->
-    <tabs width="98%" x="1%" height="25" id="kartgroups">
-    </tabs>
-    <spacer width="100%" height="2%"/>
-</div>
+        <placeholder id="playerskarts" width="100%" align="center" proportion="4">
+            <!-- Contents is added programatically -->
+        </placeholder>
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+        <spacer height="15" width="25"/>
 
-</stkgui>
\ No newline at end of file
+        <box proportion="2" width="100%" layout="vertical-row" padding="2">
+            <ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center"
+                         child_width="90" child_height="90" max_rows="3"/>
+        </box>
+
+        <!-- Groups will be added dynamically at runtime -->
+        <tabs width="98%" x="1%" height="25" id="kartgroups">
+        </tabs>
+        <spacer width="100%" height="2%"/>
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+</stkgui>
diff --git a/data/gui/karts_online.stkgui b/data/gui/karts_online.stkgui
index 0fc910355..03c349e27 100644
--- a/data/gui/karts_online.stkgui
+++ b/data/gui/karts_online.stkgui
@@ -1,29 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="99%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="99%" layout="vertical-row" >
+        <header width="80%"
+               I18N="In the kart selection (player setup) screen"
+               text="Choose a Kart"
+               align="center" text_align="center" />
 
-    <header width="80%"
-           I18N="In the kart selection (player setup) screen"
-           text="Choose a Kart"
-           align="center" text_align="center" />
-      
-    <placeholder id="playerskarts" width="100%" align="center" proportion="4">
-        <!-- Contents is added programatically -->
-    </placeholder>
-    
-    <spacer height="15" width="25"/>
-    
-    <box proportion="2" width="100%" layout="vertical-row" padding="2">
-        <ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center"
-                     child_width="90" child_height="90" max_rows="3"/>
-    </box>
-    
-    <!-- Groups will be added dynamically at runtime -->
-    <tabs width="98%" x="1%" height="25" id="kartgroups">
-    </tabs>
-    <spacer width="100%" height="2%"/>
-</div>
+        <placeholder id="playerskarts" width="100%" align="center" proportion="4">
+            <!-- Contents is added programatically -->
+        </placeholder>
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+        <spacer height="15" width="25"/>
 
-</stkgui>
\ No newline at end of file
+        <box proportion="2" width="100%" layout="vertical-row" padding="2">
+            <ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center"
+                         child_width="90" child_height="90" max_rows="3"/>
+        </box>
+
+        <!-- Groups will be added dynamically at runtime -->
+        <tabs width="98%" x="1%" height="25" id="kartgroups">
+        </tabs>
+        <spacer width="100%" height="2%"/>
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+</stkgui>
diff --git a/data/gui/main.stkgui b/data/gui/main.stkgui
index 3d06834b0..6d4c5bb8f 100644
--- a/data/gui/main.stkgui
+++ b/data/gui/main.stkgui
@@ -1,7 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-
         <icon id="logo" align="center" proportion="5" width="100%" icon="gui/logo.png"/>
 
         <buttonbar id="menu_toprow" proportion="3" width="90%" align="center">
@@ -49,9 +48,6 @@
                 <icon-button id="quit" width="64" height="64" icon="gui/main_quit.png"  extend_label="50"
                              I18N="Main menu button" text="Quit" label_location="hover"/>
             </buttonbar>
-
         </bottombar>
-
     </div>
-
 </stkgui>
diff --git a/data/gui/online/change_password.stkgui b/data/gui/online/change_password.stkgui
index 0f9f16a04..384e34d27 100644
--- a/data/gui/online/change_password.stkgui
+++ b/data/gui/online/change_password.stkgui
@@ -1,47 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
-    
+
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
        I18N="In the change password dialog" text="Password Change"/>
-           
+
         <spacer height="40" width="50">
-        
+
         <div width="80%" align="center" layout="vertical-row" height="fit" >
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" height="100%" text_align="left" I18N="In the change password dialog" text="Current Password"/>
                 <textbox proportion="2" height="fit" id="current_password" I18N="In the change password dialog"/>
             </div>
-            
+
             <spacer height="20" width="20">
-            
+
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" height="100%" text_align="left" I18N="In the change password dialog" text="New Password"/>
                 <textbox proportion="2" height="fit" id="new_password1" I18N="In the change password dialog"/>
             </div>
-            
+
             <spacer height="20" width="20">
-            
+
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" height="100%" text_align="left" I18N="In the change password dialog" text="Confirm"/>
                 <textbox proportion="2" height="fit" id="new_password2" I18N="In the change password dialog"/>
             </div>
         </div>
-        
+
         <spacer height="20" width="50">
-        
+
         <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
-           
-        <spacer height="20" width="50"> 
-        
+
+        <spacer height="20" width="50">
+
         <buttonbar id="options" width="90%" height="16%" align="center">
                 <icon-button id="submit" width="64" height="64" icon="gui/green_check.png"
                              I18N="In the change password dialog"  text="Submit" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
                              I18N="In the change password dialog" text="Close" label_location="bottom"/>
         </buttonbar>
-        
-    
     </div>
-
 </stkgui>
diff --git a/data/gui/online/create_server.stkgui b/data/gui/online/create_server.stkgui
index 2043beed4..350d23178 100644
--- a/data/gui/online/create_server.stkgui
+++ b/data/gui/online/create_server.stkgui
@@ -1,36 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-    
+
         <header text_align="center" width="80%" align="center" I18N="In the create server screen" text="Server Creation"/>
         <spacer height="15" width="10"/>
         <box proportion="4" width="90%" layout="vertical-row" align="center">
-        	<div width="90%" align="center" layout="vertical-row" y="2%" height="96%">
-	            <div width="100%" align="center" layout="vertical-row"  height="fit" >
-	                <div width="100%" height="fit" layout="horizontal-row" >
-	                    <label proportion="1" text_align="left" I18N="In the create server screen" text="Name of the server"/>
-	                    <textbox proportion="1" id="name" I18N="In the create server screen"/>
-	                </div>
-	                
-	                <spacer height="20" width="20">
-	                
-	                <div width="100%" height="fit" layout="horizontal-row" >
-	                    <label proportion="1" text_align="left" I18N="In the create server screen" text="Max. number of players"/>
-	                    <gauge id="max_players" proportion="1" min_value="2" max_value="12"/>
-	                </div>
-	            </div>
-	            
-	            <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
-	            
-	            <buttonbar id="options" x="0" y="0" width="25%" height="12%" align="center">
-	                <icon-button id="create" width="64" height="64" icon="gui/green_check.png"
-	                             I18N="Main menu button" text="Create" label_location="bottom"/>
-	                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-	                             I18N="Main menu button" text="Cancel" label_location="bottom"/>
-	            </buttonbar>
-	        </div>
+            <div width="90%" align="center" layout="vertical-row" y="2%" height="96%">
+                <div width="100%" align="center" layout="vertical-row"  height="fit" >
+                    <div width="100%" height="fit" layout="horizontal-row" >
+                        <label proportion="1" text_align="left" I18N="In the create server screen" text="Name of the server"/>
+                        <textbox proportion="1" id="name" I18N="In the create server screen"/>
+                    </div>
+
+                    <spacer height="20" width="20">
+
+                    <div width="100%" height="fit" layout="horizontal-row" >
+                        <label proportion="1" text_align="left" I18N="In the create server screen" text="Max. number of players"/>
+                        <gauge id="max_players" proportion="1" min_value="2" max_value="12"/>
+                    </div>
+                </div>
+
+                <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
+
+                <buttonbar id="options" x="0" y="0" width="25%" height="12%" align="center">
+                    <icon-button id="create" width="64" height="64" icon="gui/green_check.png"
+                                 I18N="Main menu button" text="Create" label_location="bottom"/>
+                    <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                                 I18N="Main menu button" text="Cancel" label_location="bottom"/>
+                </buttonbar>
+            </div>
         </box>
         <spacer height="15" width="10"/>
-
-        
     </div>
 </stkgui>
diff --git a/data/gui/online/guest_login.stkgui b/data/gui/online/guest_login.stkgui
index f88f1433a..42ce4cd1b 100644
--- a/data/gui/online/guest_login.stkgui
+++ b/data/gui/online/guest_login.stkgui
@@ -1,44 +1,42 @@
-<?xml version="1.0" encoding="UTF-16"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
-    <header align="center" width="80%" text="Login" text_align="center"/>
-    <spacer height="15" width="10"/>
-
-    <tabs id="login_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-        <icon-button id="tab_login" width="128" height="128" icon="gui/track_random.png"
-                I18N="Tab in login menu" text="Sign In"/>
-        <icon-button id="tab_guest_login" width="128" height="128" icon="gui/mode_ftl.png"
-                I18N="Tab in login menu" text="Sign In As Guest"/>
-        <icon-button id="tab_register" width="128" height="128" icon="gui/mode_ftl.png"
-                I18N="Tab in login menu" text="Register"/>
-    </tabs>
-
-    <box proportion="1" width="100%" layout="vertical-row">
-        <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
-                I18N="In the login dialog" text="Guest Sign in"/>
+        <header align="center" width="80%" text="Login" text_align="center"/>
         <spacer height="15" width="10"/>
-        <box proportion="4" width="90%" layout="vertical-row" align="center">
-            <div x="2%" y="2%" width="96%" height="80%" layout="vertical-row" id="outer_box" >
-                <label I18N="In the online multiplayer screen" proportion="4" word_wrap="true" text=
-                "Signing in as a guest allows you to participate in online races,
-but it does not allow you to vote for addons,
-or collect any achievements while being online."
-                       align="center"/>
-            </div>
+
+        <tabs id="login_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
+            <icon-button id="tab_login" width="128" height="128" icon="gui/track_random.png"
+                    I18N="Tab in login menu" text="Sign In"/>
+            <icon-button id="tab_guest_login" width="128" height="128" icon="gui/mode_ftl.png"
+                    I18N="Tab in login menu" text="Sign In As Guest"/>
+            <icon-button id="tab_register" width="128" height="128" icon="gui/mode_ftl.png"
+                    I18N="Tab in login menu" text="Register"/>
+        </tabs>
+
+        <box proportion="1" width="100%" layout="vertical-row">
+            <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
+                    I18N="In the login dialog" text="Guest Sign in"/>
+            <spacer height="15" width="10"/>
+            <box proportion="4" width="90%" layout="vertical-row" align="center">
+                <div x="2%" y="2%" width="96%" height="80%" layout="vertical-row" id="outer_box" >
+                    <label I18N="In the online multiplayer screen" proportion="4" word_wrap="true" text=
+                    "Signing in as a guest allows you to participate in online races,
+    but it does not allow you to vote for addons,
+    or collect any achievements while being online."
+                           align="center"/>
+                </div>
+            </box>
+            <spacer height="15" width="10"/>
+            <buttonbar id="options" width="90%" height="13%" align="bottom">
+                <icon-button id="sign_in" width="64" height="64" icon="gui/green_check.png"
+                             I18N="Login dialog"  text="Sign In" label_location="bottom"/>
+                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                             I18N="Login dialog" text="Close" label_location="bottom"/>
+            </buttonbar>
+            <spacer height="15" width="10"/>
         </box>
-        <spacer height="15" width="10"/>
-        <buttonbar id="options" width="90%" height="13%" align="bottom">
-            <icon-button id="sign_in" width="64" height="64" icon="gui/green_check.png"
-                         I18N="Login dialog"  text="Sign In" label_location="bottom"/>
-            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                         I18N="Login dialog" text="Close" label_location="bottom"/>
-        </buttonbar>
-        <spacer height="15" width="10"/>
-    </box>
-</div>
-
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    </div>
 
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/online/lobby.stkgui b/data/gui/online/lobby.stkgui
index 81bbd2256..aa0ec49c4 100644
--- a/data/gui/online/lobby.stkgui
+++ b/data/gui/online/lobby.stkgui
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-    
+
         <header text_align="center" width="80%" align="center" I18N="In networking lobby" text="Lobby"/>
         <spacer height="15" width="10"/>
         <div proportion="1" x="2%" width="96%" layout="vertical-row">
@@ -16,9 +17,9 @@
                     <list id="players" width="100%" height="100%"/>
                 </box>
             </div>
-            
+
             <spacer width="20" height="20"/>
-            
+
             <div width="100%" proportion="1" layout="horizontal-row">
                 <box proportion="2" height="100%" layout="vertical-row">
                     <list id="chat" width="100%" height="100%"/>
@@ -26,26 +27,25 @@
                 <spacer width="20" height="20"/>
                 <box id="actions" proportion="1" height="100%" layout="vertical-row">
                     <label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
-                </box>     
-            </div>     
+                </box>
+            </div>
         </div>
-             
+
         <spacer width="10" height="7%"/>
-    
+
         <bottombar x="2%" width="96%" height="10%" layout="horizontal-row">
             <label text_align="left" align="center" height="100%" id="online_status" proportion="1" text=""/>
-            
-            <spacer width="10" height="10" />                         
-            
+
+            <spacer width="10" height="10" />
+
             <buttonbar id="menu_bottomrow" x="0" y="0" width="20%" height="100%" align="center">
                 <icon-button id="exit" width="64" height="64" icon="gui/main_quit.png"  extend_label="50"
                              I18N="Main menu button" text="Exit" label_location="hover"/>
             </buttonbar>
-            
-        </bottombar>
-        
-    </div>
-    
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
+        </bottombar>
+
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/online/lobby_settings.stkgui b/data/gui/online/lobby_settings.stkgui
index fc5ff8deb..2535b1946 100644
--- a/data/gui/online/lobby_settings.stkgui
+++ b/data/gui/online/lobby_settings.stkgui
@@ -1,6 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-    
         <header text_align="center" width="80%" align="center" I18N="In the lobby settings screen" text="Lobby Settings"/>
         <spacer height="15" width="10"/>
         <box proportion="4" width="90%" layout="vertical-row" align="center">
@@ -9,24 +9,23 @@
                     <label proportion="1" text_align="left" I18N="In the lobby settings screen" text="Name of the server"/>
                     <textbox proportion="2" id="name" I18N="In the login dialog"/>
                 </div>
-                
+
                 <spacer height="20" width="20">
-                
+
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <label proportion="1" text_align="left" I18N="In the lobby settings screen" text="Max. number of players"/>
                     <gauge id="max_players" proportion="2" min_value="2" max_value="12"/>
                 </div>
             </div>
         </box>
-        
-        <spacer width="10" height="7%"/>
-    
-        <bottombar x="2%" width="96%" height="10%" layout="horizontal-row">
-            
-        </bottombar>
-        
-    </div>
-    
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
+        <spacer width="10" height="7%"/>
+
+        <bottombar x="2%" width="96%" height="10%" layout="horizontal-row">
+
+        </bottombar>
+
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/online/main.stkgui b/data/gui/online/main.stkgui
index 28c979ee8..2b0150313 100644
--- a/data/gui/online/main.stkgui
+++ b/data/gui/online/main.stkgui
@@ -1,17 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-    
+
         <header text_align="center" width="80%" align="center" I18N="In the online multiplayer screen" text="Online Multiplayer"/>
         <spacer height="15" width="10"/>
         <box proportion="4" width="90%" layout="vertical-row" align="center">
             <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" id="outer_box" >
                 <label I18N="In the online multiplayer screen" proportion="4" word_wrap="true" text=
                 "Here will come some information.. or statistics.. or whatever. Yet to be filled in! It will change depending on state. And I'd also like a close button at the right top.
-                
-                " align="center"/>         
+
+                " align="center"/>
             </div>
         </box>
-        
+
         <buttonbar id="menu_toprow" proportion="3" width="90%" align="center">
             <icon-button id="quick_play" width="128" height="128"
                          icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
@@ -23,25 +24,24 @@
                          icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
                          I18N="Online menu button" text="Create Server"/>
         </buttonbar>
-        
+
         <spacer width="10" height="7%"/>
-    
+
         <bottombar x="2%" width="96%" height="10%" layout="horizontal-row">
             <label text_align="left" align="center" height="100%" id="online_status" proportion="1" text=""/>
-            
-            <spacer width="10" height="10" />                         
-            
+
+            <spacer width="10" height="10" />
+
             <buttonbar id="menu_bottomrow" x="0" y="0" width="12%" height="100%" align="center">
                 <icon-button id="profile" width="64" height="64" icon="gui/green_check.png"  extend_label="50"
                              I18N="Online menu button" text="Profile" label_location="hover"/>
                 <icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png"  extend_label="70"
                              I18N="Online menu button" text="Sign Out" label_location="hover"/>
             </buttonbar>
-            
-        </bottombar>
-        
-    </div>
-    
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
+        </bottombar>
+
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/online/notification_dialog.stkgui b/data/gui/online/notification_dialog.stkgui
index 90a9d739f..c22846fd6 100644
--- a/data/gui/online/notification_dialog.stkgui
+++ b/data/gui/online/notification_dialog.stkgui
@@ -1,19 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="2%" y="5%" width="96%" height="85%" layout="vertical-row" >
-            
+
         <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
-           
-        <spacer height="20" width="50"> 
-        
+
+        <spacer height="20" width="50">
+
         <buttonbar id="options" width="90%" height="30%" align="center">
             <icon-button id="view" width="64" height="64" icon="gui/difficulty_medium.png"
                          I18N="User info dialog"  text="View" label_location="bottom"/>
             <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
                          I18N="User info dialog" text="Close" label_location="bottom"/>
         </buttonbar>
-        
-    
     </div>
-
 </stkgui>
diff --git a/data/gui/online/profile_achievements.stkgui b/data/gui/online/profile_achievements.stkgui
index d072200b5..b8d13653d 100644
--- a/data/gui/online/profile_achievements.stkgui
+++ b/data/gui/online/profile_achievements.stkgui
@@ -1,23 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header id="title" text_align="center" width="80%" align="center" text="..."/>
 
-    <header id="title" text_align="center" width="80%" align="center" text="..."/>
-    
-    <spacer height="25" width="10"/>
-    
-    <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-        <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png" />
-        <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"/>
-        <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png" I18N="Section in the profile menu" text="Achievements"/>
-        <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
-    </tabs>
-    
-    <box proportion="1" width="100%" layout="vertical-row" padding="6">
-		<list id="achievements_list" x="0" y="0" width="100%" height="100%"/>
-    </box>	
-</div>
+        <spacer height="25" width="10"/>
 
+        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
+            <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png" />
+            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"/>
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png" I18N="Section in the profile menu" text="Achievements"/>
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
+        </tabs>
+
+        <box proportion="1" width="100%" layout="vertical-row" padding="6">
+            <list id="achievements_list" x="0" y="0" width="100%" height="100%"/>
+        </box>
+    </div>
 </stkgui>
diff --git a/data/gui/online/profile_friends.stkgui b/data/gui/online/profile_friends.stkgui
index b0c6b073c..c2498bfd9 100644
--- a/data/gui/online/profile_friends.stkgui
+++ b/data/gui/online/profile_friends.stkgui
@@ -1,37 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header id="title" text_align="center" width="80%" align="center" text="..."/>
 
-    <header id="title" text_align="center" width="80%" align="center" text="..."/>
-    
-    <spacer height="25" width="10"/>
-    
-    <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-        <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png" />
-        <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" I18N="Section in the profile menu" text="Friends"/>
-        <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"/>
-        <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
-    </tabs>
-    
-    <box proportion="1" width="100%" layout="vertical-row" padding="6">
-		<list id="friends_list" x="0" y="0" width="100%" height="100%"/>
-    </box>
-    
-    <div id="search_div" height="fit" width="100%" layout="vertical-row">
-		<spacer width="10" height="10"/>
-		<box height="fit" width="100%" layout="vertical-row">					
-			<label height="fit" text_align="left" I18N="Profile friends" text="Look for more friends:"/>
-			<spacer width="10" height="10"/>
-			<div height="fit" width="100%" layout="horizontal-row" align="center"> 
-				<textbox id="search_box" proportion="1" height="fit"/>
-				<spacer width="10" height="100%"/>
-				<button id="search_button" height="100%" width="fit" text="Search" />
-			</div>
-		</box>
-	</div>
-	
-</div>
+        <spacer height="25" width="10"/>
 
+        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
+            <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png" />
+            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" I18N="Section in the profile menu" text="Friends"/>
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"/>
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
+        </tabs>
+
+        <box proportion="1" width="100%" layout="vertical-row" padding="6">
+            <list id="friends_list" x="0" y="0" width="100%" height="100%"/>
+        </box>
+
+        <div id="search_div" height="fit" width="100%" layout="vertical-row">
+            <spacer width="10" height="10"/>
+            <box height="fit" width="100%" layout="vertical-row">
+                <label height="fit" text_align="left" I18N="Profile friends" text="Look for more friends:"/>
+                <spacer width="10" height="10"/>
+                <div height="fit" width="100%" layout="horizontal-row" align="center">
+                    <textbox id="search_box" proportion="1" height="fit"/>
+                    <spacer width="10" height="100%"/>
+                    <button id="search_button" height="100%" width="fit" text="Search" />
+                </div>
+            </box>
+        </div>
+    </div>
 </stkgui>
diff --git a/data/gui/online/profile_overview.stkgui b/data/gui/online/profile_overview.stkgui
index ab7a4d2da..81afe5507 100644
--- a/data/gui/online/profile_overview.stkgui
+++ b/data/gui/online/profile_overview.stkgui
@@ -1,25 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header id="title" text_align="center" width="80%" align="center" text="..."/>
 
-    <header id="title" text_align="center" width="80%" align="center" text="..."/>
-    
-    <spacer height="25" width="10"/>
-    
-    <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-        <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png" I18N="Section in the profile menu" text="Overview"/>
-        <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
-        <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"/>
-        <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
-    </tabs>
-    
-    <box proportion="1" width="100%" layout="vertical-row">
-        <div x="1%" y="2%" width="98%" height="96%" layout="vertical-row" >
+        <spacer height="25" width="10"/>
 
-        </div>
-    </box>
-</div>
+        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
+            <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png" I18N="Section in the profile menu" text="Overview"/>
+            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"/>
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
+        </tabs>
 
+        <box proportion="1" width="100%" layout="vertical-row">
+            <div x="1%" y="2%" width="98%" height="96%" layout="vertical-row" >
+
+            </div>
+        </box>
+    </div>
 </stkgui>
diff --git a/data/gui/online/profile_settings.stkgui b/data/gui/online/profile_settings.stkgui
index 35abe5ee3..78599ff0b 100644
--- a/data/gui/online/profile_settings.stkgui
+++ b/data/gui/online/profile_settings.stkgui
@@ -1,29 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header id="title" text_align="center" width="80%" align="center" text="..."/>
 
-    <header id="title" text_align="center" width="80%" align="center" text="..."/>
-    
-    <spacer height="25" width="10"/>
-    
-    <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-        <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png"/>
-        <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
-        <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"/>
-        <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png" I18N="Section in the profile menu" text="Account Settings"/>
-    </tabs>
-    
-    <box proportion="1" width="100%" layout="vertical-row">
-        <div x="1%" y="2%" width="98%" height="96%" layout="vertical-row" >
-            <div width="fit" height="fit" layout="horizontal-row" >
-                <label proportion="1" height="fit" text_align="left" I18N="In the online account settings screen" text="Password :"/>
-                <spacer width="20" height="1"/>
-                <button id="change_password_button" height="100%" width="fit" text="Change" />
+        <spacer height="25" width="10"/>
+
+        <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
+            <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png"/>
+            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"/>
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png" I18N="Section in the profile menu" text="Account Settings"/>
+        </tabs>
+
+        <box proportion="1" width="100%" layout="vertical-row">
+            <div x="1%" y="2%" width="98%" height="96%" layout="vertical-row" >
+                <div width="fit" height="fit" layout="horizontal-row" >
+                    <label proportion="1" height="fit" text_align="left" I18N="In the online account settings screen" text="Password :"/>
+                    <spacer width="20" height="1"/>
+                    <button id="change_password_button" height="100%" width="fit" text="Change" />
+                </div>
             </div>
-        </div>
-    </box>
-</div>
-
+        </box>
+    </div>
 </stkgui>
diff --git a/data/gui/online/recovery_info.stkgui b/data/gui/online/recovery_info.stkgui
index 036dba116..59abf992c 100644
--- a/data/gui/online/recovery_info.stkgui
+++ b/data/gui/online/recovery_info.stkgui
@@ -1,23 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
-    
+
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
        I18N="In the registration dialog' dialog" text="Account Recovery"/>
-    
-        <spacer height="20" width="50">
-        
-        <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" I18N="In the registration dialog" 
-        text="You will receive an email with further instructions on how to reset your password. Please be patient and be sure to check your spam folder."/>
-           
-        <spacer height="20" width="50"> 
-        
-        <buttonbar id="options" width="25%" height="15%" align="center">
-    		<icon-button id="cancel" width="64" height="64" icon="gui/green_check.png"
-            	I18N="Registration dialog" text="Close" label_location="none"/>
-        </buttonbar>
-        
-    
-    </div>
 
+        <spacer height="20" width="50">
+
+        <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" I18N="In the registration dialog"
+        text="You will receive an email with further instructions on how to reset your password. Please be patient and be sure to check your spam folder."/>
+
+        <spacer height="20" width="50">
+
+        <buttonbar id="options" width="25%" height="15%" align="center">
+            <icon-button id="cancel" width="64" height="64" icon="gui/green_check.png"
+                I18N="Registration dialog" text="Close" label_location="none"/>
+        </buttonbar>
+    </div>
 </stkgui>
diff --git a/data/gui/online/recovery_input.stkgui b/data/gui/online/recovery_input.stkgui
index 26a8a7da0..0ed793f22 100644
--- a/data/gui/online/recovery_input.stkgui
+++ b/data/gui/online/recovery_input.stkgui
@@ -1,46 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
-    
+
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
        I18N="In the recovery dialog' dialog" text="Account Recovery"/>
-    
+
         <spacer height="20" width="50">
-        
-        <label id="message" proportion="2" width="90%" align="center" text_align="left" word_wrap="true" 
+
+        <label id="message" proportion="2" width="90%" align="center" text_align="left" word_wrap="true"
         text="Fill in the username and email address you supplied at registration to be able to reset your password."/>
-        
+
         <spacer height="40" width="50">
-        
+
         <div width="80%" align="center" layout="vertical-row" height="fit">
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" text_align="left" I18N="In the recovery dialog" text="Username"/>
                 <textbox proportion="2" id="username" I18N="In the recovery dialog"/>
             </div>
-            
+
             <spacer height="20" width="20">
-            
+
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" text_align="left" I18N="In the recovery dialog" text="Email"/>
                 <textbox proportion="2" id="email" I18N="In the recovery dialog"/>
             </div>
-            
+
         </div>
-        
-        <spacer height="20" width="50">     
-        
+
+        <spacer height="20" width="50">
+
         <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true"
            I18N="In the recovery" text=""/>
-           
-        <spacer height="20" width="50"> 
-        
-        <buttonbar id="options" width="25%" proportion="1" align="center">
-    		<icon-button id="submit" width="64" height="64" icon="gui/green_check.png"
-            	I18N="Registration dialog" text="Submit" label_location="none"/>
-            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-            	I18N="Registration dialog"  text="Cancel" label_location="none"/>
-        </buttonbar>
-    
-    </div>
 
+        <spacer height="20" width="50">
+
+        <buttonbar id="options" width="25%" proportion="1" align="center">
+            <icon-button id="submit" width="64" height="64" icon="gui/green_check.png"
+                I18N="Registration dialog" text="Submit" label_location="none"/>
+            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                I18N="Registration dialog"  text="Cancel" label_location="none"/>
+        </buttonbar>
+    </div>
 </stkgui>
diff --git a/data/gui/online/register.stkgui b/data/gui/online/register.stkgui
index dca284620..ab37206d9 100644
--- a/data/gui/online/register.stkgui
+++ b/data/gui/online/register.stkgui
@@ -1,82 +1,80 @@
-<?xml version="1.0" encoding="UTF-16"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header align="center" width="80%" text="Create User" text_align="center"
+                I18N="In the registration dialog" />
+        <spacer height="15" width="10"/>
 
-    <header align="center" width="80%" text="Create User" text_align="center"
-            I18N="In the registration dialog" />
-    <spacer height="15" width="10"/>
+        <box proportion="1" width="100%" layout="vertical-row">
+            <div width="80%" align="center" layout="vertical-row" height="fit">
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label   proportion="1" height="100%" text_align="left"
+                             I18N="In the registration dialog" text="Local Username"/>
+                    <textbox id="local_username" proportion="2" height="fit" I18N="In the registration dialog"/>
+                </div>
+                <div width="100%" height="fit" layout="horizontal-row" >
+                     <label    id="label_online" proportion="1" height="100%" text_align="left"
+                               I18N="In the login screen" text="Online"/>
+                     <checkbox id="online" I18N="In the login screen" text_align="left"/>
+                </div>
+
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label   id="label_username" proportion="1" height="100%" text_align="left"
+                             I18N="In the registration dialog" text="Online Username"/>
+                    <textbox id="username" proportion="2" height="fit" I18N="In the registration dialog"/>
+                </div>
+
+                <spacer height="20" width="20"/>
+
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label   id="label_password" proportion="1" height="100%" text_align="left"
+                             I18N="In the registration dialog" text="Password"/>
+                    <textbox id="password" proportion="2" height="fit" I18N="In the registration dialog"/>
+                </div>
+
+                <spacer height="20" width="20"/>
+
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label   id="label_password_confirm" proportion="1" height="100%" text_align="left"
+                             I18N="In the registration dialog" text="Confirm"/>
+                    <textbox id="password_confirm" proportion="2" height="fit" I18N="In the registration dialog"/>
+                </div>
+
+                <spacer height="20" width="20"/>
+
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label   id="label_email" proportion="1" height="100%" text_align="left"
+                             I18N="In the registration dialog" text="Email"/>
+                    <textbox id="email" proportion="2" height="fit" I18N="In the registration dialog"/>
+                </div>
+
+                <spacer height="20" width="20"/>
+
+                <div width="100%" height="fit" layout="horizontal-row" >
+                    <label   id="label_email_confirm" proportion="1" height="100%" text_align="left"
+                             I18N="In the registration dialog" text="Confirm"/>
+                    <textbox id="email_confirm" proportion="2" height="fit" I18N="In the registration dialog"/>
+                </div>
+            <spacer height="20" width="50"/>
+
+            <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true"
+               I18N="In the registration dialog" text="You don't need to register if you have a STK Addons account!"/>
+
+            <spacer height="20" width="50"/>
 
-    <box proportion="1" width="100%" layout="vertical-row">
-        <div width="80%" align="center" layout="vertical-row" height="fit">
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label   proportion="1" height="100%" text_align="left" 
-                         I18N="In the registration dialog" text="Local Username"/>
-                <textbox id="local_username" proportion="2" height="fit" I18N="In the registration dialog"/>
-            </div>
-            <div width="100%" height="fit" layout="horizontal-row" >
-                 <label    id="label_online" proportion="1" height="100%" text_align="left"
-                           I18N="In the login screen" text="Online"/>
-                 <checkbox id="online" I18N="In the login screen" text_align="left"/>
             </div>
 
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label   id="label_username" proportion="1" height="100%" text_align="left" 
-                         I18N="In the registration dialog" text="Online Username"/>
-                <textbox id="username" proportion="2" height="fit" I18N="In the registration dialog"/>
-            </div>
+            <spacer height="20" width="50"/>
 
-            <spacer height="20" width="20"/>
-
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label   id="label_password" proportion="1" height="100%" text_align="left"
-                         I18N="In the registration dialog" text="Password"/>
-                <textbox id="password" proportion="2" height="fit" I18N="In the registration dialog"/>
-            </div>
-
-            <spacer height="20" width="20"/>
-
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label   id="label_password_confirm" proportion="1" height="100%" text_align="left"
-                         I18N="In the registration dialog" text="Confirm"/>
-                <textbox id="password_confirm" proportion="2" height="fit" I18N="In the registration dialog"/>
-            </div>
-
-            <spacer height="20" width="20"/>
-
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label   id="label_email" proportion="1" height="100%" text_align="left"
-                         I18N="In the registration dialog" text="Email"/>
-                <textbox id="email" proportion="2" height="fit" I18N="In the registration dialog"/>
-            </div>
-
-            <spacer height="20" width="20"/>
-
-            <div width="100%" height="fit" layout="horizontal-row" >
-                <label   id="label_email_confirm" proportion="1" height="100%" text_align="left"
-                         I18N="In the registration dialog" text="Confirm"/>
-                <textbox id="email_confirm" proportion="2" height="fit" I18N="In the registration dialog"/>
-            </div>
-        <spacer height="20" width="50"/>
-
-        <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true"
-           I18N="In the registration dialog" text="You don't need to register if you have a STK Addons account!"/>
-
-        <spacer height="20" width="50"/>
-
-        </div>
-
-        <spacer height="20" width="50"/>
-
-        <buttonbar id="options" width="25%" height="14%" align="center">
-            <icon-button id="next" width="64" height="64" icon="gui/green_check.png"
-                I18N="Registration dialog" text="OK" label_location="none"/>
-            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                I18N="Registration dialog"  text="Cancel" label_location="none"/>
-        </buttonbar>
-    </box>
-</div>
-
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+            <buttonbar id="options" width="25%" height="14%" align="center">
+                <icon-button id="next" width="64" height="64" icon="gui/green_check.png"
+                    I18N="Registration dialog" text="OK" label_location="none"/>
+                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                    I18N="Registration dialog"  text="Cancel" label_location="none"/>
+            </buttonbar>
+        </box>
+    </div>
 
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/online/registration_terms.stkgui b/data/gui/online/registration_terms.stkgui
index 4c94d47e5..42b6995fc 100644
--- a/data/gui/online/registration_terms.stkgui
+++ b/data/gui/online/registration_terms.stkgui
@@ -1,36 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="2%" y="4%" width="96%" height="92%" layout="vertical-row" >
-    
+
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
        I18N="In the registration dialog' dialog" text="Terms and Agreement"/>
-    
+
         <spacer height="25" width="50">
-                   
+
         <box proportion="5" width="90%" align="center" layout="vertical-row" padding="8">
             <list id="terms" x="0" y="0" width="100%" height="100%"/>
         </box>
-        
+
         <div align="center" width="fit" height="fit" layout="horizontal-row" >
             <label text_align="center" align="center" I18N="In the registration dialog" word_wrap="true"
                 text="I agree to the above terms and am 13 years or older. "/>
         </div>
-        
+
         <spacer height="20" width="50">
-        
+
         <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true"
            I18N="In the registration dialog" text=""/>
-           
-        <spacer height="20" width="50"> 
-        
+
+        <spacer height="20" width="50">
+
         <buttonbar id="options" width="45%" height="14%" align="center">
             <icon-button id="accept" width="64" height="64" icon="gui/green_check.png"
-            	I18N="Registration dialog" text="Accept" label_location="bottom"/>
+                I18N="Registration dialog" text="Accept" label_location="bottom"/>
             <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-            	I18N="Registration dialog" text="Cancel" label_location="bottom"/>
+                I18N="Registration dialog" text="Cancel" label_location="bottom"/>
         </buttonbar>
-        
-    
     </div>
-
 </stkgui>
diff --git a/data/gui/online/server_info_dialog.stkgui b/data/gui/online/server_info_dialog.stkgui
index 9ce39b949..d91720706 100644
--- a/data/gui/online/server_info_dialog.stkgui
+++ b/data/gui/online/server_info_dialog.stkgui
@@ -1,33 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="2%" y="5%" width="96%" height="85%" layout="vertical-row" >
-    
+
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
        I18N="In the server info dialog' dialog" text="Server Info"/>
-       
+
        <spacer height="20" width="50">
-        
+
         <div width="80%" align="center" layout="vertical-row" height="fit" >
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" text_align="left" I18N="In the server info dialog" text="Name"/>
                 <label id="name" proportion="2" text_align="left" text=""/>
             </div>
         </div>
-        
-        <spacer height="20" width="50">      
-        
+
+        <spacer height="20" width="50">
+
         <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
-           
-        <spacer height="20" width="50"> 
-        
+
+        <spacer height="20" width="50">
+
         <buttonbar id="options" width="90%" height="20%" align="center">
                 <icon-button id="join" width="64" height="64" icon="gui/green_check.png"
                              I18N="Login dialog"  text="Join" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
                              I18N="Login dialog" text="Cancel" label_location="bottom"/>
         </buttonbar>
-        
-    
     </div>
-
 </stkgui>
diff --git a/data/gui/online/server_selection.stkgui b/data/gui/online/server_selection.stkgui
index c863b9cc2..8d89bdd96 100644
--- a/data/gui/online/server_selection.stkgui
+++ b/data/gui/online/server_selection.stkgui
@@ -1,17 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
 
-<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="Server Selection" align="center"/>
+            <icon-button id="reload"   height="90%" icon="gui/restart.png"/>
+        </div>
 
-    <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="Server Selection" align="center"/>
-        <icon-button id="reload"   height="90%" icon="gui/restart.png"/>
+        <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
+            <list id="server_list" x="0" y="0" width="100%" height="100%"/>
+        </box>
     </div>
-  
-    <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
-        <list id="server_list" x="0" y="0" width="100%" height="100%"/>
-    </box>
-       
-</div>
-
 </stkgui>
diff --git a/data/gui/online/user_info_dialog.stkgui b/data/gui/online/user_info_dialog.stkgui
index ae9e16d46..448daf059 100644
--- a/data/gui/online/user_info_dialog.stkgui
+++ b/data/gui/online/user_info_dialog.stkgui
@@ -1,41 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="2%" y="5%" width="96%" height="85%" layout="vertical-row" >
-    
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
        I18N="User info dialog' dialog" text="User Info"/>
-       
+
        <spacer height="20" width="50">
-        
+
         <div width="80%" align="center" layout="vertical-row" height="fit" >
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" text_align="left" I18N="User info dialog" text="Name"/>
                 <label id="name" proportion="2" text_align="left" text=""/>
             </div>
         </div>
-        
-        <spacer height="20" width="50">      
-        
+
+        <spacer height="20" width="50">
+
         <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
-           
-        <spacer height="20" width="50"> 
-        
+
+        <spacer height="20" width="50">
+
         <buttonbar id="options" width="90%" height="20%" align="center">
-    		<icon-button id="remove" width="64" height="64" icon="gui/package-uninstall.png"
+            <icon-button id="remove" width="64" height="64" icon="gui/package-uninstall.png"
                          I18N="User info dialog"  text="Remove" label_location="bottom"/>
-    		<icon-button id="friend" width="64" height="64" icon="gui/main_help.png"
+            <icon-button id="friend" width="64" height="64" icon="gui/main_help.png"
                          I18N="User info dialog"  text="Add Friend" label_location="bottom"/>
-    		<icon-button id="accept" width="64" height="64" icon="gui/green_check.png"
+            <icon-button id="accept" width="64" height="64" icon="gui/green_check.png"
                          I18N="User info dialog"  text="Accept" label_location="bottom"/>
-    		<icon-button id="decline" width="64" height="64" icon="gui/red_mark.png"
+            <icon-button id="decline" width="64" height="64" icon="gui/red_mark.png"
                          I18N="User info dialog"  text="Decline" label_location="bottom"/>
             <icon-button id="enter" width="64" height="64" icon="gui/difficulty_medium.png"
                          I18N="User info dialog"  text="View" label_location="bottom"/>
             <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
                          I18N="User info dialog" text="Close" label_location="bottom"/>
         </buttonbar>
-        
-    
     </div>
-
 </stkgui>
diff --git a/data/gui/online/user_search.stkgui b/data/gui/online/user_search.stkgui
index df933620b..6cd01e931 100644
--- a/data/gui/online/user_search.stkgui
+++ b/data/gui/online/user_search.stkgui
@@ -1,24 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-	
-	<div x="1%" y="0%" width="98%" height="99%" layout="vertical-row" >
-	    <header text_align="center" height="fit" text="User search" align="center"/>
-	    
-	    <spacer width="10" height="10"/>
-	  
-		<div height="fit" width="100%" layout="horizontal-row" align="center"> 
-			<textbox id="search_box" height="fit" proportion="1" height="100%"/>
-			<spacer width="10" height="10"/>
-			<button id="search_button" height="100%" width="fit" text="Search" />
-		</div>
-		
-		<spacer width="10" height="10"/>
-					
-	    <box proportion="1" width="100%" align="center" layout="vertical-row" padding="6">
-	        <list id="user_list" x="0" y="0" width="100%" height="100%"/>
-	    </box>
-	       
-	</div>
-	
-	
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+
+    <div x="1%" y="0%" width="98%" height="99%" layout="vertical-row" >
+        <header text_align="center" height="fit" text="User search" align="center"/>
+
+        <spacer width="10" height="10"/>
+
+        <div height="fit" width="100%" layout="horizontal-row" align="center">
+            <textbox id="search_box" height="fit" proportion="1" height="100%"/>
+            <spacer width="10" height="10"/>
+            <button id="search_button" height="100%" width="fit" text="Search" />
+        </div>
+
+        <spacer width="10" height="10"/>
+
+        <box proportion="1" width="100%" align="center" layout="vertical-row" padding="6">
+            <list id="user_list" x="0" y="0" width="100%" height="100%"/>
+        </box>
+    </div>
 </stkgui>
diff --git a/data/gui/online/vote_dialog.stkgui b/data/gui/online/vote_dialog.stkgui
index d61c206d2..e344c21ad 100644
--- a/data/gui/online/vote_dialog.stkgui
+++ b/data/gui/online/vote_dialog.stkgui
@@ -1,27 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
-    
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
        I18N="In the vote dialog' dialog" text="Vote"/>
-    
+
         <spacer height="20" width="50">
-        
+
         <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
-        
+
         <spacer height="20" width="50">
-        
+
         <div width="90%" height="64" align="center" layout="vertical-row" >
-            <ratingbar id="rating" align="center" height="64" width="192"/> 
+            <ratingbar id="rating" align="center" height="64" width="192"/>
         </div>
-        
+
         <spacer height="40" width="50">
-        
+
         <buttonbar id="options" width="25%" height="20%" align="center">
             <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-            	I18N="Vote dialog" text="Close" label_location="none"/>
+                I18N="Vote dialog" text="Close" label_location="none"/>
         </buttonbar>
-        
     </div>
-
 </stkgui>
diff --git a/data/gui/options_audio.stkgui b/data/gui/options_audio.stkgui
index b925511da..4150e2f08 100644
--- a/data/gui/options_audio.stkgui
+++ b/data/gui/options_audio.stkgui
@@ -1,70 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" 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" x="2%" width="98%" 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"
-                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"/>
-    </tabs>
-    
-    <box proportion="1" width="100%" layout="vertical-row">
-        
-        <spacer height="5" width="10"/>
-        
-        <!-- ******** Music ******** -->
-        <label width="100%" I18N="Section in the audio/video settings submenu" text="Music"/>
-        
-        <div width="75%" height="fit" 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" >
-                <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" >
-            <label proportion="1" height="100%" text_align="right" I18N="Music volume in options" text="Volume"/>
-            <div proportion="1" height="fit" layout="horizontal-row" >
-                <spacer width="40" height="100%" />
-                <gauge id="music_volume" proportion="1" min_value="1" max_value="10"/>
-            </div>
-        </div>
-        
+        <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
         <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" >
-            <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" >
-                <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" >
-            <label proportion="1" height="100%" text_align="right" I18N="Sound volume in options" text="Volume"/>
-            <div proportion="1" height="fit" layout="horizontal-row" >
-                <spacer width="40" height="100%" />
-                <gauge id="sfx_volume" proportion="1" min_value="1" max_value="10"/>
-            </div>
-        </div>
-        
-        
-        <spacer height="20" width="10"/>
-        
-    </box>
-</div>
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+        <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" 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"
+                    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"/>
+        </tabs>
 
+        <box proportion="1" width="100%" layout="vertical-row">
+
+            <spacer height="5" width="10"/>
+
+            <!-- ******** Music ******** -->
+            <label width="100%" I18N="Section in the audio/video settings submenu" text="Music"/>
+
+            <div width="75%" height="fit" 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" >
+                    <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" >
+                <label proportion="1" height="100%" text_align="right" I18N="Music volume in options" text="Volume"/>
+                <div proportion="1" height="fit" layout="horizontal-row" >
+                    <spacer width="40" height="100%" />
+                    <gauge id="music_volume" proportion="1" 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" >
+                <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" >
+                    <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" >
+                <label proportion="1" height="100%" text_align="right" I18N="Sound volume in options" text="Volume"/>
+                <div proportion="1" height="fit" layout="horizontal-row" >
+                    <spacer width="40" height="100%" />
+                    <gauge id="sfx_volume" proportion="1" min_value="1" max_value="10"/>
+                </div>
+            </div>
+
+
+            <spacer height="20" width="10"/>
+
+        </box>
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/options_device.stkgui b/data/gui/options_device.stkgui
index 0492c72c5..afe5c5de3 100644
--- a/data/gui/options_device.stkgui
+++ b/data/gui/options_device.stkgui
@@ -1,50 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
+        <spacer height="15" width="10"/>
 
-    <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" x="2%" width="98%" 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_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">
-    
-        <!-- Configuration name -->
-        <spacer height="6" width="10"/>
-        <label id="title" width="100%" text_align="center" />
-        <spacer height="16" width="10"/>
-        
-        <!-- List of key bindings -->
-        <box proportion="8" width="75%" align="center" layout="vertical-row" padding="8">
-            <list id="actions" x="0" y="0" width="100%" height="100%"/>
-        </box>
-        
-        <!-- Bottom buttons -->
+        <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" 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_controls" width="128" height="128" icon="gui/options_input.png"
+                    I18N="Section in the settings menu" text="Controls"/>
+        </tabs>
 
-        <spacer width="50" height="20" /> 
-        <div proportion="2" width="100%"  layout="horizontal-row">
-            <spacer width="7" height="5"/>
-            <div height="100%" width="fit" layout="vertical-row">
-                <button id="delete"
-                        I18N="To delete a keyboard configuration"  text="Delete Configuration"/>
-                <spacer width="50" height="10" /> 
-                <button id="back_to_device_list" I18N="In the input configuration screen"  text="Back to device list"/>
-                
-                <spacer width="50" height="10" /> 
+        <box proportion="1" width="100%" layout="vertical-row">
+
+            <!-- Configuration name -->
+            <spacer height="6" width="10"/>
+            <label id="title" width="100%" text_align="center" />
+            <spacer height="16" width="10"/>
+
+            <!-- List of key bindings -->
+            <box proportion="8" width="75%" align="center" layout="vertical-row" padding="8">
+                <list id="actions" x="0" y="0" width="100%" height="100%"/>
+            </box>
+
+            <!-- Bottom buttons -->
+
+            <spacer width="50" height="20" />
+            <div proportion="2" width="100%"  layout="horizontal-row">
+                <spacer width="7" height="5"/>
+                <div height="100%" width="fit" layout="vertical-row">
+                    <button id="delete"
+                            I18N="To delete a keyboard configuration"  text="Delete Configuration"/>
+                    <spacer width="50" height="10" />
+                    <button id="back_to_device_list" I18N="In the input configuration screen"  text="Back to device list"/>
+
+                    <spacer width="50" height="10" />
+                </div>
+                <spacer width="20" height="10" />
+                <label id="conflict" proportion="1" text="" word_wrap="true" align="center"/>
             </div>
-            <spacer width="20" height="10" />
-            <label id="conflict" proportion="1" text="" word_wrap="true" align="center"/>
-        </div>
-    </box>
-</div>
-
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+        </box>
+    </div>
 
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/options_input.stkgui b/data/gui/options_input.stkgui
index e4160b3aa..e966291f1 100644
--- a/data/gui/options_input.stkgui
+++ b/data/gui/options_input.stkgui
@@ -1,40 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
+        <spacer height="15" width="10"/>
 
-    <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" x="2%" width="98%" 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_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">
-        <label width="100%"
-            I18N="In key bindings configuration menu"  
-            text="Press enter or double-click on a device to configure it"
-            text_align="center" />
+        <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" 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_controls" width="128" height="128" icon="gui/options_input.png"
+                    I18N="Section in the settings menu" text="Controls"/>
+        </tabs>
 
-        <spacer width="5" height="20"/>
-        
-        <box proportion="5" width="75%" align="center" layout="vertical-row" padding="8">
-            <list id="devices" x="0" y="0" width="100%" height="100%"/>
+        <box proportion="1" width="100%" layout="vertical-row">
+            <label width="100%"
+                I18N="In key bindings configuration menu"
+                text="Press enter or double-click on a device to configure it"
+                text_align="center" />
+
+            <spacer width="5" height="20"/>
+
+            <box proportion="5" width="75%" align="center" layout="vertical-row" padding="8">
+                <list id="devices" x="0" y="0" width="100%" height="100%"/>
+            </box>
+
+            <spacer width="50" height="25" />
+
+            <button id="add_device" I18N="In the input configuration screen"  text="Add a device" align="center"/>
+
+            <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="25" /> 
- 
-        <button id="add_device" I18N="In the input configuration screen"  text="Add a device" align="center"/>
-       
-        <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>
-</div>
-
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    </div>
 
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/options_players.stkgui b/data/gui/options_players.stkgui
index 10c26320f..d291eab90 100644
--- a/data/gui/options_players.stkgui
+++ b/data/gui/options_players.stkgui
@@ -1,52 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
+        <spacer height="15" width="10"/>
 
-    <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" x="2%" width="98%" 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"
-                I18N="Section in the settings menu" text="Players"/>
-        <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"/>
-    </tabs>
-    
-    <box proportion="1" width="100%" layout="vertical-row">
-    
-        <spacer width="5" height="5"/>
-    
-        <div layout="horizontal-row" width="75%" height="fit" align="center">
-            <spacer proportion="1"/>
-            <label text="You are playing as" height="100%"/>
-            <spacer width="2%" height="1"/>
-            <button id="playername" width="27%" align="center"/>
-            <spacer proportion="1"/>
-        </div>
-        
-        <spacer width="5" height="10"/>
-    
-        <label width="100%"
-            I18N="In players configuration menu"  
-            text="Press enter or double-click on a player to edit him/her"
-            text_align="center" />
+        <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" 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"
+                    I18N="Section in the settings menu" text="Players"/>
+            <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"/>
+        </tabs>
 
-        <spacer width="5" height="20"/>
-        <box proportion="5" width="75%" align="center" layout="vertical-row" padding="8">
-            <list id="players" x="0" y="0" width="100%" height="100%"/>
+        <box proportion="1" width="100%" layout="vertical-row">
+
+            <spacer width="5" height="5"/>
+
+            <div layout="horizontal-row" width="75%" height="fit" align="center">
+                <spacer proportion="1"/>
+                <label text="You are playing as" height="100%"/>
+                <spacer width="2%" height="1"/>
+                <button id="playername" width="27%" align="center"/>
+                <spacer proportion="1"/>
+            </div>
+
+            <spacer width="5" height="10"/>
+
+            <label width="100%"
+                I18N="In players configuration menu"
+                text="Press enter or double-click on a player to edit him/her"
+                text_align="center" />
+
+            <spacer width="5" height="20"/>
+            <box proportion="5" width="75%" align="center" layout="vertical-row" padding="8">
+                <list id="players" x="0" y="0" width="100%" height="100%"/>
+            </box>
+            <spacer width="20" height="25"/>
+
+            <button id="addplayer" x="20"
+                    I18N="In players configuration menu"
+                    text="Add Player" align="center"/>
+
+            <spacer width="20" height="15"/>
         </box>
-        <spacer width="20" height="25"/>
-        
-        <button id="addplayer" x="20"
-                I18N="In players configuration menu"  
-                text="Add Player" align="center"/>
-
-        <spacer width="20" height="15"/>
-    </box>
-</div>
-
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    </div>
 
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/options_ui.stkgui b/data/gui/options_ui.stkgui
index 2293390f5..5e411fba1 100644
--- a/data/gui/options_ui.stkgui
+++ b/data/gui/options_ui.stkgui
@@ -1,63 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
+        <spacer height="15" width="10"/>
 
-    <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" x="2%" width="98%" 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="5" width="10"/>
+        <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" 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>
 
-        <!-- ************ SKIN CHOICE ************ -->
-        <div layout="horizontal-row" width="100%" height="fit">
-            <label I18N="In the graphics settings" text="Skin" align="center"/>
-            <spacer width="20" height="20"/>
-            <spinner id="skinchoice" width="30%"/>
-        </div>
-        
-        <spacer width="20" height="18" />
-        
-        <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>
+        <box proportion="1" width="100%" layout="vertical-row">
 
-        <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="Allow STK to connect to the Internet"/>
-        </div>
+            <spacer height="5" width="10"/>
 
-        <div width="75%" height="fit" layout="horizontal-row" >
-            <checkbox id="show-login"/>
-            <spacer width="20" height="100%" />
-            <label height="100%" I18N="In the ui settings" text="Always show login screen"/>
-        </div>
+            <!-- ************ SKIN CHOICE ************ -->
+            <div layout="horizontal-row" width="100%" height="fit">
+                <label I18N="In the graphics settings" text="Skin" align="center"/>
+                <spacer width="20" height="20"/>
+                <spinner id="skinchoice" width="30%"/>
+            </div>
+
+            <spacer width="20" height="18" />
+
+            <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="Allow STK to connect to the Internet"/>
+            </div>
+
+            <div width="75%" height="fit" layout="horizontal-row" >
+                <checkbox id="show-login"/>
+                <spacer width="20" height="100%" />
+                <label height="100%" I18N="In the ui settings" text="Always show login screen"/>
+            </div>
+
+            <spacer height="18" width="4"/>
+
+            <!-- ************ LANGUAGE CHOICE ************ -->
+
+            <box proportion="1" width="75%" align="center" layout="vertical-row" padding="8">
+                <list id="language" x="0" y="0" width="100%" height="100%"/>
+            </box>
+
+            <spacer height="18" width="4"/>
 
-        <spacer height="18" width="4"/>
-        
-        <!-- ************ LANGUAGE CHOICE ************ -->
-        
-        <box proportion="1" width="75%" align="center" layout="vertical-row" padding="8">
-            <list id="language" x="0" y="0" width="100%" height="100%"/>
         </box>
-        
-        <spacer height="18" width="4"/>
-
-    </box>
-</div>
-
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    </div>
 
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/options_video.stkgui b/data/gui/options_video.stkgui
index 9f679add6..bdeb63365 100644
--- a/data/gui/options_video.stkgui
+++ b/data/gui/options_video.stkgui
@@ -1,84 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
-<div x="1%" y="1%" width="98%" height="98%" 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" x="2%" width="98%" 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"/>
-    </tabs>
-    
-    <box proportion="1" width="100%" layout="vertical-row">
-        
+        <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
         <spacer height="15" width="10"/>
 
-        <!-- ************ GRAPHICAL EFFECTS SETTINGS ************ -->
-        <div width="75%" height="fit" layout="horizontal-row" id="outer_box" >
-            <label I18N="In the graphics settings" text="Graphical Effects Level" align="center"/>
-            <spacer width="20" height="20"/>
-            
-            <div layout="vertical-row" proportion="1" height="fit" id="inner_box">
-                <gauge id="gfx_level" min_value="1" max_value="8" width="300" align="center" />
-                <spacer height="5" width="10"/>
-                <button id="custom" text="Custom settings..." I18N="In the video settings" align="center"/>
+        <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" 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"/>
+        </tabs>
+
+        <box proportion="1" width="100%" layout="vertical-row">
+
+            <spacer height="15" width="10"/>
+
+            <!-- ************ GRAPHICAL EFFECTS SETTINGS ************ -->
+            <div width="75%" height="fit" layout="horizontal-row" id="outer_box" >
+                <label I18N="In the graphics settings" text="Graphical Effects Level" align="center"/>
+                <spacer width="20" height="20"/>
+
+                <div layout="vertical-row" proportion="1" height="fit" id="inner_box">
+                    <gauge id="gfx_level" min_value="1" max_value="8" width="300" align="center" />
+                    <spacer height="5" width="10"/>
+                    <button id="custom" text="Custom settings..." I18N="In the video settings" align="center"/>
+                </div>
             </div>
-        </div>
-        
-        <spacer height="10" width="10"/>
-        
-        <!-- ************ VSYNC ************ -->
-        <div width="75%" height="fit" layout="horizontal-row" >
-            <spacer width="40" height="2" />
-            <checkbox id="vsync"/>
-            <spacer width="20" height="2" />
-            <label height="100%" I18N="In the video settings" text="Vertical Sync (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"/>
-        
-        <scrollable_ribbon id="resolutions" proportion="1" label_location="each"
-                           width="100%" square_items="false"
-                           align="center" child_width="128" child_height="128" max_height="150" />
-        
-        <spacer height="10" width="10"/>
-        
-        <div width="75%" height="fit" layout="horizontal-row" >
-            <spacer width="40" height="100%" />
-            <checkbox id="fullscreen"/>
-            <spacer width="20" height="100%" />
-            <label height="100%" I18N="In the video settings" text="Fullscreen"/>
-        </div>
-        
-        <div width="75%" layout="horizontal-row" height="fit">
-            <spacer width="40" height="100%" />
-            <checkbox id="rememberWinpos"/>
-            <spacer width="20" height="100%" />
-            <label I18N="In the video settings" text="Remember window location"/>
-        </div>
-        
-        <spacer height="10" width="10"/>
 
-        <div width="100%" height="fit" layout="horizontal-row" >
-            <spacer width="40" height="100%" />
-            <button id="apply_resolution"
-                I18N="In the video settings menu" text="Apply new resolution" />
-        </div>
-        
-        <spacer height="15" width="4"/>
-        
-    </box>
-</div>
+            <spacer height="10" width="10"/>
 
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+            <!-- ************ VSYNC ************ -->
+            <div width="75%" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="2" />
+                <checkbox id="vsync"/>
+                <spacer width="20" height="2" />
+                <label height="100%" I18N="In the video settings" text="Vertical Sync (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"/>
+
+            <scrollable_ribbon id="resolutions" proportion="1" label_location="each"
+                               width="100%" square_items="false"
+                               align="center" child_width="128" child_height="128" max_height="150" />
+
+            <spacer height="10" width="10"/>
+
+            <div width="75%" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="100%" />
+                <checkbox id="fullscreen"/>
+                <spacer width="20" height="100%" />
+                <label height="100%" I18N="In the video settings" text="Fullscreen"/>
+            </div>
+
+            <div width="75%" layout="horizontal-row" height="fit">
+                <spacer width="40" height="100%" />
+                <checkbox id="rememberWinpos"/>
+                <spacer width="20" height="100%" />
+                <label I18N="In the video settings" text="Remember window location"/>
+            </div>
+
+            <spacer height="10" width="10"/>
+
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="100%" />
+                <button id="apply_resolution"
+                    I18N="In the video settings menu" text="Apply new resolution" />
+            </div>
+
+            <spacer height="15" width="4"/>
+
+        </box>
+    </div>
+
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/overworld_dialog.stkgui b/data/gui/overworld_dialog.stkgui
index f10aa8d8e..c5bae2ba1 100644
--- a/data/gui/overworld_dialog.stkgui
+++ b/data/gui/overworld_dialog.stkgui
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
 
         <header id="title" width="100%" text_align="center" text="Paused" proportion="3" />
@@ -29,5 +29,4 @@
 
         <spacer width="20" height="35" />
     </div>
-
 </stkgui>
diff --git a/data/gui/press_a_key_dialog.stkgui b/data/gui/press_a_key_dialog.stkgui
index 3c53559dd..290772370 100644
--- a/data/gui/press_a_key_dialog.stkgui
+++ b/data/gui/press_a_key_dialog.stkgui
@@ -1,15 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
 
-<div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        <label id="title" width="100%" text_align="center" text="Press a key" proportion="1" />
 
-    <label id="title" width="100%" text_align="center" text="Press a key" proportion="1" />
+        <spacer height="25" width="10" />
 
-    <spacer height="25" width="10" />
-
-    <button id="assignEsc" I18N="When configuring input" text="Assign to ESC key" align="center"/>
-    <spacer height="10" width="10" />
-    <button id="cancel"    I18N="When configuring input" text="Press ESC to cancel" align="center"/>
-
-</div>
+        <button id="assignEsc" I18N="When configuring input" text="Assign to ESC key" align="center"/>
+        <spacer height="10" width="10" />
+        <button id="cancel"    I18N="When configuring input" text="Press ESC to cancel" align="center"/>
 
+    </div>
 </stkgui>
diff --git a/data/gui/race_paused_dialog.stkgui b/data/gui/race_paused_dialog.stkgui
index ba4dbe9f4..b31d50af8 100644
--- a/data/gui/race_paused_dialog.stkgui
+++ b/data/gui/race_paused_dialog.stkgui
@@ -1,7 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
-
         <header id="title" width="100%" text_align="center" text="Paused" proportion="3" />
 
         <!-- FIXME: some play in proportions occur below because the text of an icon
@@ -35,5 +34,4 @@
 
         <spacer width="20" height="35" />
     </div>
-
 </stkgui>
diff --git a/data/gui/race_result.stkgui b/data/gui/race_result.stkgui
index f5e680fc0..639c59951 100644
--- a/data/gui/race_result.stkgui
+++ b/data/gui/race_result.stkgui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="5%" width="100%" height="95%" layout="vertical-row" id="div">
         <roundedbox width="90%" proportion="1" align="center">
diff --git a/data/gui/racesetup.stkgui b/data/gui/racesetup.stkgui
index cd790746b..fe940123f 100644
--- a/data/gui/racesetup.stkgui
+++ b/data/gui/racesetup.stkgui
@@ -1,43 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
 
-<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="80%" text="Race Setup" align="center" text_align="center" />
-    
-    <spacer proportion="1" width="25"/>
-    
-    <div layout="horizontal-row" width="100%" height="50" align="center">
-        <bright proportion="1" height="100%"
-                I18N="In race setup menu" text="Number of AI karts" text_align="right" />
-        <spacer width="50" height="25"/>
-        <!--
-        <spinner id="aikartamount" proportion="3" height="100%" min_value="0" max_value="8" icon="gui/karts%i.png"/> -->
-        <!-- The maximum is set by stk from data/stk_config.xml. -->
-        <spinner id="aikartamount" proportion="1" height="100%" min_value="0" wrap_around="true"/>
+        <spacer proportion="1" width="25"/>
+
+        <div layout="horizontal-row" width="100%" height="50" align="center">
+            <bright proportion="1" height="100%"
+                    I18N="In race setup menu" text="Number of AI karts" text_align="right" />
+            <spacer width="50" height="25"/>
+            <!--
+            <spinner id="aikartamount" proportion="3" height="100%" min_value="0" max_value="8" icon="gui/karts%i.png"/> -->
+            <!-- The maximum is set by stk from data/stk_config.xml. -->
+            <spinner id="aikartamount" proportion="1" height="100%" min_value="0" wrap_around="true"/>
+        </div>
+
+        <spacer proportion="1" width="25"/>
+
+        <ribbon id="difficulty" height="135" width="65%" align="center">
+            <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
+                    I18N="Difficulty" text="Novice"/>
+            <icon-button id="intermediate" width="128" height="128" icon="gui/difficulty_medium.png"
+                    I18N="Difficulty" text="Intermediate"/>
+            <icon-button id="expert" width="128" height="128" icon="gui/difficulty_hard.png"
+                    I18N="Difficulty"  text="Expert"/>
+            <icon-button id="best" width="128" height="128" icon="gui/difficulty_best.png"
+                    I18N="Difficulty"  text="SuperTux"/>
+        </ribbon>
+
+        <spacer proportion="1" width="25"/>
+
+        <bright width="100%" text="Select a game mode" align="center" text_align="left" />
+
+        <scrollable_toolbar id="gamemode" height="135" width="85%" label_location="bottom" align="center"
+                            child_width="135" child_height="135" />
+        <spacer proportion="1" width="25" />
     </div>
-    
-    <spacer proportion="1" width="25"/>
-    
-    <ribbon id="difficulty" height="135" width="65%" align="center">
-        <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
-                I18N="Difficulty" text="Novice"/>
-        <icon-button id="intermediate" width="128" height="128" icon="gui/difficulty_medium.png" 
-                I18N="Difficulty" text="Intermediate"/>
-        <icon-button id="expert" width="128" height="128" icon="gui/difficulty_hard.png"
-                I18N="Difficulty"  text="Expert"/>
-        <icon-button id="best" width="128" height="128" icon="gui/difficulty_best.png"
-                I18N="Difficulty"  text="SuperTux"/>
-    </ribbon>
-    
-    <spacer proportion="1" width="25"/>
-    
-    <bright width="100%" text="Select a game mode" align="center" text_align="left" />
-
-    <scrollable_toolbar id="gamemode" height="135" width="85%" label_location="bottom" align="center"
-                        child_width="135" child_height="135" />
-    <spacer proportion="1" width="25" />
-</div>
-
-<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/select_challenge.stkgui b/data/gui/select_challenge.stkgui
index 796bc66f1..e45870601 100644
--- a/data/gui/select_challenge.stkgui
+++ b/data/gui/select_challenge.stkgui
@@ -1,46 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
 
-<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
+        <header id="title" width="80%" text="Race Setup" align="center" text_align="center" />
 
-    <header id="title" width="80%" text="Race Setup" align="center" text_align="center" />
-    
-    <spacer height="2%" width="1"/>
-    
-    <div width="100%" layout="horizontal-row" height="fit">
-        <label id="race_type" text="Type :" I18N="Type of race, in a challenge"/>
-        <spacer width="5" height="1"/>
-        <label id="race_type_val" proportion="1"/>
-    </div>
-    
-    <spacer height="2%" width="1"/>
-    
-    <div width="100%" proportion="1" layout="horizontal-row">
-        <icon-button id="novice" icon="gui/difficulty_easy.png"
-                I18N="Difficulty" text="Novice" height="100%"/>
-        <spacer width="5%" height="1"/>
-        <label id="novice_label" proportion="1" height="100%"/>
-    </div>
-    
-    <spacer height="8%" width="1"/>
-    
-    <div width="100%" proportion="1" layout="horizontal-row">
-        <icon-button id="intermediate" icon="gui/difficulty_medium.png" 
-                I18N="Difficulty" text="Intermediate" height="100%"/>
-        <spacer width="5%" height="1"/>
-        <label id="intermediate_label" proportion="1" height="100%"/>
-    </div>
-    
-    <spacer height="8%" width="1"/>
-    
-    <div width="100%" proportion="1" layout="horizontal-row">
-        <icon-button id="expert" icon="gui/difficulty_hard.png"
-                I18N="Difficulty" text="Expert" height="100%"/>
-        <spacer width="5%" height="1"/>
-        <label id="difficult_label" proportion="1" height="100%"/>
-    </div>
-    
-    <spacer height="8%" width="1"/>
+        <spacer height="2%" width="1"/>
 
-</div>
+        <div width="100%" layout="horizontal-row" height="fit">
+            <label id="race_type" text="Type :" I18N="Type of race, in a challenge"/>
+            <spacer width="5" height="1"/>
+            <label id="race_type_val" proportion="1"/>
+        </div>
 
+        <spacer height="2%" width="1"/>
+
+        <div width="100%" proportion="1" layout="horizontal-row">
+            <icon-button id="novice" icon="gui/difficulty_easy.png"
+                    I18N="Difficulty" text="Novice" height="100%"/>
+            <spacer width="5%" height="1"/>
+            <label id="novice_label" proportion="1" height="100%"/>
+        </div>
+
+        <spacer height="8%" width="1"/>
+
+        <div width="100%" proportion="1" layout="horizontal-row">
+            <icon-button id="intermediate" icon="gui/difficulty_medium.png"
+                    I18N="Difficulty" text="Intermediate" height="100%"/>
+            <spacer width="5%" height="1"/>
+            <label id="intermediate_label" proportion="1" height="100%"/>
+        </div>
+
+        <spacer height="8%" width="1"/>
+
+        <div width="100%" proportion="1" layout="horizontal-row">
+            <icon-button id="expert" icon="gui/difficulty_hard.png"
+                    I18N="Difficulty" text="Expert" height="100%"/>
+            <spacer width="5%" height="1"/>
+            <label id="difficult_label" proportion="1" height="100%"/>
+        </div>
+
+        <spacer height="8%" width="1"/>
+
+    </div>
 </stkgui>
diff --git a/data/gui/soccer_setup.stkgui b/data/gui/soccer_setup.stkgui
index d876e93a7..2ba235c4c 100644
--- a/data/gui/soccer_setup.stkgui
+++ b/data/gui/soccer_setup.stkgui
@@ -1,13 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
     <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
 
         <header width="80%" text="Race Setup" align="center" text_align="center" />
-        
+
         <spacer height="25" width="25"/>
-        
+
         <div layout="horizontal-row" width="fit" height="35" align="left">
             <bright proportion="1" height="100%"
                     I18N="In soccer setup menu" text="Number of goals to win" text_align="left" />
@@ -21,7 +21,7 @@
             <spacer width="50" height ="25">
             <spinner id="timeamount" width="200" height="90%" min_value="1" max_value="15"/>
         </div>
-        
+
         <div layout="horizontal-row" width="fit" height="35" align="left">
             <bright proportion="1" height="100%"
                     I18N="In soccer setup menu" text="Game type (Goals limit / Time limit)" text_align="left" />
@@ -30,18 +30,16 @@
         </div>
 
         <spacer height="40" width="25"/>
-        
+
         <bright height="15" width="25" I18N="In soccer setup menu" text="Use left/right to choose your team and press fire" text_align="center" align="center" />
-        
+
         <div id="central_div" layout="horizontal-row" width="100%" proportion="1" align="center">
             <roundedbox y="5%" width="100%" layout="horizontal-row" height="100%">
                 <!-- Content is added programmatically -->
             </roundedbox>
             <header id="vs" text="VS"/>     <!-- Layout is done programmatically -->
         </div>
-        
+
         <button id="continue" I18N="In soccer setup screen" text="Continue" align="center" width="60%"/>
-
     </div>
-
 </stkgui>
diff --git a/data/gui/track_info_dialog.stkgui b/data/gui/track_info_dialog.stkgui
index d93259056..1cd67f681 100644
--- a/data/gui/track_info_dialog.stkgui
+++ b/data/gui/track_info_dialog.stkgui
@@ -1,77 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="1%" y="1%" width="99%" height="99%">
+        <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
+            <label id="name" width="100%" text_align="center"/>
 
-<div x="1%" y="1%" width="99%" height="99%">
+            <spacer width="1" height="5%"/>
 
-    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
+            <div width="95%" proportion="5" layout="horizontal-row">
 
-        <label id="name" width="100%" text_align="center"/>
+            <!-- Left pane -->
+            <div proportion="1" height="100%" layout="vertical-row">
+                <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
 
-        <spacer width="1" height="5%"/>
+                <spacer width="1" height="2%"/>
 
-        <div width="95%" proportion="5" layout="horizontal-row">
-            
-        <!-- Left pane -->
-        <div proportion="1" height="100%" layout="vertical-row">
-            <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
-            
-            <spacer width="1" height="2%"/>
-            
-            <div width="95%" height="fit" layout="horizontal-row">
-            <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
-            <spacer width="2%" height="1"/>
-            <label id="highscore1" proportion="1" text="(Empty)"/>
+                <div width="95%" height="fit" layout="horizontal-row">
+                <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
+                <spacer width="2%" height="1"/>
+                <label id="highscore1" proportion="1" text="(Empty)"/>
+                </div>
+
+                <spacer width="1" height="2%"/>
+
+                <div width="95%" height="fit" layout="horizontal-row">
+                <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
+                <spacer width="2%" height="1"/>
+                <label id="highscore2" proportion="1" text="(Empty)"/>
+                </div>
+
+                <spacer width="1" height="2%"/>
+
+                <div width="95%" height="fit" layout="horizontal-row">
+                <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
+                <spacer width="2%" height="1"/>
+                <label id="highscore3" proportion="1" text="(Empty)"/>
+                </div>
+
+                <spacer width="1" proportion="1"/>
+
+                <label id="author" width="100%" text_align="center" word_wrap="true"/>
             </div>
-            
-            <spacer width="1" height="2%"/>
-            
-            <div width="95%" height="fit" layout="horizontal-row">
-            <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
-            <spacer width="2%" height="1"/>
-            <label id="highscore2" proportion="1" text="(Empty)"/>
+
+            <!-- Right pane -->
+            <div proportion="1" height="100%" layout="vertical-row">
+                <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
+                </placeholder>
+                <div width="75%" height="fit" layout="horizontal-row" >
+                    <spacer proportion="1" height="2" />
+                    <checkbox id="reverse"/>
+                    <spacer width="20" height="2" />
+                    <label id="reverse-text" height="100%" I18N="Drive the track reverse" text="Reverse"/>
+                    <spacer proportion="1" height="2" />
+                </div>
+
             </div>
-            
-            <spacer width="1" height="2%"/>
-            
-            <div width="95%" height="fit" layout="horizontal-row">
-            <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
-            <spacer width="2%" height="1"/>
-            <label id="highscore3" proportion="1" text="(Empty)"/>
             </div>
-            
-            <spacer width="1" proportion="1"/>
-            
-            <label id="author" width="100%" text_align="center" word_wrap="true"/>
+
+            <spacer width="1" height="5%"/>
+
+            <spinner id="lapcountspinner" width="50%" min_value="1" max_value="20" align="center" wrap_around="true"
+                I18N="In the track setup screen (number of laps choice, where %i is the number)" text="%i laps"/>
+
+            <spacer width="1" height="5%"/>
+
+            <button id="start" text="Start Race" align="center"/>
+
+            <spacer width="1" height="2%"/>
         </div>
 
-        <!-- Right pane -->
-        <div proportion="1" height="100%" layout="vertical-row">
-            <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
-            </placeholder>
-            <div width="75%" height="fit" layout="horizontal-row" >
-                <spacer proportion="1" height="2" />
-                <checkbox id="reverse"/>
-                <spacer width="20" height="2" />
-                <label id="reverse-text" height="100%" I18N="Drive the track reverse" text="Reverse"/>
-                <spacer proportion="1" height="2" />
-            </div>
-            
-        </div>
-        </div>
-
-        <spacer width="1" height="5%"/>
-
-        <spinner id="lapcountspinner" width="50%" min_value="1" max_value="20" align="center" wrap_around="true"
-            I18N="In the track setup screen (number of laps choice, where %i is the number)" text="%i laps"/>
-
-        <spacer width="1" height="5%"/>
-
-        <button id="start" text="Start Race" align="center"/>
-
-        <spacer width="1" height="2%"/>
+        <icon-button id="closePopup" x="0" y="0" width="8%" height="8%" icon="gui/back.png"/>
     </div>
-    
-    <icon-button id="closePopup" x="0" y="0" width="8%" height="8%" icon="gui/back.png"/>
-
-</div>
 </stkgui>
diff --git a/data/gui/tracks.stkgui b/data/gui/tracks.stkgui
index a3f40d7a8..07b29ff48 100644
--- a/data/gui/tracks.stkgui
+++ b/data/gui/tracks.stkgui
@@ -1,31 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-<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" >
 
-<div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
+        <header width="80%" I18N="Section in track selection screen" text="Grand Prix"
+                align="center" text_align="center" />
 
-    <header width="80%" I18N="Section in track selection screen" text="Grand Prix"
-            align="center" text_align="center" />
+        <box width="100%" height="195" padding="0">
+            <scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
+                                square_items="true" child_width="160" child_height="120" />
+        </box>
 
-    <box width="100%" height="195" padding="0">
-        <scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
-                            square_items="true" child_width="160" child_height="120" />
-    </box>
-    
-    <header width="100%" I18N="Section in track selection screen" text="All Tracks"
-            align="center" text_align="center" />
-    
-    <box proportion="1" width="100%" layout="vertical-row" padding="1">
-        <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true" 
-            label_location="bottom" align="center" max_rows="4"
-            child_width="160" child_height="120" />
-        <spacer width="20" height="13" />
-    </box>
+        <header width="100%" I18N="Section in track selection screen" text="All Tracks"
+                align="center" text_align="center" />
 
-    <!-- Populated dynamically at runtime -->
-    <tabs width="100%" height="25" id="trackgroups"> </tabs>
-    
-    <spacer width="100%" height="2%" />
-</div>
+        <box proportion="1" width="100%" layout="vertical-row" padding="1">
+            <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
+                label_location="bottom" align="center" max_rows="4"
+                child_width="160" child_height="120" />
+            <spacer width="20" height="13" />
+        </box>
 
-</stkgui>
\ No newline at end of file
+        <!-- Populated dynamically at runtime -->
+        <tabs width="100%" height="25" id="trackgroups"> </tabs>
+
+        <spacer width="100%" height="2%" />
+    </div>
+</stkgui>
diff --git a/data/gui/tutorial.stkgui b/data/gui/tutorial.stkgui
index 08c7def60..a8b92bc03 100644
--- a/data/gui/tutorial.stkgui
+++ b/data/gui/tutorial.stkgui
@@ -1,21 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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 tutorials screen" text="Tutorial : Selection Room" text_align="center" width="100%" />
-        
+
         <spacer proportion="1" width="100%"/>
-        
+
         <list id="tutorials" proportion="5" width="75%" align="center"/>
-        
+
         <spacer proportion="1" width="100%"/>
         <spacer width="100%" height="45"/>
 
     </div>
-    
+
     <button id="play" x="-200" y="-40" height="35" align="right" text="Play all"/>
-
-
-</stkgui>
\ No newline at end of file
+</stkgui>
diff --git a/data/gui/tutorial_message_dialog.stkgui b/data/gui/tutorial_message_dialog.stkgui
index 68f2d0586..532fec307 100644
--- a/data/gui/tutorial_message_dialog.stkgui
+++ b/data/gui/tutorial_message_dialog.stkgui
@@ -1,12 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
+    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        <label id="title" width="100%" text_align="left" word_wrap="true" proportion="1" />
 
-<div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
-
-    <label id="title" width="100%" text_align="left" word_wrap="true" proportion="1" />
-
-    <spacer height="10" width="10" />
-    
-    <button id="continue" I18N="Button in tutorial" text="Continue" align="right"/>
-</div>
+        <spacer height="10" width="10" />
 
+        <button id="continue" I18N="Button in tutorial" text="Continue" align="right"/>
+    </div>
 </stkgui>
diff --git a/data/gui/user_screen.stkgui b/data/gui/user_screen.stkgui
index d4a285dbd..da38ed107 100644
--- a/data/gui/user_screen.stkgui
+++ b/data/gui/user_screen.stkgui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
@@ -61,6 +62,6 @@
         </box>
         <spacer width="20" height="15"/>
     </div>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/gui/user_screen_tab.stkgui b/data/gui/user_screen_tab.stkgui
index 1b6000daa..37f0fe980 100644
--- a/data/gui/user_screen_tab.stkgui
+++ b/data/gui/user_screen_tab.stkgui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
@@ -13,7 +14,7 @@
             <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"/>
         </tabs>
 
-        <box proportion="1" width="98%" layout="vertical-row">
+        <box proportion="1" width="100%" layout="vertical-row">
 
             <spacer height="15" width="10"/>
 
@@ -55,7 +56,7 @@
                 <label id="message" width="80%" align="center" text_align="left"/>
             </div>
             <spacer width="20" height="25"/>
-            <buttonbar id="options" width="90%" height="13%" align="bottom">
+            <buttonbar id="options" width="90%" height="13%" align="center">
                 <icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
                              I18N="Login dialog" text="OK" label_location="bottom"/>
                 <icon-button id="new_user" width="64" height="64" icon="gui/gp_add_track.png"
@@ -68,8 +69,7 @@
                              I18N="Login dialog" text="Cancel" label_location="bottom"/>
             </buttonbar>
         </box>
-        <spacer width="20" height="15"/>
     </div>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>
diff --git a/data/shaders/fog.frag b/data/shaders/fog.frag
index 75101c7a1..fc6380e65 100644
--- a/data/shaders/fog.frag
+++ b/data/shaders/fog.frag
@@ -12,6 +12,7 @@ uniform mat4 ViewMatrix;
 uniform mat4 ProjectionMatrix;
 uniform mat4 InverseViewMatrix;
 uniform mat4 InverseProjectionMatrix;
+uniform vec2 screen;
 #else
 layout (std140) uniform MatrixesData
 {
diff --git a/data/shaders/gi.frag b/data/shaders/gi.frag
index 92f9e0804..b6983b4f2 100644
--- a/data/shaders/gi.frag
+++ b/data/shaders/gi.frag
@@ -12,6 +12,7 @@ uniform sampler3D SHB;
 uniform float R_wcs = 10.;
 uniform vec3 extents;
 uniform mat4 RHMatrix;
+uniform mat4 InvRHMatrix;
 
 layout (std140) uniform MatrixesData
 {
@@ -55,7 +56,7 @@ void main()
     if (depth==1.0) discard;
 
     vec4 pos_screen_space = getPosFromUVDepth(vec3(uv, depth), InverseProjectionMatrix);
-    vec4 tmp = (inverse(RHMatrix) * InverseViewMatrix * pos_screen_space);
+    vec4 tmp = (InvRHMatrix * InverseViewMatrix * pos_screen_space);
     vec3 pos = tmp.xyz / tmp.w;
     vec3 normal_screen_space = normalize(DecodeNormal(2. * texture(ntex, uv).xy - 1.));
     vec3 normal = (transpose(ViewMatrix) * vec4(normal_screen_space, 0.)).xyz;
diff --git a/data/shaders/sunlight.frag b/data/shaders/sunlight.frag
index df21bd238..5ec6061e7 100644
--- a/data/shaders/sunlight.frag
+++ b/data/shaders/sunlight.frag
@@ -13,6 +13,7 @@ uniform mat4 ViewMatrix;
 uniform mat4 ProjectionMatrix;
 uniform mat4 InverseViewMatrix;
 uniform mat4 InverseProjectionMatrix;
+uniform vec2 screen;
 #else
 layout (std140) uniform MatrixesData
 {
diff --git a/data/shaders/sunlightshadow.frag b/data/shaders/sunlightshadow.frag
index 311889ab0..194a68333 100644
--- a/data/shaders/sunlightshadow.frag
+++ b/data/shaders/sunlightshadow.frag
@@ -16,6 +16,7 @@ uniform mat4 ProjectionMatrix;
 uniform mat4 InverseViewMatrix;
 uniform mat4 InverseProjectionMatrix;
 uniform mat4 ShadowViewProjMatrixes[4];
+uniform vec2 screen;
 #else
 layout (std140) uniform MatrixesData
 {
diff --git a/data/shaders/tonemap.frag b/data/shaders/tonemap.frag
index fe2fc5ea7..c0a183da8 100644
--- a/data/shaders/tonemap.frag
+++ b/data/shaders/tonemap.frag
@@ -43,5 +43,12 @@ void main()
     // Uncharted2 tonemap with Auria's custom coefficients
     vec4 perChannel = (col * (6.9 * col + .5)) / (col * (5.2 * col + 1.7) + 0.06);
     perChannel = pow(perChannel, vec4(2.2));
-    FragColor = vec4(perChannel.xyz, col.a);
+    
+    vec2 inside = uv - 0.5;
+    float vignette = 1 - dot(inside, inside);    
+    vignette = clamp(pow(vignette, 0.8), 0., 1.);
+    //vignette = clamp(vignette + vignette - 0.5, 0., 1.15);
+
+    
+    FragColor = vec4(perChannel.xyz * vignette, col.a);
 }
diff --git a/lib/bullet/src/LinearMath/btScalar.h b/lib/bullet/src/LinearMath/btScalar.h
index 7d54bf5ad..f601e3a90 100644
--- a/lib/bullet/src/LinearMath/btScalar.h
+++ b/lib/bullet/src/LinearMath/btScalar.h
@@ -109,7 +109,7 @@ inline int	btGetVersion()
 #ifdef __SPU__
 #include <spu_printf.h>
 #define printf spu_printf
-	#define btAssert(x) {if(!(x)){printf("Assert "__FILE__ ":%u ("#x")\n", __LINE__);spu_hcmpeq(0,0);}}
+	#define btAssert(x) {if(!(x)){printf("Assert " __FILE__ ":%u ("#x")\n", __LINE__);spu_hcmpeq(0,0);}}
 #else
 	#define btAssert assert
 #endif
diff --git a/sources.cmake b/sources.cmake
index fd74b86e3..595e1c12f 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file.
 # This will then trigger a new cmake run automatically.
-file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
+file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/achievements/achievements_status.cpp b/src/achievements/achievements_status.cpp
index 3c883bbd4..400f9a6cd 100644
--- a/src/achievements/achievements_status.cpp
+++ b/src/achievements/achievements_status.cpp
@@ -22,6 +22,7 @@
 
 #include "achievements/achievement_info.hpp"
 #include "achievements/achievements_manager.hpp"
+#include "config/player_manager.hpp"
 #include "io/utf_writer.hpp"
 #include "utils/log.hpp"
 #include "utils/ptr_vector.hpp"
@@ -112,14 +113,48 @@ Achievement * AchievementsStatus::getAchievement(uint32_t id)
 }   // getAchievement
 
 // ----------------------------------------------------------------------------
+/** Synchronises the achievements between local and online usage. It takes
+ *  the list of online achievements, and marks them all to be achieved 
+ *  locally. Then it issues 'achieved' requests to the server for all local
+ *  achievements that are not set online.
+*/
 void AchievementsStatus::sync(const std::vector<uint32_t> & achieved_ids)
 {
+    std::vector<bool> done;
     for(unsigned int i =0; i < achieved_ids.size(); ++i)
     {
+        if(done.size()< achieved_ids[i]+1)
+            done.resize(achieved_ids[i]+1);
+        done[achieved_ids[i]] = true;
         Achievement * achievement = getAchievement(achieved_ids[i]);
         if(achievement != NULL)
             achievement->setAchieved();
     }
+
+    std::map<uint32_t, Achievement*>::iterator i;
+
+    // String to collect all local ids that are not synched
+    // to the online account
+    std::string ids;
+    for(i=m_achievements.begin(); i!=m_achievements.end(); i++)
+    {
+        unsigned int id = i->second->getID();
+        if(i->second->isAchieved() && (id>=done.size() || !done[id]) )
+        {
+            ids=ids+StringUtils::toString(id)+",";
+        }
+    }
+
+    if(ids.size()>0)
+    {
+        ids = ids.substr(0, ids.size() - 1); // delete the last "," in the string
+        Log::info("Achievements", "Synching achievement %d to server.",
+                  ids.c_str());
+        Online::HTTPRequest * request = new Online::HTTPRequest(true, 2);
+        PlayerManager::setUserDetails(request, "achieving");
+        request->addParameter("achievementid", ids);
+        request->queue();
+    }
 }   // sync
 
 // ----------------------------------------------------------------------------
@@ -132,6 +167,7 @@ void AchievementsStatus::onRaceEnd()
     }
 }   // onRaceEnd
 
+// ----------------------------------------------------------------------------
 void AchievementsStatus::onLapEnd()
 {
     //reset all values that need to be reset
diff --git a/src/animations/animation_base.hpp b/src/animations/animation_base.hpp
index 2bc335bc3..1fc6ef090 100644
--- a/src/animations/animation_base.hpp
+++ b/src/animations/animation_base.hpp
@@ -69,6 +69,7 @@ protected:
 public:
                  AnimationBase(const XMLNode &node);
                  AnimationBase(Ipo *ipo);
+    virtual      ~AnimationBase() {}
     virtual void update(float dt, Vec3 *xyz=NULL, Vec3 *hpr=NULL,
                                   Vec3 *scale=NULL);
     /** This needs to be implemented by the inheriting classes. It is called
diff --git a/src/config/player_manager.cpp b/src/config/player_manager.cpp
index 0455fab3c..af4e0bc63 100644
--- a/src/config/player_manager.cpp
+++ b/src/config/player_manager.cpp
@@ -166,15 +166,12 @@ PlayerManager::PlayerManager()
  */
 PlayerManager::~PlayerManager()
 {
-    // If the passwords should not be remembered, clear all saved sessions.
-    if(!UserConfigParams::m_remember_user)
+    // If the passwords should not be remembered, clear the saved session.
+    PlayerProfile *player;
+    for_in(player, m_all_players)
     {
-        PlayerProfile *player;
-        for_in(player, m_all_players)
-        {
+        if(!player->rememberPassword())
             player->clearSession();
-        }
-
     }
     save();
 
@@ -266,7 +263,7 @@ void PlayerManager::save()
         players_file << L"<?xml version=\"1.0\"?>\n";
         players_file << L"<players version=\"1\" >\n";
 
-        if(m_current_player && UserConfigParams::m_remember_user)
+        if(m_current_player)
         {
             players_file << L"    <current player=\""
                          << m_current_player->getName() << L"\"/>\n";
diff --git a/src/config/player_profile.cpp b/src/config/player_profile.cpp
index fe7d47077..c5fdcabe5 100644
--- a/src/config/player_profile.cpp
+++ b/src/config/player_profile.cpp
@@ -47,6 +47,7 @@ PlayerProfile::PlayerProfile(const core::stringw& name, bool is_guest)
     m_saved_user_id       = 0;
     m_last_online_name    = "";
     m_last_was_online     = false;
+    m_remember_password   = false;
     initRemainingData();
 }   // PlayerProfile
 
@@ -72,20 +73,22 @@ PlayerProfile::PlayerProfile(const XMLNode* node)
     m_saved_user_id       = 0;
     m_last_online_name    = "";
     m_last_was_online     = false;
+    m_remember_password   = false;
     m_story_mode_status   = NULL;
     m_achievements_status = NULL;
     m_icon_filename       = "";
 
-    node->get("name",             &m_local_name      );
-    node->get("guest",            &m_is_guest_account);
-    node->get("use-frequency",    &m_use_frequency   );
-    node->get("unique-id",        &m_unique_id       );
-    node->get("saved-session",    &m_saved_session   );
-    node->get("saved-user",       &m_saved_user_id   );
-    node->get("saved-token",      &m_saved_token     );
-    node->get("last-online-name", &m_last_online_name);
-    node->get("last-was-online",  &m_last_was_online );
-    node->get("icon-filename",    &m_icon_filename   );
+    node->get("name",              &m_local_name       );
+    node->get("guest",             &m_is_guest_account );
+    node->get("use-frequency",     &m_use_frequency    );
+    node->get("unique-id",         &m_unique_id        );
+    node->get("saved-session",     &m_saved_session    );
+    node->get("saved-user",        &m_saved_user_id    );
+    node->get("saved-token",       &m_saved_token      );
+    node->get("last-online-name",  &m_last_online_name );
+    node->get("last-was-online",   &m_last_was_online  );
+    node->get("remember-password", &m_remember_password);
+    node->get("icon-filename",     &m_icon_filename    );
 
     #ifdef DEBUG
     m_magic_number = 0xABCD1234;
@@ -203,7 +206,8 @@ void PlayerProfile::save(UTFWriter &out)
     out << L"            saved-user=\"" << m_saved_user_id
         << L"\" saved-token=\""         << m_saved_token << L"\"\n";
     out << L"            last-online-name=\"" << m_last_online_name
-        << L"\" last-was-online=\""           << m_last_was_online<< L"\">\n";
+        << L"\" last-was-online=\""           << m_last_was_online << L"\"\n";
+    out << L"            remember-password=\""         << m_remember_password << L"\">\n";
     {
         if(m_story_mode_status)
             m_story_mode_status->save(out);
diff --git a/src/config/player_profile.hpp b/src/config/player_profile.hpp
index a4c5ab3c7..6625e211f 100644
--- a/src/config/player_profile.hpp
+++ b/src/config/player_profile.hpp
@@ -101,6 +101,9 @@ private:
     /** True if the last time this player was used as online. */
     bool m_last_was_online;
 
+    /** True if the login data are saved. */
+    bool m_remember_password;
+
     /** The complete challenge state. */
     StoryModeStatus *m_story_mode_status;
 
@@ -212,7 +215,10 @@ public:
     // ------------------------------------------------------------------------
     bool isFirstTime() const { return m_story_mode_status->isFirstTime(); }
     // ------------------------------------------------------------------------
-    void clearUnlocked() { m_story_mode_status->clearUnlocked(); }
+    void clearUnlocked()
+    {
+        m_story_mode_status->clearUnlocked();
+    }
     // ------------------------------------------------------------------------
     /** Returns the current challenge for this player. */
     const ChallengeStatus* getCurrentChallengeStatus() const
@@ -248,6 +254,8 @@ public:
     /** Returns true if a session was saved for this player. */
     bool hasSavedSession() const { return m_saved_session;  }
     // ------------------------------------------------------------------------
+    StoryModeStatus* getStoryModeStatus() { return m_story_mode_status; }
+    // ------------------------------------------------------------------------
     /** If a session was saved, return the id of the saved user. */
     int getSavedUserId() const
     {
@@ -269,6 +277,13 @@ public:
     /** Sets if this player was logged in last time it was used. */
     void setWasOnlineLastTime(bool b) { m_last_was_online = b; }
     // ------------------------------------------------------------------------
+    /** Returns if the last time this player was used it was used online or
+     *  offline. */
+    bool rememberPassword() const { return m_remember_password; }
+    // ------------------------------------------------------------------------
+    /** Sets if this player was logged in last time it was used. */
+    void setRememberPassword(bool b) { m_remember_password = b; }
+    // ------------------------------------------------------------------------
 };   // class PlayerProfile
 
 #endif
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index bf91d0ddc..bf65f4633 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -682,10 +682,6 @@ namespace UserConfigParams
 
     // ---- User managerment
 
-    PARAM_PREFIX BoolUserConfigParam        m_remember_user
-            PARAM_DEFAULT(  BoolUserConfigParam(true, "remember_me",
-                                               "Automatically remember login data"));
-
     PARAM_PREFIX BoolUserConfigParam        m_always_show_login_screen
             PARAM_DEFAULT(  BoolUserConfigParam(false, "always_show_login_screen",
           "Always show the login screen even if last player's session was saved."));
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 45c51a279..516be8203 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -532,7 +532,7 @@ unsigned GPUTimer::elapsedTimeus()
 FrameBuffer::FrameBuffer() {}
 
 FrameBuffer::FrameBuffer(const std::vector<GLuint> &RTTs, size_t w, size_t h, bool layered) :
-    DepthTexture(0), RenderTargets(RTTs), width(w), height(h)
+    RenderTargets(RTTs), DepthTexture(0), width(w), height(h)
 {
     glGenFramebuffers(1, &fbo);
     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
@@ -551,7 +551,7 @@ FrameBuffer::FrameBuffer(const std::vector<GLuint> &RTTs, size_t w, size_t h, bo
 }
 
 FrameBuffer::FrameBuffer(const std::vector<GLuint> &RTTs, GLuint DS, size_t w, size_t h, bool layered) :
-    DepthTexture(DS), RenderTargets(RTTs), width(w), height(h)
+    RenderTargets(RTTs), DepthTexture(DS), width(w), height(h)
 {
     glGenFramebuffers(1, &fbo);
     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
@@ -904,4 +904,4 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
     glUseProgram(0);
 
     glGetError();
-}
\ No newline at end of file
+}
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index dc06527bd..bfffa6c3c 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -83,12 +83,16 @@ enum TypeFBO
     FBO_COLORS,
     FBO_LOG_LUMINANCE,
     FBO_MLAA_COLORS,
+    FBO_MLAA_BLEND,
+    FBO_MLAA_TMP,
     FBO_TMP1_WITH_DS,
     FBO_TMP2_WITH_DS,
     FBO_TMP4,
     FBO_LINEAR_DEPTH,
     FBO_HALF1,
+    FBO_HALF1_R,
     FBO_HALF2,
+    FBO_HALF2_R,
     FBO_QUARTER1,
     FBO_QUARTER2,
     FBO_EIGHTH1,
@@ -123,6 +127,8 @@ enum QueryPerf
     Q_BLOOM,
     Q_TONEMAP,
     Q_MOTIONBLUR,
+    Q_MLAA,
+    Q_GUI,
     Q_LAST
 };
 
@@ -139,6 +145,8 @@ enum TypeRTT
 
     RTT_HALF1,
     RTT_HALF2,
+    RTT_HALF1_R,
+    RTT_HALF2_R,
 
     RTT_QUARTER1,
     RTT_QUARTER2,
@@ -165,6 +173,8 @@ enum TypeRTT
 
     RTT_DISPLACE,
     RTT_MLAA_COLORS,
+    RTT_MLAA_BLEND,
+    RTT_MLAA_TMP,
 
     RTT_BLOOM_1024,
     RTT_BLOOM_512,
diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp
index ad2be7b1a..821654cb1 100644
--- a/src/graphics/material.cpp
+++ b/src/graphics/material.cpp
@@ -137,7 +137,7 @@ Material::Material(const XMLNode *node, int index, bool deprecated)
     node->get("fog",              &m_fog               );
 
     node->get("mask",             &m_mask              );
-
+    node->get("gloss-map",        &m_gloss_map         );
     node->get("water-splash",     &m_water_splash      );
     node->get("jump",             &m_is_jump_texture   );
     node->get("has-gravity",      &m_has_gravity       );
diff --git a/src/graphics/material.hpp b/src/graphics/material.hpp
index ab1ec0a17..7de754e6e 100644
--- a/src/graphics/material.hpp
+++ b/src/graphics/material.hpp
@@ -224,6 +224,8 @@ private:
     /** If m_splatting is true, indicates the fourth splatting texture */
     std::string      m_splatting_texture_4;
 
+    std::string      m_gloss_map;
+
     bool  m_deprecated;
 
     void  init    (unsigned int index);
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 3c8958050..648e76301 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -244,6 +244,8 @@ void PostProcessing::renderDiffuseEnvMap(const float *bSHCoeff, const float *gSH
 
 void PostProcessing::renderGI(const core::matrix4 &RHMatrix, const core::vector3df &rh_extend, GLuint shr, GLuint shg, GLuint shb)
 {
+    core::matrix4 InvRHMatrix;
+    RHMatrix.getInverse(InvRHMatrix);
     glDisable(GL_DEPTH_TEST);
     glUseProgram(FullScreenShader::GlobalIlluminationReconstructionShader::Program);
     glBindVertexArray(FullScreenShader::GlobalIlluminationReconstructionShader::vao);
@@ -267,7 +269,7 @@ void PostProcessing::renderGI(const core::matrix4 &RHMatrix, const core::vector3
     }
     setTexture(3, irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), GL_NEAREST, GL_NEAREST);
     setTexture(4, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
-    FullScreenShader::GlobalIlluminationReconstructionShader::setUniforms(RHMatrix, rh_extend, 3, 4, 0, 1, 2);
+    FullScreenShader::GlobalIlluminationReconstructionShader::setUniforms(RHMatrix, InvRHMatrix, rh_extend, 3, 4, 0, 1, 2);
     glDrawArrays(GL_TRIANGLES, 0, 3);
 }
 
@@ -400,7 +402,9 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
     assert(in_fbo.getWidth() == auxiliary.getWidth() && in_fbo.getHeight() == auxiliary.getHeight());
     float inv_width = 1.0f / in_fbo.getWidth(), inv_height = 1.0f / in_fbo.getHeight();
     {
+#if WIN32
         if (irr_driver->getGLSLVersion() < 430)
+#endif
         {
             auxiliary.Bind();
             glUseProgram(FullScreenShader::Gaussian17TapHShader::Program);
@@ -415,8 +419,10 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
 
             glDrawArrays(GL_TRIANGLES, 0, 3);
         }
+#if WIN32
         else
         {
+
             glUseProgram(FullScreenShader::ComputeGaussian17TapHShader::Program);
             glBindImageTexture(0, in_fbo.getRTT()[0], 0, false, 0, GL_READ_ONLY, GL_R16F);
             glBindImageTexture(1, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
@@ -424,9 +430,12 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
             glUniform1i(FullScreenShader::ComputeGaussian17TapHShader::uniform_dest, 1);
             glDispatchCompute(in_fbo.getWidth() / 8, in_fbo.getHeight() / 8, 1);
         }
+#endif
     }
     {
+#if WIN32
         if (irr_driver->getGLSLVersion() < 430)
+#endif
         {
             in_fbo.Bind();
             glUseProgram(FullScreenShader::Gaussian17TapVShader::Program);
@@ -441,6 +450,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
 
             glDrawArrays(GL_TRIANGLES, 0, 3);
         }
+#if WIN32
         else
         {
             glUseProgram(FullScreenShader::ComputeGaussian17TapVShader::Program);
@@ -450,6 +460,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
             glUniform1i(FullScreenShader::ComputeGaussian17TapVShader::uniform_dest, 1);
             glDispatchCompute(in_fbo.getWidth() / 8, in_fbo.getHeight() / 8, 1);
         }
+#endif
     }
 }
 
@@ -639,7 +650,7 @@ void PostProcessing::applyMLAA()
 {
     const core::vector2df &PIXEL_SIZE = core::vector2df(1.0f / UserConfigParams::m_width, 1.0f / UserConfigParams::m_height);
     IVideoDriver *const drv = irr_driver->getVideoDriver();
-    irr_driver->getFBO(FBO_TMP1_WITH_DS).Bind();
+    irr_driver->getFBO(FBO_MLAA_TMP).Bind();
     glEnable(GL_STENCIL_TEST);
     glClearColor(0.0, 0.0, 0.0, 1.0);
     glClear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
@@ -658,11 +669,11 @@ void PostProcessing::applyMLAA()
     glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
 
     // Pass 2: blend weights
-    irr_driver->getFBO(FBO_TMP2_WITH_DS).Bind();
+    irr_driver->getFBO(FBO_MLAA_BLEND).Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
     glUseProgram(FullScreenShader::MLAABlendWeightSHader::Program);
-    setTexture(0, irr_driver->getRenderTargetTexture(RTT_TMP1), GL_LINEAR, GL_LINEAR);
+    setTexture(0, irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), GL_LINEAR, GL_LINEAR);
     setTexture(1, getTextureGLuint(m_areamap), GL_NEAREST, GL_NEAREST);
     FullScreenShader::MLAABlendWeightSHader::setUniforms(PIXEL_SIZE, 0, 1);
 
@@ -670,14 +681,14 @@ void PostProcessing::applyMLAA()
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
     // Blit in to tmp1
-    FrameBuffer::Blit(irr_driver->getFBO(FBO_MLAA_COLORS), irr_driver->getFBO(FBO_TMP1_WITH_DS));
+    FrameBuffer::Blit(irr_driver->getFBO(FBO_MLAA_COLORS), irr_driver->getFBO(FBO_MLAA_TMP));
 
     // Pass 3: gather
     irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
 
     glUseProgram(FullScreenShader::MLAAGatherSHader::Program);
-    setTexture(0, irr_driver->getRenderTargetTexture(RTT_TMP1), GL_NEAREST, GL_NEAREST);
-    setTexture(1, irr_driver->getRenderTargetTexture(RTT_TMP2), GL_NEAREST, GL_NEAREST);
+    setTexture(0, irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), GL_NEAREST, GL_NEAREST);
+    setTexture(1, irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND), GL_NEAREST, GL_NEAREST);
     FullScreenShader::MLAAGatherSHader::setUniforms(PIXEL_SIZE, 0, 1);
 
     glBindVertexArray(FullScreenShader::MLAAGatherSHader::vao);
@@ -685,7 +696,6 @@ void PostProcessing::applyMLAA()
 
     // Done.
     glDisable(GL_STENCIL_TEST);
-
 }
 
 // ----------------------------------------------------------------------------
@@ -850,17 +860,19 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode)
         PROFILER_POP_CPU_MARKER();
     }
 
+    glEnable(GL_FRAMEBUFFER_SRGB);
+    irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
+    renderPassThrough(in_fbo->getRTT()[0]);
+    out_fbo = &irr_driver->getFBO(FBO_MLAA_COLORS);
+
     if (UserConfigParams::m_mlaa) // MLAA. Must be the last pp filter.
     {
         PROFILER_PUSH_CPU_MARKER("- MLAA", 0xFF, 0x00, 0x00);
-        glEnable(GL_FRAMEBUFFER_SRGB);
-        irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
-        renderPassThrough(in_fbo->getRTT()[0]);
-        glDisable(GL_FRAMEBUFFER_SRGB);
+        ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_MLAA));
         applyMLAA();
-        out_fbo = &irr_driver->getFBO(FBO_MLAA_COLORS);
         PROFILER_POP_CPU_MARKER();
     }
+    glDisable(GL_FRAMEBUFFER_SRGB);
 
     return out_fbo;
 }   // render
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 170972a1d..89a1b46aa 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -187,13 +187,10 @@ void IrrDriver::renderGLSL(float dt)
         {
             FrameBuffer *fbo = m_post_processing->render(camnode);
 
-            if (!UserConfigParams::m_mlaa) // MLAA_COLORS already in srgb space
-                glEnable(GL_FRAMEBUFFER_SRGB);
-
             if (irr_driver->getNormals())
                 irr_driver->getFBO(FBO_NORMAL_AND_DEPTHS).BlitToDefault(viewport.UpperLeftCorner.X, viewport.UpperLeftCorner.Y, viewport.LowerRightCorner.X, viewport.LowerRightCorner.Y);
             else if (irr_driver->getSSAOViz())
-                irr_driver->getFBO(FBO_SSAO).BlitToDefault(viewport.UpperLeftCorner.X, viewport.UpperLeftCorner.Y, viewport.LowerRightCorner.X, viewport.LowerRightCorner.Y);
+                irr_driver->getFBO(FBO_HALF1_R).BlitToDefault(viewport.UpperLeftCorner.X, viewport.UpperLeftCorner.Y, viewport.LowerRightCorner.X, viewport.LowerRightCorner.Y);
             else if (irr_driver->getRSM())
             {
                 glBindFramebuffer(GL_FRAMEBUFFER, 0);
@@ -202,9 +199,6 @@ void IrrDriver::renderGLSL(float dt)
             }
             else
                 fbo->BlitToDefault(viewport.UpperLeftCorner.X, viewport.UpperLeftCorner.Y, viewport.LowerRightCorner.X, viewport.LowerRightCorner.Y);
-
-            if (!UserConfigParams::m_mlaa)
-                glDisable(GL_FRAMEBUFFER_SRGB);
         }
         else
             glDisable(GL_FRAMEBUFFER_SRGB);
@@ -235,10 +229,13 @@ void IrrDriver::renderGLSL(float dt)
         PROFILER_POP_CPU_MARKER();
     }  // for i<getNumKarts
 
-    PROFILER_PUSH_CPU_MARKER("GUIEngine", 0x75, 0x75, 0x75);
-    // Either render the gui, or the global elements of the race gui.
-    GUIEngine::render(dt);
-    PROFILER_POP_CPU_MARKER();
+    {
+        ScopedGPUTimer Timer(getGPUTimer(Q_GUI));
+        PROFILER_PUSH_CPU_MARKER("GUIEngine", 0x75, 0x75, 0x75);
+        // Either render the gui, or the global elements of the race gui.
+        GUIEngine::render(dt);
+        PROFILER_POP_CPU_MARKER();
+    }
 
     // Render the profiler
     if(UserConfigParams::m_profiler_enabled)
@@ -600,7 +597,7 @@ void IrrDriver::renderSolidSecondPass()
     GroupedSM<SM_UNTEXTURED>::reset();
     setTexture(0, m_rtts->getRenderTarget(RTT_TMP1), GL_NEAREST, GL_NEAREST);
     setTexture(1, m_rtts->getRenderTarget(RTT_TMP2), GL_NEAREST, GL_NEAREST);
-    setTexture(2, m_rtts->getRenderTarget(RTT_SSAO), GL_NEAREST, GL_NEAREST);
+    setTexture(2, m_rtts->getRenderTarget(RTT_HALF1_R), GL_LINEAR, GL_LINEAR);
 
     {
 
@@ -651,7 +648,30 @@ void IrrDriver::renderTransparent()
     glEnable(GL_BLEND);
     glBlendEquation(GL_FUNC_ADD);
     glDisable(GL_CULL_FACE);
+    TransparentMeshes<TM_DEFAULT>::reset();
+    TransparentMeshes<TM_ADDITIVE>::reset();
     m_scene_manager->drawAll(scene::ESNRP_TRANSPARENT);
+
+    if (World::getWorld() && World::getWorld()->isFogEnabled())
+    {
+        glUseProgram(MeshShader::TransparentFogShader::Program);
+        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+        for (unsigned i = 0; i < TransparentMeshes<TM_DEFAULT>::MeshSet.size(); i++)
+            drawTransparentFogObject(*TransparentMeshes<TM_DEFAULT>::MeshSet[i], TransparentMeshes<TM_DEFAULT>::MVPSet[i], TransparentMeshes<TM_DEFAULT>::MeshSet[i]->TextureMatrix);
+        glBlendFunc(GL_ONE, GL_ONE);
+        for (unsigned i = 0; i < TransparentMeshes<TM_ADDITIVE>::MeshSet.size(); i++)
+            drawTransparentFogObject(*TransparentMeshes<TM_ADDITIVE>::MeshSet[i], TransparentMeshes<TM_ADDITIVE>::MVPSet[i], TransparentMeshes<TM_ADDITIVE>::MeshSet[i]->TextureMatrix);
+    }
+    else
+    {
+        glUseProgram(MeshShader::TransparentShader::Program);
+        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+        for (unsigned i = 0; i < TransparentMeshes<TM_DEFAULT>::MeshSet.size(); i++)
+            drawTransparentObject(*TransparentMeshes<TM_DEFAULT>::MeshSet[i], TransparentMeshes<TM_DEFAULT>::MVPSet[i], TransparentMeshes<TM_DEFAULT>::MeshSet[i]->TextureMatrix);
+        glBlendFunc(GL_ONE, GL_ONE);
+        for (unsigned i = 0; i < TransparentMeshes<TM_ADDITIVE>::MeshSet.size(); i++)
+            drawTransparentObject(*TransparentMeshes<TM_ADDITIVE>::MeshSet[i], TransparentMeshes<TM_ADDITIVE>::MVPSet[i], TransparentMeshes<TM_ADDITIVE>::MeshSet[i]->TextureMatrix);
+    }
 }
 
 void IrrDriver::renderParticles()
@@ -1020,7 +1040,7 @@ void IrrDriver::renderLights(unsigned pointlightcount)
     }
     m_rtts->getFBO(FBO_COMBINED_TMP1_TMP2).Bind();
 
-    if (World::getWorld() && World::getWorld()->getTrack()->hasShadows() && SkyboxCubeMap && UserConfigParams::m_gi)
+    if (World::getWorld() && World::getWorld()->getTrack()->hasShadows() && SkyboxCubeMap)
         irr_driver->getSceneManager()->setAmbientLight(SColor(0, 0, 0, 0));
 
     // Render sunlight if and only if track supports shadow
@@ -1045,7 +1065,9 @@ void IrrDriver::renderSSAO()
     glClear(GL_COLOR_BUFFER_BIT);
     m_post_processing->renderSSAO();
     // Blur it to reduce noise.
-    m_post_processing->renderGaussian17TapBlur(irr_driver->getFBO(FBO_SSAO), irr_driver->getFBO(FBO_TMP4));
+    FrameBuffer::Blit(m_rtts->getFBO(FBO_SSAO), m_rtts->getFBO(FBO_HALF1_R), GL_COLOR_BUFFER_BIT, GL_LINEAR);
+    m_post_processing->renderGaussian17TapBlur(irr_driver->getFBO(FBO_HALF1_R), irr_driver->getFBO(FBO_HALF2_R));
+
 }
 
 static void getXYZ(GLenum face, float i, float j, float &x, float &y, float &z)
diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index 1858d2f6e..907394453 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -27,10 +27,12 @@ static GLuint generateRTT3D(GLenum target, size_t w, size_t h, size_t d, GLint i
     GLuint result;
     glGenTextures(1, &result);
     glBindTexture(target, result);
-    if (irr_driver->getGLSLVersion() < 420)
-        glTexImage3D(target, 0, internalFormat, w, h, d, 0, format, type, 0);
-    else
+#if WIN32
+    if (irr_driver->getGLSLVersion() >= 420)
         glTexStorage3D(target, 1, internalFormat, w, h, d);
+    else
+#endif
+        glTexImage3D(target, 0, internalFormat, w, h, d, 0, format, type, 0);
     return result;
 }
 
@@ -39,10 +41,12 @@ static GLuint generateRTT(const core::dimension2du &res, GLint internalFormat, G
     GLuint result;
     glGenTextures(1, &result);
     glBindTexture(GL_TEXTURE_2D, result);
+#if WIN32
     if (irr_driver->getGLSLVersion() < 420)
-        glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, res.Width, res.Height, 0, format, type, 0);
-    else
         glTexStorage2D(GL_TEXTURE_2D, mipmaplevel, internalFormat, res.Width, res.Height);
+    else
+#endif
+        glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, res.Width, res.Height, 0, format, type, 0);
     return result;
 }
 
@@ -105,16 +109,20 @@ RTT::RTT(size_t width, size_t height)
     RenderTargetTextures[RTT_NORMAL_AND_DEPTH] = generateRTT(res, GL_RGBA16F, GL_RGBA, GL_FLOAT);
     RenderTargetTextures[RTT_COLOR] = generateRTT(res, GL_RGBA16F, GL_BGRA, GL_FLOAT);
     RenderTargetTextures[RTT_MLAA_COLORS] = generateRTT(res, GL_SRGB8_ALPHA8, GL_BGR, GL_UNSIGNED_BYTE);
+    RenderTargetTextures[RTT_MLAA_TMP] = generateRTT(res, GL_SRGB8_ALPHA8, GL_BGR, GL_UNSIGNED_BYTE);
+    RenderTargetTextures[RTT_MLAA_BLEND] = generateRTT(res, GL_SRGB8_ALPHA8, GL_BGR, GL_UNSIGNED_BYTE);
     RenderTargetTextures[RTT_SSAO] = generateRTT(res, GL_R16F, GL_RED, GL_FLOAT);
     RenderTargetTextures[RTT_DISPLACE] = generateRTT(res, GL_RGBA16F, GL_BGRA, GL_FLOAT);
 
     RenderTargetTextures[RTT_HALF1] = generateRTT(half, GL_RGBA16F, GL_BGRA, GL_FLOAT);
     RenderTargetTextures[RTT_QUARTER1] = generateRTT(quarter, GL_RGBA16F, GL_BGRA, GL_FLOAT);
     RenderTargetTextures[RTT_EIGHTH1] = generateRTT(eighth, GL_RGBA16F, GL_BGRA, GL_FLOAT);
+    RenderTargetTextures[RTT_HALF1_R] = generateRTT(half, GL_R16F, GL_RED, GL_FLOAT);
 
     RenderTargetTextures[RTT_HALF2] = generateRTT(half, GL_RGBA16F, GL_BGRA, GL_FLOAT);
     RenderTargetTextures[RTT_QUARTER2] = generateRTT(quarter, GL_RGBA16F, GL_BGRA, GL_FLOAT);
     RenderTargetTextures[RTT_EIGHTH2] = generateRTT(eighth, GL_RGBA16F, GL_BGRA, GL_FLOAT);
+    RenderTargetTextures[RTT_HALF2_R] = generateRTT(half, GL_R16F, GL_RED, GL_FLOAT);
 
     RenderTargetTextures[RTT_BLOOM_1024] = generateRTT(shadowsize0, GL_RGBA16F, GL_BGR, GL_FLOAT);
     RenderTargetTextures[RTT_BLOOM_512] = generateRTT(shadowsize1, GL_RGBA16F, GL_BGR, GL_FLOAT);
@@ -129,10 +137,6 @@ RTT::RTT(size_t width, size_t height)
     somevector.push_back(RenderTargetTextures[RTT_SSAO]);
 
     FrameBuffers.push_back(new FrameBuffer(somevector, res.Width, res.Height));
-    // Clear this FBO to 1s so that if no SSAO is computed we can still use it.
-    glClearColor(1., 1., 1., 1.);
-    glClear(GL_COLOR_BUFFER_BIT);
-
     somevector.clear();
     somevector.push_back(RenderTargetTextures[RTT_NORMAL_AND_DEPTH]);
     FrameBuffers.push_back(new FrameBuffer(somevector, DepthStencilTexture, res.Width, res.Height));
@@ -150,6 +154,12 @@ RTT::RTT(size_t width, size_t height)
     somevector.push_back(RenderTargetTextures[RTT_MLAA_COLORS]);
     FrameBuffers.push_back(new FrameBuffer(somevector, res.Width, res.Height));
     somevector.clear();
+    somevector.push_back(RenderTargetTextures[RTT_MLAA_BLEND]);
+    FrameBuffers.push_back(new FrameBuffer(somevector, res.Width, res.Height));
+    somevector.clear();
+    somevector.push_back(RenderTargetTextures[RTT_MLAA_TMP]);
+    FrameBuffers.push_back(new FrameBuffer(somevector, res.Width, res.Height));
+    somevector.clear();
     somevector.push_back(RenderTargetTextures[RTT_TMP1]);
     FrameBuffers.push_back(new FrameBuffer(somevector, DepthStencilTexture, res.Width, res.Height));
     somevector.clear();
@@ -164,10 +174,20 @@ RTT::RTT(size_t width, size_t height)
     somevector.clear();
     somevector.push_back(RenderTargetTextures[RTT_HALF1]);
     FrameBuffers.push_back(new FrameBuffer(somevector, half.Width, half.Height));
+    somevector.clear();
+    somevector.push_back(RenderTargetTextures[RTT_HALF1_R]);
+    FrameBuffers.push_back(new FrameBuffer(somevector, half.Width, half.Height));
+    // Clear this FBO to 1s so that if no SSAO is computed we can still use it.
+    glClearColor(1., 1., 1., 1.);
+    glClear(GL_COLOR_BUFFER_BIT);
+
     somevector.clear();
     somevector.push_back(RenderTargetTextures[RTT_HALF2]);
     FrameBuffers.push_back(new FrameBuffer(somevector, half.Width, half.Height));
     somevector.clear();
+    somevector.push_back(RenderTargetTextures[RTT_HALF2_R]);
+    FrameBuffers.push_back(new FrameBuffer(somevector, half.Width, half.Height));
+    somevector.clear();
     somevector.push_back(RenderTargetTextures[RTT_QUARTER1]);
     FrameBuffers.push_back(new FrameBuffer(somevector, quarter.Width, quarter.Height));
     somevector.clear();
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 59cc101fb..1744ce8ad 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -415,6 +415,8 @@ namespace UtilShader
 
     void ColoredLine::setUniforms(const irr::video::SColor &col)
     {
+        if (UserConfigParams::m_ubo_disabled)
+            bypassUBO(Program);
         glUniform4i(uniform_color, col.getRed(), col.getGreen(), col.getBlue(), col.getAlpha());
         glUniformMatrix4fv(glGetUniformLocation(Program, "ModelMatrix"), 1, GL_FALSE, core::IdentityMatrix.pointer());
     }
@@ -1092,7 +1094,7 @@ namespace MeshShader
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/grass_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass2.frag").c_str());
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/grass_pass2.frag").c_str());
         attrib_position = glGetAttribLocation(Program, "Position");
         attrib_texcoord = glGetAttribLocation(Program, "Texcoord");
         attrib_color = glGetAttribLocation(Program, "Color");
@@ -1197,6 +1199,7 @@ namespace MeshShader
     GLuint SphereMapShader::attrib_normal;
     GLuint SphereMapShader::uniform_MM;
     GLuint SphereMapShader::uniform_IMM;
+    GLuint SphereMapShader::uniform_ambient;
     GLuint SphereMapShader::TU_tex;
 
     void SphereMapShader::init()
@@ -1210,6 +1213,7 @@ namespace MeshShader
         attrib_normal = glGetAttribLocation(Program, "Normal");
         uniform_MM = glGetUniformLocation(Program, "ModelMatrix");
         uniform_IMM = glGetUniformLocation(Program, "InverseModelMatrix");
+        uniform_ambient = glGetUniformLocation(Program, "ambient");
         GLuint uniform_tex = glGetUniformLocation(Program, "tex");
         GLuint uniform_Albedo = glGetUniformLocation(Program, "Albedo");
         GLuint uniform_DiffuseMap = glGetUniformLocation(Program, "DiffuseMap");
@@ -1230,12 +1234,13 @@ namespace MeshShader
         glUseProgram(0);
     }
 
-    void SphereMapShader::setUniforms(const core::matrix4 &ModelMatrix, const core::matrix4 &InverseModelMatrix)
+    void SphereMapShader::setUniforms(const core::matrix4 &ModelMatrix, const core::matrix4 &InverseModelMatrix, const SColorf &ambient)
     {
         if (UserConfigParams::m_ubo_disabled)
             bypassUBO(Program);
         glUniformMatrix4fv(uniform_MM, 1, GL_FALSE, ModelMatrix.pointer());
         glUniformMatrix4fv(uniform_IMM, 1, GL_FALSE, InverseModelMatrix.pointer());
+        glUniform3f(uniform_ambient, ambient.r, ambient.g, ambient.b);
     }
 
     GLuint SplattingShader::Program;
@@ -2395,6 +2400,7 @@ namespace FullScreenShader
     GLuint GlobalIlluminationReconstructionShader::uniform_SHB;
     GLuint GlobalIlluminationReconstructionShader::uniform_extents;
     GLuint GlobalIlluminationReconstructionShader::uniform_RHMatrix;
+    GLuint GlobalIlluminationReconstructionShader::uniform_InvRHMatrix;
     GLuint GlobalIlluminationReconstructionShader::vao;
 
     void GlobalIlluminationReconstructionShader::init()
@@ -2410,15 +2416,17 @@ namespace FullScreenShader
         uniform_SHG = glGetUniformLocation(Program, "SHG");
         uniform_SHB = glGetUniformLocation(Program, "SHB");
         uniform_RHMatrix = glGetUniformLocation(Program, "RHMatrix");
+        uniform_InvRHMatrix = glGetUniformLocation(Program, "InvRHMatrix");
         uniform_extents = glGetUniformLocation(Program, "extents");
         vao = createFullScreenVAO(Program);
         GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
         glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
 
-    void GlobalIlluminationReconstructionShader::setUniforms(const core::matrix4 &RHMatrix, const core::vector3df &extents, unsigned TU_ntex, unsigned TU_dtex, unsigned TU_SHR, unsigned TU_SHG, unsigned TU_SHB)
+    void GlobalIlluminationReconstructionShader::setUniforms(const core::matrix4 &RHMatrix, const core::matrix4 &InvRHMatrix, const core::vector3df &extents, unsigned TU_ntex, unsigned TU_dtex, unsigned TU_SHR, unsigned TU_SHG, unsigned TU_SHB)
     {
         glUniformMatrix4fv(uniform_RHMatrix, 1, GL_FALSE, RHMatrix.pointer());
+        glUniformMatrix4fv(uniform_InvRHMatrix, 1, GL_FALSE, InvRHMatrix.pointer());
         glUniform1i(uniform_ntex, TU_ntex);
         glUniform1i(uniform_dtex, TU_dtex);
         glUniform1i(uniform_SHR, TU_SHR);
@@ -2446,10 +2454,12 @@ namespace FullScreenShader
     GLuint ComputeGaussian17TapHShader::uniform_dest;
     void ComputeGaussian17TapHShader::init()
     {
+#if WIN32
         Program = LoadProgram(
             GL_COMPUTE_SHADER, file_manager->getAsset("shaders/gaussian.comp").c_str());
         uniform_source = glGetUniformLocation(Program, "source");
         uniform_dest = glGetUniformLocation(Program, "dest");
+#endif
     }
 
     GLuint Gaussian6HBlurShader::Program;
@@ -2499,10 +2509,12 @@ namespace FullScreenShader
     GLuint ComputeGaussian17TapVShader::uniform_dest;
     void ComputeGaussian17TapVShader::init()
     {
+#if WIN32
         Program = LoadProgram(
             GL_COMPUTE_SHADER, file_manager->getAsset("shaders/gaussianv.comp").c_str());
         uniform_source = glGetUniformLocation(Program, "source");
         uniform_dest = glGetUniformLocation(Program, "dest");
+#endif
     }
 
     GLuint Gaussian6VBlurShader::Program;
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 1c7548174..53089372f 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -250,11 +250,11 @@ class SphereMapShader
 public:
     static GLuint Program;
     static GLuint attrib_position, attrib_normal;
-    static GLuint uniform_MM, uniform_IMM;
+    static GLuint uniform_MM, uniform_IMM, uniform_ambient;
     static GLuint TU_tex;
 
     static void init();
-    static void setUniforms(const core::matrix4 &ModelMatrix, const core::matrix4 &InverseModelMatrix);
+    static void setUniforms(const core::matrix4 &ModelMatrix, const core::matrix4 &InverseModelMatrix, const video::SColorf &ambient);
 };
 
 class SplattingShader
@@ -624,11 +624,11 @@ class GlobalIlluminationReconstructionShader
 {
 public:
     static GLuint Program;
-    static GLuint uniform_ntex, uniform_dtex, uniform_extents, uniform_SHR, uniform_SHG, uniform_SHB, uniform_RHMatrix;
+    static GLuint uniform_ntex, uniform_dtex, uniform_extents, uniform_SHR, uniform_SHG, uniform_SHB, uniform_RHMatrix, uniform_InvRHMatrix;
     static GLuint vao;
 
     static void init();
-    static void setUniforms(const core::matrix4 &RHMatrix, const core::vector3df &extents, unsigned TU_ntex, unsigned TU_dtex, unsigned TU_SHR, unsigned TU_SHG, unsigned TU_SHB);
+    static void setUniforms(const core::matrix4 &RHMatrix, const core::matrix4 &InvRHMatrix, const core::vector3df &extents, unsigned TU_ntex, unsigned TU_dtex, unsigned TU_SHR, unsigned TU_SHG, unsigned TU_SHB);
 };
 
 class Gaussian17TapHShader
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 91769e262..b4464a46c 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -227,30 +227,16 @@ void STKAnimatedMesh::render()
             glUseProgram(MeshShader::BubbleShader::Program);
 
         GLMesh* mesh;
-        for_in(mesh, TransparentMesh[TM_BUBBLE])
-            drawBubble(*mesh, ModelViewProjectionMatrix);
-
-        if (World::getWorld() != NULL && World::getWorld()->isFogEnabled())
+        for_in(mesh, TransparentMesh[TM_DEFAULT])
         {
-            if (!TransparentMesh[TM_DEFAULT].empty() || !TransparentMesh[TM_ADDITIVE].empty())
-                glUseProgram(MeshShader::TransparentFogShader::Program);
-            glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-            for_in(mesh, TransparentMesh[TM_DEFAULT])
-                drawTransparentFogObject(*mesh, ModelViewProjectionMatrix, mesh->TextureMatrix);
-            glBlendFunc(GL_ONE, GL_ONE);
-            for_in(mesh, TransparentMesh[TM_ADDITIVE])
-                drawTransparentFogObject(*mesh, ModelViewProjectionMatrix, mesh->TextureMatrix);
+            TransparentMeshes<TM_DEFAULT>::MeshSet.push_back(mesh);
+            TransparentMeshes<TM_DEFAULT>::MVPSet.push_back(ModelViewProjectionMatrix);
         }
-        else
+
+        for_in(mesh, TransparentMesh[TM_ADDITIVE])
         {
-            if (!TransparentMesh[TM_DEFAULT].empty() || !TransparentMesh[TM_ADDITIVE].empty())
-                glUseProgram(MeshShader::TransparentShader::Program);
-            glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-            for_in(mesh, TransparentMesh[TM_DEFAULT])
-                drawTransparentObject(*mesh, ModelViewProjectionMatrix, mesh->TextureMatrix);
-            glBlendFunc(GL_ONE, GL_ONE);
-            for_in(mesh, TransparentMesh[TM_ADDITIVE])
-                drawTransparentObject(*mesh, ModelViewProjectionMatrix, mesh->TextureMatrix);
+            TransparentMeshes<TM_ADDITIVE>::MeshSet.push_back(mesh);
+            TransparentMeshes<TM_ADDITIVE>::MVPSet.push_back(ModelViewProjectionMatrix);
         }
         return;
     }
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index 4ce29f479..710dec32d 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -22,7 +22,7 @@ static void createbillboardvao()
 STKBillboard::STKBillboard(irr::scene::ISceneNode* parent, irr::scene::ISceneManager* mgr, irr::s32 id,
     const irr::core::vector3df& position, const irr::core::dimension2d<irr::f32>& size,
     irr::video::SColor colorTop,    irr::video::SColor colorBottom) :
-    CBillboardSceneNode(parent, mgr, id, position, size, colorTop, colorBottom), IBillboardSceneNode(parent, mgr, id, position)
+    IBillboardSceneNode(parent, mgr, id, position), CBillboardSceneNode(parent, mgr, id, position, size, colorTop, colorBottom)
 {
     if (!billboardvao)
         createbillboardvao();
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index f99786ad1..245180270 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -249,7 +249,7 @@ void drawSphereMap(const GLMesh &mesh, const core::matrix4 &ModelMatrix, const c
   }
   setTexture(MeshShader::SphereMapShader::TU_tex, getTextureGLuint(mesh.textures[0]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
 
-  MeshShader::SphereMapShader::setUniforms(ModelMatrix, InverseModelMatrix);
+  MeshShader::SphereMapShader::setUniforms(ModelMatrix, InverseModelMatrix, irr_driver->getSceneManager()->getAmbientLight());
   assert(mesh.vao_second_pass);
   glBindVertexArray(mesh.vao_second_pass);
   glDrawElements(ptype, count, itype, 0);
@@ -553,8 +553,11 @@ void drawTransparentFogObject(const GLMesh &mesh, const core::matrix4 &ModelView
         tmpcol.getGreen() / 255.0f,
         tmpcol.getBlue() / 255.0f);
 
-    compressTexture(mesh.textures[0], true);
-    setTexture(0, getTextureGLuint(mesh.textures[0]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+    if (mesh.textures[0] != NULL)
+    {
+        compressTexture(mesh.textures[0], true);
+        setTexture(0, getTextureGLuint(mesh.textures[0]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+    }
 
     glUseProgram(MeshShader::TransparentFogShader::Program);
     MeshShader::TransparentFogShader::setUniforms(ModelViewProjectionMatrix, TextureMatrix, fogmax, startH, endH, start, end, col, Camera::getCamera(0)->getCameraSceneNode()->getAbsolutePosition(), 0);
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index a7e0fb19d..c16e075b0 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -147,6 +147,25 @@ void drawObjectUnlit(const GLMesh &mesh, const core::matrix4 &ModelViewProjectio
 void drawShadowRef(const GLMesh &mesh, const core::matrix4 &ModelMatrix);
 void drawShadow(const GLMesh &mesh, const core::matrix4 &ModelMatrix);
 
+template<enum TransparentMaterial T>
+class TransparentMeshes
+{
+public:
+    static std::vector<GLMesh *> MeshSet;
+    static std::vector<core::matrix4> MVPSet;
+
+    static void reset()
+    {
+        MeshSet.clear();
+        MVPSet.clear();
+    }
+};
+
+template<enum TransparentMaterial T>
+std::vector<GLMesh *> TransparentMeshes<T>::MeshSet;
+template<enum TransparentMaterial T>
+std::vector<core::matrix4> TransparentMeshes<T>::MVPSet;
+
 // Forward pass (for transparents meshes)
 void drawTransparentObject(const GLMesh &mesh, const core::matrix4 &ModelViewProjectionMatrix, const core::matrix4 &TextureMatrix);
 void drawTransparentFogObject(const GLMesh &mesh, const core::matrix4 &ModelViewProjectionMatrix, const core::matrix4 &TextureMatrix);
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 0ecf8586d..4f97ed8c7 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -209,33 +209,9 @@ void STKMeshSceneNode::drawSolidPass2(const GLMesh &mesh, ShadedMaterial type)
 {
     switch (type)
     {
-    case SM_SPHEREMAP:
-        drawSphereMap(mesh, ModelViewProjectionMatrix, TransposeInverseModelView);
-        break;
-    case SM_SPLATTING:
-        drawSplatting(mesh, ModelViewProjectionMatrix);
-        break;
-    case SM_ALPHA_REF_TEXTURE:
-        drawObjectRefPass2(mesh, ModelViewProjectionMatrix, mesh.TextureMatrix);
-        break;
     case SM_GRASS:
         drawGrassPass2(mesh, ModelViewProjectionMatrix, windDir);
         break;
-    case SM_RIMLIT:
-        drawObjectRimLimit(mesh, ModelViewProjectionMatrix, TransposeInverseModelView, core::matrix4::EM4CONST_IDENTITY);
-        break;
-    case SM_UNLIT:
-        drawObjectUnlit(mesh, ModelViewProjectionMatrix);
-        break;
-    case SM_DETAILS:
-        drawDetailledObjectPass2(mesh, ModelViewProjectionMatrix);
-        break;
-    case SM_UNTEXTURED:
-        drawUntexturedObject(mesh, ModelViewProjectionMatrix);
-        break;
-    case SM_DEFAULT:
-        drawObjectPass2(mesh, ModelViewProjectionMatrix, mesh.TextureMatrix);
-        break;
     default:
         assert(0 && "Wrong shaded material");
         break;
@@ -440,33 +416,23 @@ void STKMeshSceneNode::render()
         ModelViewProjectionMatrix = computeMVP(AbsoluteTransformation);
 
         GLMesh* mesh;
+
+        for_in(mesh, TransparentMesh[TM_DEFAULT])
+        {
+            TransparentMeshes<TM_DEFAULT>::MeshSet.push_back(mesh);
+            TransparentMeshes<TM_DEFAULT>::MVPSet.push_back(ModelViewProjectionMatrix);
+        }
+
+        for_in(mesh, TransparentMesh[TM_ADDITIVE])
+        {
+            TransparentMeshes<TM_ADDITIVE>::MeshSet.push_back(mesh);
+            TransparentMeshes<TM_ADDITIVE>::MVPSet.push_back(ModelViewProjectionMatrix);
+        }
+
         if (!TransparentMesh[TM_BUBBLE].empty())
             glUseProgram(MeshShader::BubbleShader::Program);
         for_in(mesh, TransparentMesh[TM_BUBBLE])
             drawBubble(*mesh, ModelViewProjectionMatrix);
-
-        if (World::getWorld() ->isFogEnabled())
-        {
-            if (!TransparentMesh[TM_DEFAULT].empty() || !TransparentMesh[TM_ADDITIVE].empty())
-                glUseProgram(MeshShader::TransparentFogShader::Program);
-            glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-            for_in(mesh, TransparentMesh[TM_DEFAULT])
-                drawTransparentFogObject(*mesh, ModelViewProjectionMatrix, (*mesh).TextureMatrix);
-            glBlendFunc(GL_ONE, GL_ONE);
-            for_in(mesh, TransparentMesh[TM_ADDITIVE])
-                drawTransparentFogObject(*mesh, ModelViewProjectionMatrix, (*mesh).TextureMatrix);
-        }
-        else
-        {
-            if (!TransparentMesh[TM_DEFAULT].empty() || !TransparentMesh[TM_ADDITIVE].empty())
-                glUseProgram(MeshShader::TransparentShader::Program);
-            glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-            for_in(mesh, TransparentMesh[TM_DEFAULT])
-                drawTransparentObject(*mesh, ModelViewProjectionMatrix, (*mesh).TextureMatrix);
-            glBlendFunc(GL_ONE, GL_ONE);
-            for_in(mesh, TransparentMesh[TM_ADDITIVE])
-                drawTransparentObject(*mesh, ModelViewProjectionMatrix, (*mesh).TextureMatrix);
-        }
         return;
     }
 
diff --git a/src/guiengine/abstract_state_manager.cpp b/src/guiengine/abstract_state_manager.cpp
index f3fd29fe6..3b7989370 100644
--- a/src/guiengine/abstract_state_manager.cpp
+++ b/src/guiengine/abstract_state_manager.cpp
@@ -138,9 +138,9 @@ void AbstractStateManager::pushScreen(Screen* screen)
 
 // ----------------------------------------------------------------------------
 
-void AbstractStateManager::replaceTopMostScreen(Screen* screen)
+void AbstractStateManager::replaceTopMostScreen(Screen* screen, GUIEngine::GameState gameState)
 {
-    assert(m_game_mode != GAME);
+    //assert(m_game_mode != GAME);
     // you need to close any dialog before calling this
     assert(!ModalDialog::isADialogActive());
 
@@ -156,9 +156,11 @@ void AbstractStateManager::replaceTopMostScreen(Screen* screen)
     assert(m_menu_stack.size() > 0);
 
     // Send tear-down event to previous menu
-    getCurrentScreen()->tearDown();
+    if (getCurrentScreen() != NULL)
+        getCurrentScreen()->tearDown();
 
     m_menu_stack[m_menu_stack.size()-1] = name;
+    setGameState(gameState);
     switchToScreen(name.c_str());
 
     // Send init event to new menu
diff --git a/src/guiengine/abstract_state_manager.hpp b/src/guiengine/abstract_state_manager.hpp
index e280103ac..b8ace0901 100644
--- a/src/guiengine/abstract_state_manager.hpp
+++ b/src/guiengine/abstract_state_manager.hpp
@@ -82,7 +82,7 @@ namespace GUIEngine
           * without displaying the second-topmost menu of the stack
           * in-between)
           */
-        void replaceTopMostScreen(Screen* screen);
+        void replaceTopMostScreen(Screen* screen, GUIEngine::GameState gameState = GUIEngine::MENU);
 
         /**
           * \brief removes the menu at the top of the screens stack
diff --git a/src/guiengine/engine.cpp b/src/guiengine/engine.cpp
index 63ec09d8e..2126d1f19 100644
--- a/src/guiengine/engine.cpp
+++ b/src/guiengine/engine.cpp
@@ -687,11 +687,11 @@ namespace GUIEngine
     {
         IGUIEnvironment* g_env;
         Skin* g_skin = NULL;
-        ScalableFont* g_font;
-        ScalableFont* g_large_font;
-        ScalableFont* g_title_font;
-        ScalableFont* g_small_font;
-        ScalableFont* g_digit_font;
+        ScalableFont *g_font;
+        ScalableFont *g_large_font;
+        ScalableFont *g_title_font;
+        ScalableFont *g_small_font;
+        ScalableFont *g_digit_font;
 
         IrrlichtDevice* g_device;
         IVideoDriver* g_driver;
@@ -1062,7 +1062,7 @@ namespace GUIEngine
         ScalableFont* sfont =
             new ScalableFont(g_env,
                             file_manager->getAssetChecked(FileManager::FONT,
-                                                          "StkFont.xml",true).c_str() );
+                                                          "StkFont.xml",true) );
         sfont->setScale(normal_text_scale);
         sfont->setKerningHeight(-5);
         g_font = sfont;
@@ -1070,13 +1070,13 @@ namespace GUIEngine
         ScalableFont* digit_font =
             new ScalableFont(g_env,
                              file_manager->getAssetChecked(FileManager::FONT,
-                                                           "BigDigitFont.xml",true).c_str());
+                                                           "BigDigitFont.xml",true));
         digit_font->lazyLoadTexture(0); // make sure the texture is loaded for this one
+        digit_font->setMonospaceDigits(true);
         g_digit_font = digit_font;
 
         Private::font_height = g_font->getDimension( L"X" ).Height;
 
-
         ScalableFont* sfont_larger = sfont->getHollowCopy();
         sfont_larger->setScale(normal_text_scale*1.4f);
         sfont_larger->setKerningHeight(-5);
@@ -1097,7 +1097,7 @@ namespace GUIEngine
             new ScalableFont(g_env,
                              file_manager->getAssetChecked(FileManager::FONT,
                                                            "title_font.xml",
-                                                           true).c_str()     );
+                                                           true)             );
         sfont2->m_fallback_font = sfont;
         // Because the fallback font is much smaller than the title font:
         sfont2->m_fallback_font_scale = 4.0f;
diff --git a/src/guiengine/event_handler.cpp b/src/guiengine/event_handler.cpp
index cfcc0332c..217641049 100644
--- a/src/guiengine/event_handler.cpp
+++ b/src/guiengine/event_handler.cpp
@@ -305,12 +305,12 @@ void EventHandler::processGUIAction(const PlayerAction action,
 
         case PA_ACCEL:
         case PA_MENU_UP:
-            navigateUp(playerID, type, pressedDown);
+            navigate(playerID, type, pressedDown, true);
             break;
 
         case PA_BRAKE:
         case PA_MENU_DOWN:
-            navigateDown(playerID, type, pressedDown);
+            navigate(playerID, type, pressedDown, false);
             break;
 
         case PA_RESCUE:
@@ -364,10 +364,14 @@ const bool NAVIGATION_DEBUG = false;
 #pragma mark Private methods
 #endif
 
-void EventHandler::navigateUp(const int playerID, Input::InputType type, const bool pressedDown)
+/**
+ * Focus the next widget either downwards or upwards.
+ *
+ * \param reverse True means navigating up, false means down.
+ */
+void EventHandler::navigate(const int playerID, Input::InputType type, const bool pressedDown, const bool reverse)
 {
-    //std::cout << "Naviagte up!\n";
-    IGUIElement *el = NULL/*, *first=NULL*/, *closest=NULL;
+    IGUIElement *el = NULL, *closest = NULL;
 
     if (type == Input::IT_STICKBUTTON && !pressedDown)
         return;
@@ -378,19 +382,22 @@ void EventHandler::navigateUp(const int playerID, Input::InputType type, const b
         el = w->getIrrlichtElement();
     }
 
-
     // list widgets are a bit special, because up/down keys are also used
     // to navigate between various list items, not only to navigate between
     // components
     if (w != NULL && w->m_type == WTYPE_LIST)
     {
-        ListWidget* list = (ListWidget*)w;
+        ListWidget* list = (ListWidget*) w;
 
-        const bool stay_within_list = list->getSelectionID() > 0;
+        const bool stay_within_list = reverse ? list->getSelectionID() > 0 :
+            list->getSelectionID() < list->getItemCount() - 1;
 
         if (stay_within_list)
         {
-            list->setSelectionID(list->getSelectionID()-1);
+            if (reverse)
+                list->setSelectionID(list->getSelectionID() - 1);
+            else
+                list->setSelectionID(list->getSelectionID() + 1);
             return;
         }
         else
@@ -399,16 +406,15 @@ void EventHandler::navigateUp(const int playerID, Input::InputType type, const b
         }
     }
 
-    if (w != NULL && w->m_tab_up_root != -1)
+    if (w != NULL && ((reverse && w->m_tab_up_root != -1) || (!reverse && w->m_tab_down_root != -1)))
     {
-        Widget* up = GUIEngine::getWidget( w->m_tab_up_root );
-        assert( up != NULL );
-
-        el = up->getIrrlichtElement();
+        Widget* next = GUIEngine::getWidget(reverse ? w->m_tab_up_root : w->m_tab_down_root);
+        assert(next != NULL);
+        el = next->getIrrlichtElement();
 
         if (el == NULL)
         {
-            std::cerr << "WARNING : m_tab_down_root is set to an ID for which I can't find the widget\n";
+            std::cerr << "WARNING : m_tab_down/up_root is set to an ID for which I can't find the widget\n";
             return;
         }
     }
@@ -424,190 +430,69 @@ void EventHandler::navigateUp(const int playerID, Input::InputType type, const b
     // find closest widget
     if (el != NULL && el->getTabGroup() != NULL)
     {
-        // if the current widget is e.g. 15, search for widget 14, 13, 12, ... (up to 10 IDs may be missing)
-        for (int n=1; n<10 && !found; n++)
+        // Up: if the current widget is e.g. 15, search for widget 14, 13, 12, ... (up to 10 IDs may be missing)
+        // Down: if the current widget is e.g. 5, search for widget 6, 7, 8, 9, ..., 15 (up to 10 IDs may be missing)
+        for (int n = 1; n < 10 && !found; n++)
         {
-            closest = GUIEngine::getGUIEnv()->getRootGUIElement()->getElementFromId(el->getTabOrder() - n, true);
+            closest = GUIEngine::getGUIEnv()->getRootGUIElement()->getElementFromId(el->getTabOrder() + (reverse ? -n : n), true);
 
             if (closest != NULL && Widget::isFocusableId(closest->getID()))
             {
-                if (NAVIGATION_DEBUG) std::cout << "Navigating up to " << closest->getID() << std::endl;
                 Widget* closestWidget = GUIEngine::getWidget( closest->getID() );
 
                 if (playerID != PLAYER_ID_GAME_MASTER && !closestWidget->m_supports_multiplayer) return;
 
                 // if a dialog is shown, restrict to items in the dialog
                 if (ModalDialog::isADialogActive() && !ModalDialog::getCurrent()->isMyChild(closestWidget))
-                {
                     continue;
+
+                if (NAVIGATION_DEBUG)
+                {
+                    std::cout << "Navigating " << (reverse ? "up" : "down") << " to " << closest->getID() << std::endl;
                 }
 
-                // when focusing a list by going up, select the last item of the list
-                assert (closestWidget != NULL);
+                assert(closestWidget != NULL);
+
+                if (!closestWidget->isVisible() || !closestWidget->isActivated())
+                    continue;
 
                 closestWidget->setFocusForPlayer(playerID);
 
+                // another list exception : when entering a list by going down, select the first item
+                // when focusing a list by going up, select the last item of the list
                 if (closestWidget->m_type == WTYPE_LIST)
                 {
-                    IGUIListBox* list = (IGUIListBox*)(closestWidget->m_element);
+                    ListWidget* list = (ListWidget*) closestWidget;
                     assert(list != NULL);
-
-                    list->setSelected( list->getItemCount()-1 );
-                    return;
+                    list->setSelectionID(reverse ? list->getItemCount() - 1 : 0);
                 }
                 found = true;
-
             }
         } // end for
-
     }
 
     if (!found)
     {
         if (NAVIGATION_DEBUG)
-        {
-            std::cout << "EventHandler::navigateUp : wrap around, selecting the last widget\n";
-        }
+            std::cout << "EventHandler::navigat : wrap around\n";
 
-        // select the last widget
-        Widget* lastWidget = NULL;
+        // select the last/first widget
+        Widget* wrapWidget = NULL;
 
         if (ModalDialog::isADialogActive())
         {
-            lastWidget = ModalDialog::getCurrent()->getLastWidget();
+            wrapWidget = reverse ? ModalDialog::getCurrent()->getLastWidget() :
+                ModalDialog::getCurrent()->getFirstWidget();
         }
         else
         {
             Screen* screen = GUIEngine::getCurrentScreen();
             if (screen == NULL) return;
-            lastWidget = screen->getLastWidget();
+            wrapWidget = reverse ? screen->getLastWidget() :
+                screen->getFirstWidget();
         }
 
-        if (lastWidget != NULL) lastWidget->setFocusForPlayer(playerID);
-    }
-}
-
-// -----------------------------------------------------------------------------
-
-void EventHandler::navigateDown(const int playerID, Input::InputType type, const bool pressedDown)
-{
-    //std::cout << "Naviagte down!\n";
-
-    IGUIElement *el = NULL, *closest = NULL;
-
-    if (type == Input::IT_STICKBUTTON && !pressedDown)
-        return;
-
-    Widget* w = GUIEngine::getFocusForPlayer(playerID);
-    if (w != NULL)
-    {
-        el = w->getIrrlichtElement();
-    }
-    //std::cout << "!!! Player " << playerID << " navigating down of " << w->m_element->getID() << std::endl;
-
-    // list widgets are a bit special, because up/down keys are also used
-    // to navigate between various list items, not only to navigate between
-    // components
-    if (w != NULL && w->m_type == WTYPE_LIST)
-    {
-        ListWidget* list = (ListWidget*)w;
-
-        const bool stay_within_list = list->getSelectionID() < list->getItemCount()-1;
-
-        if (stay_within_list)
-        {
-            list->setSelectionID(list->getSelectionID()+1);
-            return;
-        }
-        else
-        {
-            list->setSelectionID(-1);
-        }
-    }
-
-    if (w != NULL && w->m_tab_down_root != -1)
-    {
-        Widget* down = GUIEngine::getWidget( w->m_tab_down_root );
-        assert(down != NULL);
-        el = down->getIrrlichtElement();
-
-        if (el == NULL)
-        {
-            std::cerr << "WARNING : m_tab_down_root is set to an ID for which I can't find the widget\n";
-            return;
-        }
-    }
-
-    // don't allow navigating to any widget when a dialog is shown; only navigate to widgets in the dialog
-    if (ModalDialog::isADialogActive() && !ModalDialog::getCurrent()->isMyIrrChild(el))
-    {
-        el = NULL;
-    }
-
-    bool found = false;
-
-    if (el != NULL && el->getTabGroup() != NULL)
-    {
-        // if the current widget is e.g. 5, search for widget 6, 7, 8, 9, ..., 15 (up to 10 IDs may be missing)
-        for (int n=1; n<10 && !found; n++)
-        {
-            closest = GUIEngine::getGUIEnv()->getRootGUIElement()->getElementFromId(el->getTabOrder() + n, true);
-
-            if (closest != NULL && Widget::isFocusableId(closest->getID()))
-            {
-
-                Widget* closestWidget = GUIEngine::getWidget( closest->getID() );
-                if (playerID != PLAYER_ID_GAME_MASTER && !closestWidget->m_supports_multiplayer) return;
-
-                // if a dialog is shown, restrict to items in the dialog
-                if (ModalDialog::isADialogActive() && !ModalDialog::getCurrent()->isMyChild(closestWidget))
-                {
-                    continue;
-                }
-
-                if (NAVIGATION_DEBUG)
-                {
-                    std::cout << "Navigating down to " << closestWidget->getID() << "\n";
-                }
-
-                assert( closestWidget != NULL );
-                closestWidget->setFocusForPlayer(playerID);
-
-                // another list exception : when entering a list, select the first item
-                if (closestWidget->m_type == WTYPE_LIST)
-                {
-                    IGUIListBox* list = (IGUIListBox*)(closestWidget->m_element);
-                    assert(list != NULL);
-
-                    list->setSelected(0);
-                }
-
-                found = true;
-            }
-        } // end for
-    }
-
-    if (!found)
-    {
-
-        if (NAVIGATION_DEBUG) std::cout << "Navigating down : wrap around\n";
-
-        // select the first widget
-        Widget* firstWidget = NULL;
-
-        if (ModalDialog::isADialogActive())
-        {
-            //std::cout <<  "w = ModalDialog::getCurrent()->getFirstWidget();\n";
-            firstWidget = ModalDialog::getCurrent()->getFirstWidget();
-        }
-        else
-        {
-            Screen* screen = GUIEngine::getCurrentScreen();
-            if (screen == NULL) return;
-            firstWidget = screen->getFirstWidget();
-        }
-
-        if (firstWidget != NULL)  firstWidget->setFocusForPlayer(playerID);
+        if (wrapWidget != NULL)  wrapWidget->setFocusForPlayer(playerID);
     }
 }
 
@@ -631,7 +516,7 @@ void EventHandler::sendEventToUser(GUIEngine::Widget* widget, std::string& name,
 
 EventPropagation EventHandler::onWidgetActivated(GUIEngine::Widget* w, const int playerID)
 {
-    if (w->m_deactivated) return EVENT_BLOCK;
+    if (!w->isActivated()) return EVENT_BLOCK;
 
     Widget* parent = w->m_event_handler;
     
@@ -658,7 +543,7 @@ EventPropagation EventHandler::onWidgetActivated(GUIEngine::Widget* w, const int
             parent = parent->m_event_handler;
         }
 
-        if (parent->m_deactivated) return EVENT_BLOCK;
+        if (!parent->isActivated()) return EVENT_BLOCK;
 
         /* notify the found event event handler, and also notify the main callback if the
          parent event handler says so */
@@ -699,7 +584,7 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
             {
                 Widget* w = GUIEngine::getWidget(id);
                 if (w == NULL) break;
-                if (w->m_deactivated)
+                if (!w->isActivated())
                 {
                     GUIEngine::getCurrentScreen()->onDisabledItemClicked(w->m_properties[PROP_ID].c_str());
                     return EVENT_BLOCK;
diff --git a/src/guiengine/event_handler.hpp b/src/guiengine/event_handler.hpp
index f4207f4e8..be31df84f 100644
--- a/src/guiengine/event_handler.hpp
+++ b/src/guiengine/event_handler.hpp
@@ -62,8 +62,7 @@ namespace GUIEngine
         
         EventPropagation onGUIEvent(const irr::SEvent& event);
         EventPropagation onWidgetActivated(Widget* w, const int playerID);
-        void navigateUp(const int playerID, Input::InputType type, const bool pressedDown);
-        void navigateDown(const int playerID, Input::InputType type, const bool pressedDown);
+        void navigate(const int playerID, Input::InputType type, const bool pressedDown, const bool reverse);
 
         /** \brief          send an event to the GUI module user's event callback
           * \param widget   the widget that triggerred this event
diff --git a/src/guiengine/scalable_font.cpp b/src/guiengine/scalable_font.cpp
index 8f4701847..f31a933fe 100644
--- a/src/guiengine/scalable_font.cpp
+++ b/src/guiengine/scalable_font.cpp
@@ -21,9 +21,9 @@ namespace gui
 {
 
 //! constructor
-ScalableFont::ScalableFont(IGUIEnvironment *env, const io::path& filename)
-: Driver(0), SpriteBank(0), Environment(env), WrongCharacter(0),
-    MaxHeight(0), GlobalKerningWidth(0), GlobalKerningHeight(0)
+ScalableFont::ScalableFont(IGUIEnvironment *env, const std::string &filename)
+            : Driver(0), SpriteBank(0), Environment(env), WrongCharacter(0),
+              MaxHeight(0), GlobalKerningWidth(0), GlobalKerningHeight(0)
 {
 #ifdef _DEBUG
     setDebugName("ScalableFont");
@@ -44,7 +44,7 @@ ScalableFont::ScalableFont(IGUIEnvironment *env, const io::path& filename)
         // don't grab environment, to avoid circular references
         Driver = Environment->getVideoDriver();
 
-        SpriteBank = Environment->addEmptySpriteBank(filename);
+        SpriteBank = Environment->addEmptySpriteBank(io::path(filename.c_str()));
         if (SpriteBank)
             SpriteBank->grab();
     }
@@ -676,7 +676,6 @@ void ScalableFont::draw(const core::stringw& text,
                         source,
                         clip,
                         color, true);
-
 #ifdef FONT_DEBUG
             driver->draw2DLine(core::position2d<s32>(dest.UpperLeftCorner.X,  dest.UpperLeftCorner.Y),
                                core::position2d<s32>(dest.UpperLeftCorner.X,  dest.LowerRightCorner.Y),
diff --git a/src/guiengine/scalable_font.hpp b/src/guiengine/scalable_font.hpp
index 431dad384..98962e6d3 100644
--- a/src/guiengine/scalable_font.hpp
+++ b/src/guiengine/scalable_font.hpp
@@ -5,17 +5,19 @@
 #ifndef __C_GUI_FONT_H_INCLUDED__
 #define __C_GUI_FONT_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
+#include "utils/leak_check.hpp"
 
+#include "IrrCompileConfig.h"
 #include "IGUIFontBitmap.h"
 #include "irrString.h"
 #include "irrMap.h"
 #include "IXMLReader.h"
 #include "IReadFile.h"
 #include "irrArray.h"
-#include <map>
 
-#include "utils/leak_check.hpp"
+
+#include <map>
+#include <string>
 
 namespace irr
 {
@@ -72,7 +74,7 @@ public:
     int           m_fallback_kerning_width;
 
     //! constructor
-    ScalableFont(IGUIEnvironment* env, const io::path& filename);
+    ScalableFont(IGUIEnvironment* env, const std::string &filename);
 
     /** Creates a hollow copy of this font; i.e. the underlying font data is the *same* for
       * both fonts. The advantage of doing this is that you can change "view" parameters
diff --git a/src/guiengine/widget.cpp b/src/guiengine/widget.cpp
index 446d4b565..4d8fe4e98 100644
--- a/src/guiengine/widget.cpp
+++ b/src/guiengine/widget.cpp
@@ -339,7 +339,6 @@ void Widget::setVisible(bool visible)
         m_element->setVisible(visible);
     }
     m_is_visible = visible;
-    m_deactivated = !visible;
 
     const int childrenCount = m_children.size();
     for (int n=0; n<childrenCount; n++)
diff --git a/src/guiengine/widgets/spinner_widget.hpp b/src/guiengine/widgets/spinner_widget.hpp
index e5a315234..8b3e6c326 100644
--- a/src/guiengine/widgets/spinner_widget.hpp
+++ b/src/guiengine/widgets/spinner_widget.hpp
@@ -173,8 +173,6 @@ namespace GUIEngine
         
         /** Override method from base class Widget */
         virtual void setDeactivated();
-        
-        bool isActivated() { return !m_deactivated; }
 
         /** Display custom text in spinner */
         void setCustomText(const core::stringw& text);
diff --git a/src/items/flyable.cpp b/src/items/flyable.cpp
index 4f043a7cd..e7b5d3ea1 100644
--- a/src/items/flyable.cpp
+++ b/src/items/flyable.cpp
@@ -308,6 +308,10 @@ void Flyable::getLinearKartItemIntersection (const Vec3 &origin,
 
     float fire_th = (dx*dist - dz * sqrtf(dx*dx + dz*dz - dist*dist))
                   / (dx*dx + dz*dz);
+    if(fire_th>1)
+        fire_th = 1.0f;
+    else if (fire_th<-1.0f)
+        fire_th = -1.0f;
     fire_th = (((dist - dx*fire_th) / dz > 0) ? -acosf(fire_th)
                                               :  acosf(fire_th));
 
@@ -326,8 +330,10 @@ void Flyable::getLinearKartItemIntersection (const Vec3 &origin,
         fire_th += M_PI;
 
     //createPhysics offset
+    assert(sqrt(a*a+b*b)!=0);
     time -= forw_offset / sqrt(a*a+b*b);
 
+    assert(time!=0);
     *fire_angle = fire_th;
     *up_velocity = (0.5f * time * gravity) + (dy / time)
                  + (gy * target_kart->getSpeed());
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index c6d975ee4..efe45ef5c 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1752,7 +1752,7 @@ void Kart::crashed(const Material *m, const Vec3 &normal)
         btVector3 gravity = m_body->getGravity();
         gravity.normalize();
         // Cast necessary since otherwise to operator- (vec3/btvector) exists
-        Vec3 impulse =  (btVector3)normal - gravity* btDot(normal, gravity);
+        Vec3 impulse =  normal - gravity* btDot(normal, gravity);
         if(impulse.getX() || impulse.getZ())
             impulse.normalize();
         else
diff --git a/src/main.cpp b/src/main.cpp
index ace12925b..934dfbfff 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -405,7 +405,7 @@ void setupRaceStart()
     StateManager::get()->createActivePlayer(
         PlayerManager::get()->getPlayer(0), device);
 
-    if (kart_properties_manager->getKart(UserConfigParams::m_default_kart) == NULL)
+    if (!kart_properties_manager->getKart(UserConfigParams::m_default_kart))
     {
         Log::warn("main", "Kart '%s' is unknown so will use the "
             "default kart.",
@@ -418,6 +418,13 @@ void setupRaceStart()
         race_manager->setLocalKartInfo(0, UserConfigParams::m_default_kart);
     }
 
+    if(!track_manager->getTrack(UserConfigParams::m_last_track))
+    {
+        race_manager->setTrack("jungle");
+    }
+    else
+        race_manager->setTrack(UserConfigParams::m_last_track);
+
     // ASSIGN should make sure that only input from assigned devices
     // is read.
     input_manager->getDeviceList()->setAssignMode(ASSIGN);
diff --git a/src/modes/cutscene_world.cpp b/src/modes/cutscene_world.cpp
index 319f901e5..a998896e8 100644
--- a/src/modes/cutscene_world.cpp
+++ b/src/modes/cutscene_world.cpp
@@ -32,6 +32,7 @@
 #include "physics/physics.hpp"
 #include "states_screens/credits.hpp"
 #include "states_screens/cutscene_gui.hpp"
+#include "states_screens/feature_unlocked.hpp"
 #include "states_screens/offline_kart_selection.hpp"
 #include "states_screens/main_menu_screen.hpp"
 #include "tracks/track.hpp"
@@ -367,20 +368,26 @@ void CutsceneWorld::update(float dt)
         }
     }
 
-    bool isOver = (m_time > m_duration);
-    if (isOver && (s_use_duration || m_aborted))
-    {
-        GUIEngine::CutsceneScreen* cs = dynamic_cast<GUIEngine::CutsceneScreen*>(
-            GUIEngine::getCurrentScreen());
-        if (cs != NULL)
-            cs->onCutsceneEnd();
-    }
+    //bool isOver = (m_time > m_duration);
+    //if (isOver && (s_use_duration || m_aborted))
+    //{
+    //    GUIEngine::CutsceneScreen* cs = dynamic_cast<GUIEngine::CutsceneScreen*>(
+    //        GUIEngine::getCurrentScreen());
+    //    if (cs != NULL)
+    //        cs->onCutsceneEnd();
+    //}
 }   // update
 
 //-----------------------------------------------------------------------------
 
 void CutsceneWorld::enterRaceOverState()
 {
+    GUIEngine::CutsceneScreen* cs = dynamic_cast<GUIEngine::CutsceneScreen*>(
+        GUIEngine::getCurrentScreen());
+    if (cs != NULL)
+        cs->onCutsceneEnd();
+
+
     int partId = -1;
     for (int i=0; i<(int)m_parts.size(); i++)
     {
@@ -408,17 +415,101 @@ void CutsceneWorld::enterRaceOverState()
         else  if (m_parts.size() == 1 && m_parts[0] == "gpwin")
         {
             race_manager->exitRace();
-            StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
-            if (race_manager->raceWasStartedFromOverworld())
-                OverWorld::enterOverWorld();
+
+            // un-set the GP mode so that after unlocking, it doesn't try to continue the GP
+            race_manager->setMajorMode(RaceManager::MAJOR_MODE_SINGLE);
+
+            std::vector<const ChallengeData*> unlocked =
+                PlayerManager::getCurrentPlayer()->getRecentlyCompletedChallenges();
+            if (unlocked.size() > 0)
+            {
+                //PlayerManager::getCurrentPlayer()->clearUnlocked();
+
+                StateManager::get()->enterGameState();
+                race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
+                race_manager->setNumKarts(0);
+                race_manager->setNumPlayers(0);
+                race_manager->setNumLocalPlayers(0);
+                race_manager->startSingleRace("featunlocked", 999, false);
+
+                FeatureUnlockedCutScene* scene =
+                    FeatureUnlockedCutScene::getInstance();
+                std::vector<std::string> parts;
+                parts.push_back("featunlocked");
+                ((CutsceneWorld*)World::getWorld())->setParts(parts);
+
+                assert(unlocked.size() > 0);
+                scene->addTrophy(race_manager->getDifficulty());
+                scene->findWhatWasUnlocked(race_manager->getDifficulty());
+
+                StateManager::get()->replaceTopMostScreen(scene, GUIEngine::INGAME_MENU);
+            }
+            else
+            {
+                if (race_manager->raceWasStartedFromOverworld())
+                {
+                    //StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+                    OverWorld::enterOverWorld();
+                }
+                else
+                {
+                    StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+                    // we assume the main menu was pushed before showing this menu
+                    //StateManager::get()->popMenu();
+                }
+            }
         }
         // TODO: remove hardcoded knowledge of cutscenes, replace with scripting probably
-        else  if (m_parts.size() == 1 && m_parts[0] == "gplose")
+        else if (m_parts.size() == 1 && m_parts[0] == "gplose")
         {
+            //race_manager->exitRace();
+            //StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+            //if (race_manager->raceWasStartedFromOverworld())
+            //    OverWorld::enterOverWorld();
+
             race_manager->exitRace();
-            StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
-            if (race_manager->raceWasStartedFromOverworld())
-                OverWorld::enterOverWorld();
+
+            // un-set the GP mode so that after unlocking, it doesn't try to continue the GP
+            race_manager->setMajorMode(RaceManager::MAJOR_MODE_SINGLE);
+
+            std::vector<const ChallengeData*> unlocked =
+                PlayerManager::getCurrentPlayer()->getRecentlyCompletedChallenges();
+            if (unlocked.size() > 0)
+            {
+                //PlayerManager::getCurrentPlayer()->clearUnlocked();
+
+                StateManager::get()->enterGameState();
+                race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
+                race_manager->setNumKarts(0);
+                race_manager->setNumPlayers(0);
+                race_manager->setNumLocalPlayers(0);
+                race_manager->startSingleRace("featunlocked", 999, false);
+
+                FeatureUnlockedCutScene* scene =
+                    FeatureUnlockedCutScene::getInstance();
+                std::vector<std::string> parts;
+                parts.push_back("featunlocked");
+                ((CutsceneWorld*)World::getWorld())->setParts(parts);
+
+                scene->addTrophy(race_manager->getDifficulty());
+                scene->findWhatWasUnlocked(race_manager->getDifficulty());
+
+                StateManager::get()->replaceTopMostScreen(scene, GUIEngine::INGAME_MENU);
+            }
+            else
+            {
+                if (race_manager->raceWasStartedFromOverworld())
+                {
+                    //StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+                    OverWorld::enterOverWorld();
+                }
+                else
+                {
+                    StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+                    // we assume the main menu was pushed before showing this menu
+                    //StateManager::get()->popMenu();
+                }
+            }
         }
         // TODO: remove hardcoded knowledge of cutscenes, replace with scripting probably
         else if (race_manager->getTrackName() == "introcutscene" ||
@@ -438,6 +529,28 @@ void CutsceneWorld::enterRaceOverState()
                 StateManager::get()->pushScreen( s );
             }
         }
+        // TODO: remove hardcoded knowledge of cutscenes, replace with scripting probably
+        else if (m_parts.size() == 1 && m_parts[0] == "featunlocked")
+        {
+            if (race_manager->getMajorMode() == RaceManager::MAJOR_MODE_GRAND_PRIX)
+            {
+                // in GP mode, continue GP after viewing this screen
+                StateManager::get()->popMenu();
+                race_manager->next();
+            }
+            else
+            {
+                // back to menu or overworld
+                race_manager->exitRace();
+                StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+                //StateManager::get()->popMenu();
+
+                if (race_manager->raceWasStartedFromOverworld())
+                {
+                    OverWorld::enterOverWorld();
+                }
+            }
+        }
         else
         {
             race_manager->exitRace();
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index 1b86b76a7..facd390a1 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -794,6 +794,11 @@ void World::updateWorld(float dt)
         return;
 
     update(dt);
+
+#ifdef DEBUG
+    assert(m_magic_number == 0xB01D6543);
+#endif
+    
     if( (!isFinishPhase()) && isRaceOver())
     {
         enterRaceOverState();
diff --git a/src/modes/world_with_rank.hpp b/src/modes/world_with_rank.hpp
index 100802d7c..d51bf9352 100644
--- a/src/modes/world_with_rank.hpp
+++ b/src/modes/world_with_rank.hpp
@@ -77,6 +77,6 @@ public:
 
 
 
-    };   // WorldWithRank
+};   // WorldWithRank
 
 #endif
diff --git a/src/online/messages.cpp b/src/online/messages.cpp
deleted file mode 100644
index 9bdfce9b9..000000000
--- a/src/online/messages.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "online/messages.hpp"
-#include "utils/translation.hpp"
-#include "utils/time.hpp"
-
-namespace Online
-{
-    namespace Messages
-    {
-        irr::core::stringw signingIn()
-        {
-            return irr::core::stringw(_("Signing in")) + loadingDots();
-        }
-        // ------------------------------------------------------------------------
-
-        irr::core::stringw signingOut()
-        {
-            return irr::core::stringw(_("Signing out")) + loadingDots();
-        }
-        // ------------------------------------------------------------------------
-        irr::core::stringw validatingInfo()
-        {
-            return irr::core::stringw(_("Validating info")) + loadingDots();
-        }
-        // ------------------------------------------------------------------------
-        irr::core::stringw searching()
-        {
-            return irr::core::stringw(_("Searching")) + loadingDots();
-        }
-        // ------------------------------------------------------------------------
-
-        irr::core::stringw joiningServer()
-        {
-            return irr::core::stringw(_("Joining server")) + loadingDots();
-        }
-        // ------------------------------------------------------------------------
-
-        irr::core::stringw creatingServer()
-        {
-            return irr::core::stringw(_("Creating server")) + loadingDots();
-        }
-
-        // ------------------------------------------------------------------------
-
-        irr::core::stringw fetchingServers()
-        {
-            return irr::core::stringw(_("Fetching servers")) + loadingDots();
-        }
-
-        // ------------------------------------------------------------------------
-
-        irr::core::stringw fetchingFriends()
-        {
-            return irr::core::stringw(_("Fetching friends")) + loadingDots();
-        }
-
-        // ------------------------------------------------------------------------
-
-        irr::core::stringw fetchingAchievements()
-        {
-            return irr::core::stringw(_("Fetching achievements")) + loadingDots();
-        }
-
-        // ------------------------------------------------------------------------
-
-        irr::core::stringw processing()
-        {
-            return irr::core::stringw(_("Processing")) + loadingDots();
-        }
-
-        // ------------------------------------------------------------------------
-        /** Convenience function to type less in calls. */
-        irr::core::stringw loadingDots(const wchar_t *s)
-        {
-            return irr::core::stringw(s)+loadingDots();
-        }
-        // ------------------------------------------------------------------------
-        /**
-          * Shows a increasing number of dots.
-          * \param interval A float representing the time it takes to add a new dot
-          * \param max_dots The number of dots used. Defaults to 3.
-          */
-        irr::core::stringw loadingDots(float interval, int max_dots)
-        {
-            int nr_dots = int(floor(StkTime::getRealTime() / interval)) % (max_dots+1);
-            return irr::core::stringw((std::string(nr_dots,'.') + std::string(max_dots-nr_dots,' ')).c_str());
-        }
-    } // namespace messages
-} // namespace Online
-
-
-/* EOF */
diff --git a/src/online/messages.hpp b/src/online/messages.hpp
deleted file mode 100644
index 9349caf91..000000000
--- a/src/online/messages.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HEADER_ONLINE_MESSAGES_HPP
-#define HEADER_ONLINE_MESSAGES_HPP
-
-#include <string>
-#include <irrString.h>
-
-namespace Online
-{
-    /**
-      * \brief Messages to be shown related to API communication
-      * \ingroup online
-      */
-    namespace Messages
-    {
-        irr::core::stringw loadingDots          (float interval = 0.5f, int max_dots = 3);
-        irr::core::stringw loadingDots          (const wchar_t *s);
-        irr::core::stringw signingIn            ();
-        irr::core::stringw signingOut           ();
-        irr::core::stringw validatingInfo       ();
-        irr::core::stringw searching            ();
-        irr::core::stringw joiningServer        ();
-        irr::core::stringw creatingServer       ();
-        irr::core::stringw fetchingServers      ();
-        irr::core::stringw fetchingFriends      ();
-        irr::core::stringw fetchingAchievements ();
-        irr::core::stringw processing           ();
-    } // namespace Messages
-}// namespace Online
-#endif
-
-/* EOF */
diff --git a/src/online/online_player_profile.cpp b/src/online/online_player_profile.cpp
index 11634a4a0..28e955fe0 100644
--- a/src/online/online_player_profile.cpp
+++ b/src/online/online_player_profile.cpp
@@ -125,8 +125,8 @@ namespace Online
         request->addParameter("username",username);
         request->addParameter("password",password);
         request->addParameter("save-session",
-                              UserConfigParams::m_remember_user ? "true"
-                                                                : "false");
+                              rememberPassword() ? "true"
+                                                 : "false");
         request->queue();
         m_online_state = OS_SIGNING_IN;
         return request;
@@ -187,18 +187,18 @@ namespace Online
             m_profile = new OnlineProfile(userid, username, true);
             assert(token_fetched && username_fetched && userid_fetched);
             m_online_state = OS_SIGNED_IN;
-            if(UserConfigParams::m_remember_user)
+            if(rememberPassword())
             {
-                saveSession(getOnlineId(), getToken() );
+                saveSession(getOnlineId(), getToken());
             }
             ProfileManager::get()->addPersistent(m_profile);
             std::string achieved_string("");
-            if(input->get("achieved", &achieved_string) == 1)
-            {
-                std::vector<uint32_t> achieved_ids =
-                    StringUtils::splitToUInt(achieved_string, ' ');
-                PlayerManager::getCurrentAchievementsStatus()->sync(achieved_ids);
-            }
+            // Even if no achievements were sent, we have to call sync
+            // in order to upload local achievements to the server
+            input->get("achieved", &achieved_string);
+            std::vector<uint32_t> achieved_ids = 
+                            StringUtils::splitToUInt(achieved_string, ' ');
+            PlayerManager::getCurrentAchievementsStatus()->sync(achieved_ids);
             m_profile->fetchFriends();
         }   // if success
         else
@@ -238,8 +238,8 @@ namespace Online
             {
                 m_player = player;
                 m_player->setUserDetails(this,
-                    UserConfigParams::m_remember_user ? "client-quit"
-                                                      :"disconnect");
+                    m_player->rememberPassword() ? "client-quit"
+                                       : "disconnect");
                 setAbortable(false);
             }   // SignOutRequest
         };   // SignOutRequest
@@ -282,7 +282,7 @@ namespace Online
         m_profile = NULL;
         m_online_state = OS_SIGNED_OUT;
         // Discard token if session should not be saved.
-        if(!UserConfigParams::m_remember_user)
+        if(!rememberPassword())
             clearSession();
     }   // signOut
 
diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
index fd009d103..45eaeb564 100644
--- a/src/physics/physical_object.cpp
+++ b/src/physics/physical_object.cpp
@@ -188,7 +188,7 @@ void PhysicalObject::move(const Vec3& xyz, const core::vector3df& hpr)
     irr::core::quaternion tempQuat(mat);
     q = btQuaternion(tempQuat.X, tempQuat.Y, tempQuat.Z, tempQuat.W);
 
-    btTransform trans(q,(btVector3)xyz-quatRotate(q,m_graphical_offset));
+    btTransform trans(q, xyz-quatRotate(q,m_graphical_offset));
     m_motion_state->setWorldTransform(trans);
 }   // move
 
diff --git a/src/states_screens/create_server_screen.cpp b/src/states_screens/create_server_screen.cpp
index cf3f49fd4..7189302e7 100644
--- a/src/states_screens/create_server_screen.cpp
+++ b/src/states_screens/create_server_screen.cpp
@@ -24,7 +24,6 @@
 #include "config/player_manager.hpp"
 #include "modes/demo_world.hpp"
 #include "online/servers_manager.hpp"
-#include "online/messages.hpp"
 #include "states_screens/online_screen.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
@@ -115,7 +114,8 @@ void CreateServerScreen::onUpdate(float delta)
         else
         {
             m_info_widget->setDefaultColor();
-            m_info_widget->setText(Online::Messages::creatingServer(), false);
+            m_info_widget->setText(StringUtils::loadingDots(_("Creating server")),
+                                   false);
         }
     }
 }   // onUpdate
diff --git a/src/states_screens/dialogs/change_password_dialog.cpp b/src/states_screens/dialogs/change_password_dialog.cpp
index 632414d19..16aaf3b63 100644
--- a/src/states_screens/dialogs/change_password_dialog.cpp
+++ b/src/states_screens/dialogs/change_password_dialog.cpp
@@ -21,7 +21,6 @@
 #include "config/player_manager.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets.hpp"
-#include "online/messages.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
@@ -227,7 +226,8 @@ void ChangePasswordDialog::error(const irr::core::stringw & error)
 void ChangePasswordDialog::onUpdate(float dt)
 {
     if(!m_options_widget->isActivated())
-        m_info_widget->setText(Online::Messages::validatingInfo(), false);
+        m_info_widget->setText(StringUtils::loadingDots(_("Validating info")),
+                              false                                          );
 
     // It's unsafe to delete from inside the event handler so we do it here
     if (m_self_destroy)
diff --git a/src/states_screens/dialogs/recovery_dialog.cpp b/src/states_screens/dialogs/recovery_dialog.cpp
index 7d396e3d5..b8ba2d12b 100644
--- a/src/states_screens/dialogs/recovery_dialog.cpp
+++ b/src/states_screens/dialogs/recovery_dialog.cpp
@@ -20,7 +20,6 @@
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
 #include "guiengine/engine.hpp"
-#include "online/messages.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
@@ -200,7 +199,8 @@ void RecoveryDialog::onUpdate(float dt)
         }
         else
         {
-            m_info_widget->setText(Messages::validatingInfo(), false);
+            m_info_widget->setText(StringUtils::loadingDots(_("Validating info")),
+                                   false);
         }
     }
     // It's unsafe to delete from inside the event handler so we do it here
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index 2ebfbdc95..61533f9ff 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -24,7 +24,6 @@
 #include "states_screens/register_screen.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
-#include "online/messages.hpp"
 
 #include <IGUIEnvironment.h>
 
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 0dbe551a4..3887ca1b9 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -21,7 +21,6 @@
 #include "guiengine/engine.hpp"
 #include "network/protocol_manager.hpp"
 #include "network/protocols/connect_to_server.hpp"
-#include "online/messages.hpp"
 #include "online/servers_manager.hpp"
 #include "states_screens/dialogs/registration_dialog.hpp"
 #include "states_screens/networking_lobby.hpp"
@@ -152,7 +151,8 @@ void ServerInfoDialog::onUpdate(float dt)
         else
         {
             m_info_widget->setDefaultColor();
-            m_info_widget->setText(Online::Messages::joiningServer(), false);
+            m_info_widget->setText(StringUtils::loadingDots(_("Joining server")),
+                                   false);
         }
     }
 
diff --git a/src/states_screens/dialogs/user_info_dialog.cpp b/src/states_screens/dialogs/user_info_dialog.cpp
index 22a937561..71ec898fa 100644
--- a/src/states_screens/dialogs/user_info_dialog.cpp
+++ b/src/states_screens/dialogs/user_info_dialog.cpp
@@ -22,7 +22,6 @@
 #include "guiengine/dialog_queue.hpp"
 #include "guiengine/engine.hpp"
 #include "online/online_profile.hpp"
-#include "online/messages.hpp"
 #include "states_screens/online_profile_friends.hpp"
 #include "states_screens/online_profile_overview.hpp"
 #include "states_screens/state_manager.hpp"
@@ -453,7 +452,8 @@ bool UserInfoDialog::onEscapePressed()
 
 void UserInfoDialog::onUpdate(float dt)
 {
-    if(m_processing) m_info_widget->setText(Messages::processing(), false);
+    if(m_processing) 
+        m_info_widget->setText(StringUtils::loadingDots(_("Processing")), false);
 
     //If we want to open the registration dialog, we need to close this one first
     if (m_enter_profile) m_self_destroy = true;
diff --git a/src/states_screens/dialogs/vote_dialog.cpp b/src/states_screens/dialogs/vote_dialog.cpp
index f0efb36de..8fb5895d6 100644
--- a/src/states_screens/dialogs/vote_dialog.cpp
+++ b/src/states_screens/dialogs/vote_dialog.cpp
@@ -21,7 +21,6 @@
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
 #include "guiengine/engine.hpp"
-#include "online/messages.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
@@ -164,8 +163,8 @@ void VoteDialog::updateFetchVote()
     if (!m_fetch_vote_request->isDone())
     {
         // request still pending
-        m_info_widget->setText(irr::core::stringw(_("Fetching last vote"))
-                               + Messages::loadingDots(),               false);
+        m_info_widget->setText(StringUtils::loadingDots(_("Fetching last vote")),
+                               false                                          );
         return;
     }   // !isDone
 
@@ -236,8 +235,8 @@ void VoteDialog::onUpdate(float dt)
         }   // isDone
         else
         {
-            m_info_widget->setText(irr::core::stringw(_("Performing vote"))
-                                   + Messages::loadingDots(), false);
+            m_info_widget->setText(StringUtils::loadingDots(_("Performing vote")),
+                                   false);
         }   // !isDone
     }
 
diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp
index e414c06f3..2fc48313d 100644
--- a/src/states_screens/feature_unlocked.cpp
+++ b/src/states_screens/feature_unlocked.cpp
@@ -156,7 +156,7 @@ void FeatureUnlockedCutScene::onCutsceneEnd()
         irr_driver->removeNode(m_avoid_irrlicht_bug);
     m_avoid_irrlicht_bug = NULL;
 #endif
-
+    
     m_unlocked_stuff.clearAndDeleteAll();
     m_all_kart_models.clearAndDeleteAll();
 
@@ -319,7 +319,7 @@ void FeatureUnlockedCutScene::init()
         else if (!m_unlocked_stuff[n].m_pictures.empty())
         {
             video::SMaterial m;
-            m.MaterialType    = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+            //m.MaterialType    = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
             m.BackfaceCulling = false;
             m.setTexture(0, m_unlocked_stuff[n].m_pictures[0]);
             m.AmbientColor  = video::SColor(255, 255, 255, 255);
@@ -335,8 +335,16 @@ void FeatureUnlockedCutScene::init()
                 irr_driver->createTexturedQuadMesh(&m,
                                                    m_unlocked_stuff[n].m_w,
                                                    m_unlocked_stuff[n].m_h);
-            m_unlocked_stuff[n].m_root_gift_node   = irr_driver->addMesh(mesh);
-            mesh->drop();
+            m_unlocked_stuff[n].m_root_gift_node = irr_driver->getSceneManager()->addEmptySceneNode();
+            m_unlocked_stuff[n].m_side_1 = irr_driver->addMesh(mesh, m_unlocked_stuff[n].m_root_gift_node);
+            //mesh->drop();
+
+            mesh = irr_driver->createTexturedQuadMesh(&m,
+                m_unlocked_stuff[n].m_w,
+                m_unlocked_stuff[n].m_h);
+            m_unlocked_stuff[n].m_side_2 = irr_driver->addMesh(mesh, m_unlocked_stuff[n].m_root_gift_node);
+            m_unlocked_stuff[n].m_side_2->setRotation(core::vector3df(0.0f, 180.0f, 0.0f));
+            //mesh->drop();
 #ifdef DEBUG
             m_unlocked_stuff[n].m_root_gift_node->setName("unlocked track picture");
 #endif
@@ -346,6 +354,8 @@ void FeatureUnlockedCutScene::init()
             std::cerr << "Malformed unlocked goody!!!\n";
         }
     }
+
+    PlayerManager::getCurrentPlayer()->clearUnlocked();
 }   // init
 
 // ----------------------------------------------------------------------------
@@ -353,7 +363,6 @@ void FeatureUnlockedCutScene::init()
 void FeatureUnlockedCutScene::tearDown()
 {
     Screen::tearDown();
-    ((CutsceneWorld*)World::getWorld())->abortCutscene();
 }   // tearDown
 
 // ----------------------------------------------------------------------------
@@ -379,8 +388,6 @@ void FeatureUnlockedCutScene::onUpdate(float dt)
         float progress_factor = (m_global_time - GIFT_EXIT_FROM) / (GIFT_EXIT_TO - GIFT_EXIT_FROM);
         float smoothed_progress_factor = sin((progress_factor - 0.5f)*M_PI)/2.0f + 0.5f;
 
-        Log::info("smoothed_progress_factor", "%f", smoothed_progress_factor);
-
         for (int n=0; n<unlockedStuffCount; n++)
         {
             if (m_unlocked_stuff[n].m_root_gift_node == NULL) continue;
@@ -433,7 +440,7 @@ void FeatureUnlockedCutScene::onUpdate(float dt)
                 if (textureID != previousTextureID)
                 {
                     scene::IMeshSceneNode* node = (scene::IMeshSceneNode*)m_unlocked_stuff[n].m_root_gift_node;
-                    scene::IMesh* mesh = node->getMesh();
+                    scene::IMesh* mesh = m_unlocked_stuff[n].m_side_1->getMesh();
 
                     assert(mesh->getMeshBufferCount() == 1);
 
@@ -444,7 +451,21 @@ void FeatureUnlockedCutScene::onUpdate(float dt)
 
                     // FIXME: this mesh is already associated with this node. I'm calling this
                     // to force irrLicht to refresh the display, now that Material has changed.
-                    node->setMesh(mesh);
+                    m_unlocked_stuff[n].m_side_1->setMesh(mesh);
+
+                    m_unlocked_stuff[n].m_curr_image = textureID;
+
+
+                    mesh = m_unlocked_stuff[n].m_side_2->getMesh();
+                    assert(mesh->getMeshBufferCount() == 1);
+                    mb = mesh->getMeshBuffer(0);
+
+                    SMaterial& m2 = mb->getMaterial();
+                    m2.setTexture(0, m_unlocked_stuff[n].m_pictures[textureID]);
+
+                    // FIXME: this mesh is already associated with this node. I'm calling this
+                    // to force irrLicht to refresh the display, now that Material has changed.
+                    m_unlocked_stuff[n].m_side_2->setMesh(mesh);
 
                     m_unlocked_stuff[n].m_curr_image = textureID;
                 }   // textureID != previousTextureID
@@ -546,7 +567,6 @@ void FeatureUnlockedCutScene::addUnlockedGP(const GrandPrixData* gp)
 
 bool FeatureUnlockedCutScene::onEscapePressed()
 {
-    ((CutsceneWorld*)World::getWorld())->abortCutscene();
     continueButtonPressed();
     return false; // continueButtonPressed already pop'ed the menu
 }   // onEscapePressed
@@ -555,35 +575,20 @@ bool FeatureUnlockedCutScene::onEscapePressed()
 
 void FeatureUnlockedCutScene::continueButtonPressed()
 {
-    if (m_global_time < GIFT_EXIT_TO)
-    {
-        // If animation was not over yet, the button is used to skip the animation
-        while (m_global_time < GIFT_EXIT_TO)
-        {
-            // simulate all the steps of the animation until we reach the end
-            onUpdate(0.4f);
-        }
-    }
-    else
-    {
-        if (race_manager->getMajorMode() == RaceManager::MAJOR_MODE_GRAND_PRIX)
-        {
-            // in GP mode, continue GP after viewing this screen
-            StateManager::get()->popMenu();
-            race_manager->next();
-        }
-        else
-        {
-            // back to menu or overworld
-            race_manager->exitRace();
-            StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
-
-            if (race_manager->raceWasStartedFromOverworld())
-            {
-                OverWorld::enterOverWorld();
-            }
-        }
-    }
+    //if (m_global_time < GIFT_EXIT_TO)
+    //{
+    //    // If animation was not over yet, the button is used to skip the animation
+    //    while (m_global_time < GIFT_EXIT_TO)
+    //    {
+    //        // simulate all the steps of the animation until we reach the end
+    //        onUpdate(0.4f);
+    //        World::getWorld()->updateWorld(0.4f);
+    //    }
+    //}
+    //else
+    //{
+        ((CutsceneWorld*)World::getWorld())->abortCutscene();
+    //}
 
 }   // continueButtonPressed
 
diff --git a/src/states_screens/feature_unlocked.hpp b/src/states_screens/feature_unlocked.hpp
index 5ac512e53..70589ab05 100644
--- a/src/states_screens/feature_unlocked.hpp
+++ b/src/states_screens/feature_unlocked.hpp
@@ -60,6 +60,9 @@ class FeatureUnlockedCutScene : public GUIEngine::CutsceneScreen, public GUIEngi
         /** Contains whatever is in the chest */
         scene::ISceneNode* m_root_gift_node;
 
+        scene::IMeshSceneNode* m_side_1;
+        scene::IMeshSceneNode* m_side_2;
+
         float m_scale;
 
         irr::core::stringw m_unlock_message;
diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index e5d3fca69..f9bc459fd 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -109,37 +109,6 @@ void GrandPrixLose::onCutsceneEnd()
     m_kart_node[1] = NULL;
     m_kart_node[2] = NULL;
     m_kart_node[3] = NULL;
-
-    // un-set the GP mode so that after unlocking, it doesn't try to continue the GP
-    race_manager->setMajorMode(RaceManager::MAJOR_MODE_SINGLE);
-
-    std::vector<const ChallengeData*> unlocked =
-        PlayerManager::getCurrentPlayer()->getRecentlyCompletedChallenges();
-    if (unlocked.size() > 0)
-    {
-
-        FeatureUnlockedCutScene* scene =
-            FeatureUnlockedCutScene::getInstance();
-
-        scene->addTrophy(race_manager->getDifficulty());
-        scene->findWhatWasUnlocked(race_manager->getDifficulty());
-
-        StateManager::get()->replaceTopMostScreen(scene);
-        PlayerManager::getCurrentPlayer()->clearUnlocked();
-    }
-    else
-    {
-        if (race_manager->raceWasStartedFromOverworld())
-        {
-            StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
-            OverWorld::enterOverWorld();
-        }
-        else
-        {
-            // we assume the main menu was pushed before showing this menu
-            StateManager::get()->popMenu();
-        }
-    }
 }
 
 // -------------------------------------------------------------------------------------
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index 18bf4c927..97a0b835f 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -114,32 +114,6 @@ void GrandPrixWin::onCutsceneEnd()
     m_podium_steps[0] = NULL;
     m_podium_steps[1] = NULL;
     m_podium_steps[2] = NULL;
-
-
-
-    // un-set the GP mode so that after unlocking, it doesn't try to continue the GP
-    race_manager->setMajorMode(RaceManager::MAJOR_MODE_SINGLE);
-
-    if (PlayerManager::getCurrentPlayer()
-        ->getRecentlyCompletedChallenges().size() > 0)
-    {
-        std::vector<const ChallengeData*> unlocked =
-            PlayerManager::getCurrentPlayer()->getRecentlyCompletedChallenges();
-        PlayerManager::getCurrentPlayer()->clearUnlocked();
-
-        FeatureUnlockedCutScene* scene = FeatureUnlockedCutScene::getInstance();
-
-        assert(unlocked.size() > 0);
-        scene->addTrophy(race_manager->getDifficulty());
-        scene->findWhatWasUnlocked(race_manager->getDifficulty());
-
-        StateManager::get()->replaceTopMostScreen(scene);
-    }
-    else
-    {
-        // we assume the main menu was pushed before showing this menu
-        StateManager::get()->popMenu();
-    }
 }
 
 // -------------------------------------------------------------------------------------
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index d704836a4..df1d923e8 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -348,7 +348,6 @@ PlayerKartWidget::PlayerKartWidget(KartSelectionScreen* parent,
 
     // ---- Kart name label
     m_kart_name = new LabelWidget();
-    m_kart_name->add(); // add the widget
     m_kart_name->setText(props->getName(), false);
     m_kart_name->m_properties[PROP_TEXT_ALIGN] = "center";
     m_kart_name->m_properties[PROP_ID] =
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index 956b902a3..93c672d08 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -230,12 +230,14 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
     */
 
 #if DEBUG_MENU_ITEM
-    if (selection == "options")
+    if (selection == "gpEditor")
     {
         // The DEBUG item
+        StoryModeStatus* sms = PlayerManager::getCurrentPlayer()->getStoryModeStatus();
+        sms->unlockFeature(const_cast<ChallengeStatus*>(sms->getChallengeStatus("gp1")),
+            RaceManager::DIFFICULTY_HARD);
 
         // GP WIN
-        /*
         StateManager::get()->enterGameState();
         race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
         race_manager->setNumKarts(0);
@@ -246,9 +248,9 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
         StateManager::get()->pushScreen(scene);
         const std::string winners[] = { "elephpant", "nolok", "pidgin" };
         scene->setKarts(winners);
-        */
 
         // GP Lose
+        /*
         StateManager::get()->enterGameState();
         race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
         race_manager->setNumKarts(0);
@@ -263,15 +265,26 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
         //losers.push_back("wilber");
         //losers.push_back("tux");
         scene->setKarts(losers);
-
+        */
 
         /*
         // FEATURE UNLOCKED
+        StateManager::get()->enterGameState();
+        race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
+        race_manager->setNumKarts(0);
+        race_manager->setNumPlayers(0);
+        race_manager->setNumLocalPlayers(0);
+        race_manager->startSingleRace("featunlocked", 999, false);
+
         FeatureUnlockedCutScene* scene =
-        FeatureUnlockedCutScene::getInstance();
+            FeatureUnlockedCutScene::getInstance();
+        
+        std::vector<std::string> parts;
+        parts.push_back("featunlocked");
+        ((CutsceneWorld*)World::getWorld())->setParts(parts);
 
         scene->addTrophy(RaceManager::DIFFICULTY_EASY);
-        StateManager::get()->pushScreen(scene);
+        //StateManager::get()->pushScreen(scene);
 
         static int i = 1;
         i++;
@@ -295,7 +308,7 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
                 track_manager->getTrack("lighthouse")
                              ->getScreenshotFile().c_str()));
             textures.push_back(irr_driver->getTexture(
-                track_manager->getTrack("crescentcrossing")
+                track_manager->getTrack("startrack")
                              ->getScreenshotFile().c_str()));
             textures.push_back(irr_driver->getTexture(
                 track_manager->getTrack("sandtrack")
@@ -304,11 +317,11 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
                 track_manager->getTrack("snowmountain")
                              ->getScreenshotFile().c_str()));
 
-            scene->addUnlockedPictures(textures, 1.0, 0.75, L"You did it");
+            scene->addUnlockedPictures(textures, 4.0, 3.0, L"You did it");
 
             StateManager::get()->pushScreen(scene);
         }
-         */
+        */
     }
     else
 #endif
diff --git a/src/states_screens/online_profile_achievements.cpp b/src/states_screens/online_profile_achievements.cpp
index 44c89b3ee..07e0c4bb3 100644
--- a/src/states_screens/online_profile_achievements.cpp
+++ b/src/states_screens/online_profile_achievements.cpp
@@ -24,7 +24,6 @@
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
-#include "online/messages.hpp"
 #include "online/online_profile.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
 #include "states_screens/state_manager.hpp"
@@ -122,7 +121,7 @@ void OnlineProfileAchievements::init()
         m_visiting_profile->fetchAchievements();
         m_achievements_list_widget->clear();
         m_achievements_list_widget->addItem("loading",
-                                             Messages::fetchingAchievements());
+                         StringUtils::loadingDots(_("Fetching achievements")));
     }
 }   // init
 
@@ -161,8 +160,8 @@ void OnlineProfileAchievements::onUpdate(float delta)
     if (!m_visiting_profile->isReady())
     {
         // This will display an increasing number of dots while waiting.
-        m_achievements_list_widget->renameItem("loading",
-                                             Messages::fetchingAchievements());
+        m_achievements_list_widget->renameItem("loading", 
+                       StringUtils::loadingDots(_("Fetching achievements")));  
         return;
     }
 
diff --git a/src/states_screens/online_profile_friends.cpp b/src/states_screens/online_profile_friends.cpp
index 4ffe2c1f3..c925ce85c 100644
--- a/src/states_screens/online_profile_friends.cpp
+++ b/src/states_screens/online_profile_friends.cpp
@@ -21,7 +21,6 @@
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
-#include "online/messages.hpp"
 #include "states_screens/dialogs/user_info_dialog.hpp"
 #include "states_screens/online_user_search.hpp"
 #include "states_screens/state_manager.hpp"
@@ -85,7 +84,8 @@ void OnlineProfileFriends::init()
     m_visiting_profile->fetchFriends();
     m_waiting_for_friends = true;
     m_friends_list_widget->clear();
-    m_friends_list_widget->addItem("loading", Messages::fetchingFriends());
+    m_friends_list_widget->addItem("loading", 
+                              StringUtils::loadingDots(_("Fetching friends")));
 }   // init
 
 // -----------------------------------------------------------------------------
@@ -171,7 +171,7 @@ void OnlineProfileFriends::onUpdate(float delta)
         else
         {
             m_friends_list_widget->renameItem("loading",
-                                              Messages::fetchingFriends());
+                              StringUtils::loadingDots(_("Fetching friends")));
         }
     }
 }   // onUpdate
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 2423d3ce8..bcfc746e0 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -32,7 +32,6 @@
 #include "network/protocol_manager.hpp"
 #include "network/protocols/connect_to_server.hpp"
 #include "network/protocols/request_connection.hpp"
-#include "online/messages.hpp"
 #include "online/profile_manager.hpp"
 #include "online/request.hpp"
 #include "online/servers_manager.hpp"
@@ -153,11 +152,13 @@ void OnlineScreen::onUpdate(float delta)
 
     if (m_recorded_state == PlayerProfile::OS_SIGNING_IN)
     {
-        m_online_status_widget->setText(Messages::signingIn(), false);
+        m_online_status_widget->setText(StringUtils::loadingDots(_("Signing in")),
+                                        false                                   );
     }
     else if (m_recorded_state == PlayerProfile::OS_SIGNING_OUT)
     {
-        m_online_status_widget->setText(Messages::signingOut(), false);
+        m_online_status_widget->setText(StringUtils::loadingDots(_("Signing out")),
+                                        false                                    );
     }
 }   // onUpdate
 
diff --git a/src/states_screens/online_user_search.cpp b/src/states_screens/online_user_search.cpp
index c24cc1959..71bc6ba3b 100644
--- a/src/states_screens/online_user_search.cpp
+++ b/src/states_screens/online_user_search.cpp
@@ -20,7 +20,6 @@
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
 #include "guiengine/modaldialog.hpp"
-#include "online/messages.hpp"
 #include "online/profile_manager.hpp"
 #include "states_screens/dialogs/user_info_dialog.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
@@ -199,7 +198,7 @@ void OnlineUserSearch::search()
 
         m_user_list_widget->clear();
         m_user_list_widget->addItem("spacer", L"");
-        m_user_list_widget->addItem("loading", Messages::searching());
+        m_user_list_widget->addItem("loading", StringUtils::loadingDots(_("Searching")));
         m_back_widget->setDeactivated();
         m_search_box_widget->setDeactivated();
         m_search_button_widget->setDeactivated();
@@ -276,7 +275,8 @@ void OnlineUserSearch::onUpdate(float dt)
         }
         else
         {
-            m_user_list_widget->renameItem("loading", Messages::searching());
+            m_user_list_widget->renameItem("loading", 
+                                    StringUtils::loadingDots(_("Searching")) );
         }
     }
 }   // onUpdate
diff --git a/src/states_screens/options_screen_input2.cpp b/src/states_screens/options_screen_input2.cpp
index b9a0beaf3..6e941a2ae 100644
--- a/src/states_screens/options_screen_input2.cpp
+++ b/src/states_screens/options_screen_input2.cpp
@@ -233,7 +233,8 @@ void OptionsScreenInput2::updateInputButtons()
 
 
 
-    bool conflicts = false;
+    bool conflicts_between = false;
+    bool conflicts_inside  = false;
     // ---- make sure there are no binding conflicts
     // (same key used for two actions)
     std::set<irr::core::stringw> currentlyUsedKeys;
@@ -249,7 +250,7 @@ void OptionsScreenInput2::updateInputButtons()
                 && conflictsBetweenKbdConfig(action, PA_FIRST_GAME_ACTION,
                                              PA_LAST_GAME_ACTION))
             {
-                conflicts = true;
+                conflicts_between = true;
                 actions->markItemBlue (KartActionStrings[action]);
             }
         }
@@ -266,6 +267,7 @@ void OptionsScreenInput2::updateInputButtons()
                     m_config->getMappingIdString(others);
                 if (others_item == item)
                 {
+                    conflicts_inside = true;
                     actions->markItemRed( KartActionStrings[others] );
                 }
             }
@@ -290,7 +292,7 @@ void OptionsScreenInput2::updateInputButtons()
                 && conflictsBetweenKbdConfig(action, PA_FIRST_MENU_ACTION,
                                              PA_LAST_MENU_ACTION))
             {
-                conflicts = true;
+                conflicts_between = true;
                 actions->markItemBlue (KartActionStrings[action]);
             }
         }
@@ -307,6 +309,7 @@ void OptionsScreenInput2::updateInputButtons()
                     m_config->getBindingAsString(others);
                 if (others_item == item)
                 {
+                    conflicts_inside = true;
                     actions->markItemRed( KartActionStrings[others] );
                 }
             }
@@ -318,11 +321,17 @@ void OptionsScreenInput2::updateInputButtons()
 
     GUIEngine::Widget* conflict_label =
         getWidget<GUIEngine::LabelWidget>("conflict");
-    if (conflicts)
-        conflict_label->setText(
-           _("* A red item means a conflict with another configuration") );
-    else
-        conflict_label->setText("");
+
+    std::wostringstream oss;
+    if (conflicts_between)
+    {
+        oss << _("* A blue item means a conflict with another configuration");
+        if (conflicts_inside)
+            oss << "\n";
+    }
+    if (conflicts_inside)
+        oss << _("* A red item means a conflict in the current configuration");
+    conflict_label->setText(oss.str().c_str());
 
 }   // updateInputButtons
 
@@ -442,7 +451,7 @@ void OptionsScreenInput2::eventCallback(Widget* widget,
         else if (selection == "tab_video")
             sm->replaceTopMostScreen(OptionsScreenVideo::getInstance());
         else if (selection == "tab_players")
-            sm->replaceTopMostScreen(UserScreen::getInstance());
+            sm->replaceTopMostScreen(TabbedUserScreen::getInstance());
         else if (selection == "tab_ui")
             sm->replaceTopMostScreen(OptionsScreenUI::getInstance());
         else if (selection == "tab_controls") {}
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index 5486589d4..ae03ffe7e 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -89,40 +89,27 @@ RaceGUI::RaceGUI()
     m_speed_bar_icon   = material_manager->getMaterial("speedfore.png");
     createMarkerTexture();
 
-    // Translate strings only one in constructor to avoid calling
-    // gettext in each frame.
-    //I18N: Shown at the end of a race
-    m_string_lap      = _("Lap");
-    m_string_rank     = _("Rank");
-
-
     // Determine maximum length of the rank/lap text, in order to
     // align those texts properly on the right side of the viewport.
-    gui::ScalableFont* font = GUIEngine::getFont();
-    m_rank_lap_width = font->getDimension(m_string_lap.c_str()).Width;
+    gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
+    core::dimension2du area = font->getDimension(L"99:99:99");
+    m_timer_width = area.Width;
+    m_font_height = area.Height;
 
-    m_timer_width = font->getDimension(L"99:99:99").Width;
-
-    font = (race_manager->getNumLocalPlayers() > 2 ? GUIEngine::getSmallFont()
-                                                   : GUIEngine::getFont());
-
-    int w;
     if (race_manager->getMinorMode()==RaceManager::MINOR_MODE_FOLLOW_LEADER ||
         race_manager->getMinorMode()==RaceManager::MINOR_MODE_3_STRIKES     ||
         race_manager->getNumLaps() > 9)
-        w = font->getDimension(L"99/99").Width;
+        m_lap_width = font->getDimension(L"99/99").Width;
     else
-        w = font->getDimension(L"9/9").Width;
+        m_lap_width = font->getDimension(L"9/9").Width;
 
-    // In some split screen configuration the energy bar might be next
-    // to the lap display - so make the lap X/Y display large enough to
-    // leave space for the energy bar (16 pixels) and 10 pixels of space
-    // to the right (see drawEnergyMeter for details).
-    w += 16 + 10;
-    if(m_rank_lap_width < w) m_rank_lap_width = w;
-    w = font->getDimension(m_string_rank.c_str()).Width;
-    if(m_rank_lap_width < w) m_rank_lap_width = w;
+    // Technically we only need getNumLocalPlayers, but using the
+    // global kart id to find the data for a specific kart.
+    int n = race_manager->getNumberOfKarts();
 
+    m_animation_states.resize(n);
+    m_rank_animation_start_times.resize(n);
+    m_last_ranks.resize(n);
 }   // RaceGUI
 
 //-----------------------------------------------------------------------------
@@ -130,6 +117,20 @@ RaceGUI::~RaceGUI()
 {
 }   // ~Racegui
 
+//-----------------------------------------------------------------------------
+/** Reset the gui before a race. It initialised all rank animation related
+ *  values back to the default.
+ */
+void RaceGUI::reset()
+{
+    RaceGUIBase::reset();
+    for(unsigned int i=0; i<race_manager->getNumberOfKarts(); i++)
+    {
+        m_animation_states[i] = AS_NONE;
+        m_last_ranks[i]       = i+1;
+    }
+}  // reset
+
 //-----------------------------------------------------------------------------
 /** Render all global parts of the race gui, i.e. things that are only
  *  displayed once even in splitscreen.
@@ -201,24 +202,26 @@ void RaceGUI::renderPlayerView(const Camera *camera, float dt)
     core::vector2df scaling = camera->getScaling();
     const AbstractKart *kart = camera->getKart();
     if(!kart) return;
-
+    
     drawPlungerInFace(camera, dt);
 
     scaling *= viewport.getWidth()/800.0f; // scale race GUI along screen size
-    drawAllMessages     (kart, viewport, scaling);
+    drawAllMessages(kart, viewport, scaling);
 
     if(!World::getWorld()->isRacePhase()) return;
 
-    drawPowerupIcons    (kart, viewport, scaling);
-    drawSpeedAndEnergy  (kart, viewport, scaling);
+    drawPowerupIcons   (kart, viewport, scaling);
+    drawSpeedEnergyRank(kart, viewport, scaling);
 
     if (!m_is_tutorial)
-        drawRankLap     (kart, viewport);
+        drawLap(kart, viewport, scaling);
 
     RaceGUIBase::renderPlayerView(camera, dt);
 }   // renderPlayerView
 
 //-----------------------------------------------------------------------------
+/** Shows the current soccer result.
+ */
 void RaceGUI::drawScores()
 {
     SoccerWorld* soccerWorld = (SoccerWorld*)World::getWorld();
@@ -271,7 +274,8 @@ void RaceGUI::drawScores()
         numLeader++;
         offsetX += position.LowerRightCorner.X;
     }
-}
+}   // drawScores
+
 //-----------------------------------------------------------------------------
 /** Displays the racing time on the screen.s
  */
@@ -321,7 +325,9 @@ void RaceGUI::drawGlobalTimer()
         pos += core::vector2d<s32>(0, UserConfigParams::m_height/2);
     }
 
-    gui::ScalableFont* font = GUIEngine::getFont();
+    gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
+    font->setShadow(video::SColor(255, 128, 0, 0));
+    font->setScale(1.0f);
     font->draw(sw.c_str(), pos, time_color, false, false, NULL,
                true /* ignore RTL */);
 
@@ -388,10 +394,10 @@ void RaceGUI::drawEnergyMeter(int x, int y, const AbstractKart *kart,
                               const core::recti &viewport,
                               const core::vector2df &scaling)
 {
-    float minRatio         = std::min(scaling.X, scaling.Y);
+    float min_ratio        = std::min(scaling.X, scaling.Y);
     const int GAUGEWIDTH   = 78;
-    int gauge_width        = (int)(GAUGEWIDTH*minRatio);
-    int gauge_height       = (int)(GAUGEWIDTH*minRatio);
+    int gauge_width        = (int)(GAUGEWIDTH*min_ratio);
+    int gauge_height       = (int)(GAUGEWIDTH*min_ratio);
 
     float state = (float)(kart->getEnergy())
                 / kart->getKartProperties()->getNitroMax();
@@ -404,14 +410,13 @@ void RaceGUI::drawEnergyMeter(int x, int y, const AbstractKart *kart,
 
 
     // Background
-    draw2DImage(m_gauge_empty,
-                                core::rect<s32>((int)offset.X,
-                                                (int) offset.Y-gauge_height,
-                                                (int) offset.X + gauge_width,
-                                                (int)offset.Y) /* dest rect */,
-                             core::rect<s32>(0, 0, 256, 256) /* source rect */,
-                             NULL /* clip rect */, NULL /* colors */,
-                                              true /* alpha */);
+    draw2DImage(m_gauge_empty, core::rect<s32>((int)offset.X,
+                                               (int)offset.Y-gauge_height,
+                                               (int)offset.X + gauge_width,
+                                               (int)offset.Y) /* dest rect */,
+                core::rect<s32>(0, 0, 256, 256) /* source rect */,
+                NULL /* clip rect */, NULL /* colors */,
+                true /* alpha */);
 
     // Target
 
@@ -581,22 +586,99 @@ void RaceGUI::drawEnergyMeter(int x, int y, const AbstractKart *kart,
         irr_driver->getVideoDriver()->draw2DVertexPrimitiveList(vertices, count,
         index, count-2, video::EVT_STANDARD, scene::EPT_TRIANGLE_FAN);
 
-
     }
 
-
 }   // drawEnergyMeter
 
 //-----------------------------------------------------------------------------
+void RaceGUI::drawRank(const AbstractKart *kart,
+                      const core::vector2df &offset,
+                      float min_ratio, int meter_width,
+                      int meter_height)
+{
+    // Draw rank
+    WorldWithRank *world = dynamic_cast<WorldWithRank*>(World::getWorld());
+    if (!world || !world->displayRank())
+        return;
 
-void RaceGUI::drawSpeedAndEnergy(const AbstractKart* kart,
+    int id = kart->getWorldKartId();
+
+    if (m_animation_states[id] == AS_NONE)
+    {
+        if (m_last_ranks[id] != kart->getPosition())
+        {
+            m_rank_animation_start_times[id] = world->getTime();
+            m_animation_states[id] = AS_SMALLER;
+        }
+    }
+
+    float scale = 1.0f;
+    int rank = kart->getPosition();
+    const float DURATION = 0.4f;
+    const float MIN_SHRINK = 0.3f;
+    if (m_animation_states[id] == AS_SMALLER)
+    {
+        scale = 1.0f - (world->getTime() - m_rank_animation_start_times[id])
+            / DURATION;
+        rank = m_last_ranks[id];
+        if (scale < MIN_SHRINK)
+        {
+            m_animation_states[id] = AS_BIGGER;
+            m_rank_animation_start_times[id] = world->getTime();
+            // Store the new rank
+            m_last_ranks[id] = kart->getPosition();
+            scale = MIN_SHRINK;
+        }
+    }
+    else if (m_animation_states[id] == AS_BIGGER)
+    {
+        scale = (world->getTime() - m_rank_animation_start_times[id])
+            / DURATION + MIN_SHRINK;
+        rank = m_last_ranks[id];
+        if (scale > 1.0f)
+        {
+            m_animation_states[id] = AS_NONE;
+            scale = 1.0f;
+        }
+
+    }
+    else
+    {
+        m_last_ranks[id] = kart->getPosition();
+    }
+
+    gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
+    font->setScale(min_ratio * scale);
+    font->setShadow(video::SColor(255, 128, 0, 0));
+    std::ostringstream oss;
+    oss << rank; // the current font has no . :(   << ".";
+
+    core::recti pos;
+    pos.LowerRightCorner = core::vector2di(int(offset.X + 0.65f*meter_width),
+                                           int(offset.Y - 0.55f*meter_height));
+    pos.UpperLeftCorner = core::vector2di(int(offset.X + 0.65f*meter_width),
+                                          int(offset.Y - 0.55f*meter_height));
+
+    static video::SColor color = video::SColor(255, 255, 255, 255);
+    font->draw(oss.str().c_str(), pos, color, true, true);
+    font->setScale(1.0f);
+}   // drawRank
+
+//-----------------------------------------------------------------------------
+/** Draws the speedometer, the display of available nitro, and
+ *  the rank of the kart (inside the speedometer).
+ *  \param kart The kart for which to show the data.
+ *  \param viewport The viewport to use.
+ *  \param scaling Which scaling to apply to the speedometer.
+ */
+void RaceGUI::drawSpeedEnergyRank(const AbstractKart* kart,
                                  const core::recti &viewport,
                                  const core::vector2df &scaling)
 {
-    float minRatio         = std::min(scaling.X, scaling.Y);
+    float min_ratio         = std::min(scaling.X, scaling.Y);
     const int SPEEDWIDTH   = 128;
-    int meter_width        = (int)(SPEEDWIDTH*minRatio);
-    int meter_height       = (int)(SPEEDWIDTH*minRatio);
+    int meter_width        = (int)(SPEEDWIDTH*min_ratio);
+    int meter_height       = (int)(SPEEDWIDTH*min_ratio);
 
     drawEnergyMeter(viewport.LowerRightCorner.X ,
                     (int)(viewport.LowerRightCorner.Y),
@@ -604,8 +686,6 @@ void RaceGUI::drawSpeedAndEnergy(const AbstractKart* kart,
 
     // First draw the meter (i.e. the background )
     // -------------------------------------------------------------------------
-
-
     core::vector2df offset;
     offset.X = (float)(viewport.LowerRightCorner.X-meter_width) - 24.0f*scaling.X;
     offset.Y = viewport.LowerRightCorner.Y-10.0f*scaling.Y;
@@ -621,6 +701,10 @@ void RaceGUI::drawSpeedAndEnergy(const AbstractKart* kart,
                        NULL, true);
 
     const float speed =  kart->getSpeed();
+
+    drawRank(kart, offset, min_ratio, meter_width, meter_height);
+
+
     if(speed <=0) return;  // Nothing to do if speed is negative.
 
     // Draw the actual speed bar (if the speed is >0)
@@ -698,41 +782,25 @@ void RaceGUI::drawSpeedAndEnergy(const AbstractKart* kart,
     irr_driver->getVideoDriver()->draw2DVertexPrimitiveList(vertices, count,
         index, count-2, video::EVT_STANDARD, scene::EPT_TRIANGLE_FAN);
 
-
-    // Draw Speed in Numbers
-
-    core::recti pos;
-    pos.UpperLeftCorner.X=(int)(offset.X + 0.5f*meter_width);
-    pos.UpperLeftCorner.Y=(int)(offset.Y - 0.62f*meter_height);
-    pos.LowerRightCorner.X=(int)(offset.X + 0.8f*meter_width);
-    pos.LowerRightCorner.Y=(int)(offset.X - 0.5f*meter_height);
-
-    gui::ScalableFont* font;
-
-    if (pos.getWidth() > 55)
-        font = GUIEngine::getLargeFont();
-    else if (pos.getWidth() > 40)
-        font = GUIEngine::getFont();
-    else
-        font = GUIEngine::getSmallFont();
-
-    static video::SColor color = video::SColor(255, 255, 255, 255);
-    std::ostringstream oss;
-    oss << (int)(speed*10);
-
-    font->draw(oss.str().c_str(), pos, color);
-
-}
+}   // drawSpeedEnergyRank
 
 //-----------------------------------------------------------------------------
 /** Displays the rank and the lap of the kart.
  *  \param info Info object c
 */
-void RaceGUI::drawRankLap(const AbstractKart* kart,
-                          const core::recti &viewport)
+void RaceGUI::drawLap(const AbstractKart* kart,
+                      const core::recti &viewport,
+                      const core::vector2df &scaling)
 {
     // Don't display laps or ranks if the kart has already finished the race.
     if (kart->hasFinishedRace()) return;
+        
+    World *world = World::getWorld();
+    if (!world->raceHasLaps()) return;
+    const int lap = world->getKartLaps(kart->getWorldKartId());
+
+    // don't display 'lap 0/..' at the start of a race
+    if (lap < 0 ) return;
 
     core::recti pos;
     pos.UpperLeftCorner.Y   = viewport.UpperLeftCorner.Y;
@@ -742,52 +810,20 @@ void RaceGUI::drawRankLap(const AbstractKart* kart,
     if(viewport.UpperLeftCorner.Y==0 &&
         viewport.LowerRightCorner.X==UserConfigParams::m_width &&
         race_manager->getNumPlayers()!=3)
-        pos.UpperLeftCorner.Y   += 40;
-    pos.LowerRightCorner.Y  = viewport.LowerRightCorner.Y;
+        pos.UpperLeftCorner.Y   += m_font_height;
+    pos.LowerRightCorner.Y  = viewport.LowerRightCorner.Y+20;
     pos.UpperLeftCorner.X   = viewport.LowerRightCorner.X
-                            - m_rank_lap_width - 10;
+                            - m_lap_width - 10;
     pos.LowerRightCorner.X  = viewport.LowerRightCorner.X;
 
-    gui::ScalableFont* font = (race_manager->getNumLocalPlayers() > 2
-                            ? GUIEngine::getSmallFont()
-                            : GUIEngine::getFont());
-    int font_height         = (int)(font->getDimension(L"X").Height);
+    gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
     static video::SColor color = video::SColor(255, 255, 255, 255);
-    WorldWithRank *world    = (WorldWithRank*)(World::getWorld());
+    std::ostringstream out;
+    out << lap + 1 << "/" << race_manager->getNumLaps();
 
-    if (world->displayRank())
-    {
-        const int rank = kart->getPosition();
+    font = GUIEngine::getHighresDigitFont();
+    font->setScale(scaling.Y < 1.0f ? 0.5f: 1.0f);
+    font->draw(out.str().c_str(), pos, color);
+    font->setScale(1.0f);
 
-        font->draw(m_string_rank.c_str(), pos, color);
-        pos.UpperLeftCorner.Y  += font_height;
-        pos.LowerRightCorner.Y += font_height;
-
-        char str[256];
-        const unsigned int kart_amount = world->getCurrentNumKarts();
-        sprintf(str, "%d/%d", rank, kart_amount);
-        font->draw(core::stringw(str).c_str(), pos, color);
-        pos.UpperLeftCorner.Y  += font_height;
-        pos.LowerRightCorner.Y += font_height;
-    }
-
-    // Don't display laps in follow the leader mode
-    if(world->raceHasLaps())
-    {
-        const int lap = world->getKartLaps(kart->getWorldKartId());
-
-        // don't display 'lap 0/...'
-        if(lap>=0)
-        {
-            font->draw(m_string_lap.c_str(), pos, color);
-            char str[256];
-            sprintf(str, "%d/%d", lap+1, race_manager->getNumLaps());
-            pos.UpperLeftCorner.Y  += font_height;
-            pos.LowerRightCorner.Y += font_height;
-            font->draw(core::stringw(str).c_str(), pos, color);
-            pos.UpperLeftCorner.Y  += font_height;
-            pos.LowerRightCorner.Y += font_height;
-        }
-    }
-
-} // drawRankLap
+} // drawLap
diff --git a/src/states_screens/race_gui.hpp b/src/states_screens/race_gui.hpp
index 2a76ed23a..7c26ea2fe 100644
--- a/src/states_screens/race_gui.hpp
+++ b/src/states_screens/race_gui.hpp
@@ -44,12 +44,6 @@ private:
     Material        *m_speed_meter_icon;
     Material        *m_speed_bar_icon;
 
-    /** Translated string 'lap' displayed every frame. */
-    core::stringw    m_string_lap;
-
-    /** Translated string 'rank' displayed every frame. */
-    core::stringw    m_string_rank;
-
     // Minimap related variables
     // -------------------------
     /** The mini map of the track. */
@@ -81,25 +75,42 @@ private:
     /** Distance of map from bottom of screen. */
     int              m_map_bottom;
 
-    /** Maximum string length of 'rank', 'lap', '99/99'. Used to position
-     *  the rank/lap text correctly close to the right border. */
-    int              m_rank_lap_width;
+    /** Maximum lap display length (either 9/9  or 99/99). */
+    int              m_lap_width;
 
     /** Maximum string length for the timer */
     int              m_timer_width;
 
+    /** Height of the digit font. */
+    int              m_font_height;
 
-    bool             m_is_tutorial;
+    /** Animation state: none, getting smaller (old value), 
+     *  getting bigger (new number). */
+    enum AnimationState {AS_NONE, AS_SMALLER, AS_BIGGER};
+    std::vector<AnimationState> m_animation_states;
+
+    /** When the animation state was changed. */
+    std::vector<float> m_rank_animation_start_times;
+
+    /** Stores the previous rank for each kart. Used for the rank animation. */
+    std::vector<int> m_last_ranks;
+
+    bool m_is_tutorial;
 
     /* Display informat for one player on the screen. */
     void drawEnergyMeter       (int x, int y, const AbstractKart *kart,
                                 const core::recti &viewport,
                                 const core::vector2df &scaling);
-    void drawSpeedAndEnergy    (const AbstractKart* kart,
+    void drawSpeedEnergyRank   (const AbstractKart* kart,
                                 const core::recti &viewport,
                                 const core::vector2df &scaling);
-    void drawRankLap           (const AbstractKart* kart,
-                                const core::recti &viewport);
+    void drawLap               (const AbstractKart* kart,
+                                const core::recti &viewport,
+                                const core::vector2df &scaling);
+    void drawRank              (const AbstractKart *kart,
+                                const core::vector2df &offset,
+                                float min_ratio, int meter_width,
+                                int meter_height);
 
     /** Display items that are shown once only (for all karts). */
     void drawGlobalMiniMap     ();
@@ -111,6 +122,7 @@ public:
 
          RaceGUI();
         ~RaceGUI();
+    virtual void reset();
     virtual void renderGlobal(float dt);
     virtual void renderPlayerView(const Camera *camera, float dt);
 
diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index 8854a3d91..b8a6e88da 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -273,14 +273,27 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
             }
             else
             {
-                FeatureUnlockedCutScene* scene =
-                    FeatureUnlockedCutScene::getInstance();
-                scene->addTrophy(race_manager->getDifficulty());
-                scene->findWhatWasUnlocked(race_manager->getDifficulty());
                 StateManager::get()->popMenu();
                 World::deleteWorld();
+
+                StateManager::get()->enterGameState();
+                race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
+                race_manager->setNumKarts(0);
+                race_manager->setNumPlayers(0);
+                race_manager->setNumLocalPlayers(0);
+                race_manager->startSingleRace("featunlocked", 999, false);
+
+                FeatureUnlockedCutScene* scene =
+                    FeatureUnlockedCutScene::getInstance();
+
+                scene->addTrophy(race_manager->getDifficulty());
+                scene->findWhatWasUnlocked(race_manager->getDifficulty());
                 StateManager::get()->pushScreen(scene);
                 race_manager->setAIKartOverride("");
+
+                std::vector<std::string> parts;
+                parts.push_back("featunlocked");
+                ((CutsceneWorld*)World::getWorld())->setParts(parts);
             }
             return;
         }
@@ -364,7 +377,8 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
         // FIXME: why is this call necessary here? tearDown should be
         // automatically called when the screen is left. Note that the
         // NetworkKartSelectionScreen::getInstance()->tearDown(); caused #1347
-        KartSelectionScreen::getRunningInstance()->tearDown();
+        //if (KartSelectionScreen::getRunningInstance() != NULL)
+        //    KartSelectionScreen::getRunningInstance()->tearDown();
         StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
 
         if (race_manager->raceWasStartedFromOverworld())
diff --git a/src/states_screens/register_screen.cpp b/src/states_screens/register_screen.cpp
index 30b634fdb..941943dfa 100644
--- a/src/states_screens/register_screen.cpp
+++ b/src/states_screens/register_screen.cpp
@@ -24,7 +24,6 @@
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/text_box_widget.hpp"
-#include "online/messages.hpp"
 #include "online/xml_request.hpp"
 #include "states_screens/dialogs/registration_dialog.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
@@ -286,7 +285,8 @@ void RegisterScreen::onUpdate(float dt)
     if(m_signup_request)
     {
         if(!m_options_widget->isActivated())
-            m_info_widget->setText(Messages::validatingInfo(), false);
+            m_info_widget->setText(StringUtils::loadingDots(_("Validating info")),
+                                   false);
 
         if(m_signup_request->isDone())
         {
diff --git a/src/states_screens/register_screen_with_message b/src/states_screens/register_screen_with_message
deleted file mode 100644
index aeaead587..000000000
--- a/src/states_screens/register_screen_with_message
+++ /dev/null
@@ -1,204 +0,0 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Joerg Henrichs
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "states_screens/register_screen.hpp"
-
-#include "audio/sfx_manager.hpp"
-#include "guiengine/widgets/label_widget.hpp"
-#include "guiengine/widgets/ribbon_widget.hpp"
-#include "guiengine/widgets/text_box_widget.hpp"
-#include "online/current_user.hpp"
-#include "online/messages.hpp"
-#include "states_screens/dialogs/registration_dialog.hpp"
-#include "states_screens/dialogs/message_dialog.hpp"
-#include "states_screens/guest_login_screen.hpp"
-#include "states_screens/login_screen.hpp"
-#include "states_screens/main_menu_screen.hpp"
-#include "states_screens/state_manager.hpp"
-#include "utils/log.hpp"
-#include "utils/translation.hpp"
-
-using namespace GUIEngine;
-using namespace Online;
-
-DEFINE_SCREEN_SINGLETON( RegisterScreen );
-
-// -----------------------------------------------------------------------------
-
-RegisterScreen::RegisterScreen() : Screen("online/register.stkgui")
-{
-}   // RegisterScreen
-
-// -----------------------------------------------------------------------------
-void RegisterScreen::init()
-{
-    // Make sure this tab is actually focused.
-    RibbonWidget* tabs = this->getWidget<RibbonWidget>("login_tabs");
-    if (tabs) tabs->select( "tab_register", PLAYER_ID_GAME_MASTER );
-
-    TextBoxWidget *password_widget = getWidget<TextBoxWidget>("password");
-    password_widget->setPasswordBox(true,L'*');
-    password_widget = getWidget<TextBoxWidget>("password_confirm");
-    password_widget->setPasswordBox(true,L'*');
-
-    m_info_widget = getWidget<LabelWidget>("info");
-    assert(m_info_widget);
-    m_options_widget = getWidget<RibbonWidget>("options");
-    assert(m_options_widget);
-
-    m_signup_request = NULL;
-    m_info_message_shown = false;
-}   // init
-
-// -----------------------------------------------------------------------------
-void RegisterScreen::doRegister()
-{
-    core::stringw username = getWidget<TextBoxWidget>("username")->getText().trim();
-    core::stringw password = getWidget<TextBoxWidget>("password")->getText().trim();
-    core::stringw password_confirm =  getWidget<TextBoxWidget>("password_confirm")
-                          ->getText().trim();
-    core::stringw email = getWidget<TextBoxWidget>("email")->getText().trim();
-    core::stringw email_confirm = getWidget<TextBoxWidget>("email_confirm")
-                                ->getText().trim();
-
-    m_info_widget->setErrorColor();
-
-    if (password != password_confirm)
-    {
-        m_info_widget->setText(_("Passwords don't match!"), false);
-    }
-    else if (email != email_confirm)
-    {
-        m_info_widget->setText(_("Emails don't match!"), false);
-    }
-    else if (username.size() < 4 || username.size() > 30)
-    {
-        m_info_widget->setText(_("Username has to be between 4 and 30 characters long!"), false);
-    }
-    else if (password.size() < 8 || password.size() > 30)
-    {
-        m_info_widget->setText(_("Password has to be between 8 and 30 characters long!"), false);
-    }
-    else if (email.size() < 4 || email.size() > 50)
-    {
-        m_info_widget->setText(_("Email has to be between 4 and 50 characters long!"), false);
-    }
-    else
-    {
-        m_info_widget->setDefaultColor();
-        new MessageDialog(
-            _("=== STK Terms and Conditions ===\n"
-            "You must agree to these terms in order to register an account for STK."
-            "Still needs actual content. Preferably in an XML document which can then be parsed to be put here.\n\n"
-            "By checking the box below, you are confirming that you understand these terms."
-            "If you have any questions or comments regarding these terms,"
-            "one of the members of the development team would gladly assist you."
-            ), 
-            MessageDialog::MESSAGE_DIALOG_OK_CANCEL, NULL, false);
-        return;
-    }
-
-    sfx_manager->quickSound( "anvil" );
-
-}   // doRegister
-
-// -----------------------------------------------------------------------------
-/** Called from the registration info dialog when 'accept' is clicked.
- */
-void RegisterScreen::acceptTerms()
-{
-    m_options_widget->setDeactivated();
-
-    core::stringw username = getWidget<TextBoxWidget>("username")->getText().trim();
-    core::stringw password = getWidget<TextBoxWidget>("password")->getText().trim();
-    core::stringw password_confirm= getWidget<TextBoxWidget>("password_confirm")->getText().trim();
-    core::stringw email = getWidget<TextBoxWidget>("email")->getText().trim();
-
-    m_signup_request = CurrentUser::get()->requestSignUp(username, password, 
-                                                         password_confirm, email);
-}   // acceptTerms
-
-// -----------------------------------------------------------------------------
-
-void RegisterScreen::onUpdate(float dt, irr::video::IVideoDriver*)
-{
-    if(m_signup_request)
-    {
-        if(!m_options_widget->isActivated())
-            m_info_widget->setText(Messages::validatingInfo(), false);
-
-        if(m_signup_request->isDone())
-        {
-            if(m_signup_request->isSuccess())
-            {
-                new MessageDialog(
-                    _("You will receive an email with further instructions "
-                    "regarding account activation. Please be patient and be "
-                    "sure to check your spam folder."), 
-                    MessageDialog::MESSAGE_DIALOG_OK, NULL, false);
-                // Set the flag that the message was shown, which will triger
-                // a pop of this menu and so a return to the main menu
-                m_info_message_shown = true;
-            }
-            else
-            {
-                // Error signing up, display error message
-                m_info_widget->setText(m_signup_request->getInfo(), false);
-            }
-            delete m_signup_request;
-            m_signup_request = NULL;
-            m_options_widget->setActivated();
-        }
-    }
-    else if(m_info_message_shown && !ModalDialog::isADialogActive())
-    {
-        // Once the info message was shown (signup was successful), but the
-        // message has been gone (user clicked on OK), go back to main menu
-        StateManager::get()->popMenu();
-    }
-}   // onUpdate
-
-// -----------------------------------------------------------------------------
-
-void RegisterScreen::eventCallback(Widget* widget, const std::string& name, 
-                                const int playerID)
-{
-    if (name == "login_tabs")
-    {
-        const std::string selection = 
-            ((RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER);
-        StateManager *sm = StateManager::get();
-        if (selection == "tab_login")
-            sm->replaceTopMostScreen(LoginScreen::getInstance());
-        else if (selection == "tab_guest_login")
-            sm->replaceTopMostScreen(GuestLoginScreen::getInstance());    
-    }
-    else if (name=="options")
-    {
-        const std::string button = m_options_widget
-                                 ->getSelectionIDString(PLAYER_ID_GAME_MASTER);
-        if(button=="next")
-        {
-            doRegister();
-        }
-        else if(button=="cancel")
-            StateManager::get()->escapePressed();
-    }
-
-}   // eventCallback
-
-// -----------------------------------------------------------------------------
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index 985e26dea..08bd94c97 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -26,7 +26,6 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
-#include "online/messages.hpp"
 #include "audio/sfx_manager.hpp"
 
 using namespace Online;
@@ -64,7 +63,8 @@ void ServerSelection::refresh()
     m_fake_refresh = (m_refresh_request == NULL ? true : false);
     m_server_list_widget->clear();
     m_server_list_widget->addItem("spacer", L"");
-    m_server_list_widget->addItem("loading", Messages::fetchingServers());
+    m_server_list_widget->addItem("loading",
+                              StringUtils::loadingDots(_("Fetching servers")));
     m_reload_widget->setDeactivated();
 }
 
@@ -206,7 +206,8 @@ void ServerSelection::onUpdate(float dt)
         }
         else
         {
-            m_server_list_widget->renameItem("loading", Messages::fetchingServers());
+            m_server_list_widget->renameItem("loading",
+                              StringUtils::loadingDots(_("Fetching servers")));
         }
     }
     else if(m_fake_refresh)
diff --git a/src/states_screens/user_screen.cpp b/src/states_screens/user_screen.cpp
index ba64e889a..de5b1fa72 100644
--- a/src/states_screens/user_screen.cpp
+++ b/src/states_screens/user_screen.cpp
@@ -26,7 +26,6 @@
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/list_widget.hpp"
 #include "guiengine/widgets/text_box_widget.hpp"
-#include "online/messages.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
 #include "states_screens/main_menu_screen.hpp"
 #include "states_screens/options_screen_audio.hpp"
@@ -73,8 +72,6 @@ void BaseUserScreen::init()
     m_info_widget = getWidget<LabelWidget>("message");
     assert(m_info_widget);
 
-    getWidget<CheckBoxWidget>("remember-user")
-             ->setState(UserConfigParams::m_remember_user);
     m_sign_out_name = "";
     m_sign_in_name  = "";
 
@@ -87,7 +84,7 @@ void BaseUserScreen::init()
     Screen::init();
 
     m_players->clearItems();
-    std::string current_player_index="";
+    int current_player_index = -1;
 
     for (unsigned int n=0; n<PlayerManager::get()->getNumPlayers(); n++)
     {
@@ -96,38 +93,20 @@ void BaseUserScreen::init()
         std::string s = StringUtils::toString(n);
         m_players->addItem(player->getName(), s, player->getIconFilename(), 0,
                            IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
-        if(player==PlayerManager::getCurrentPlayer())
-            current_player_index = s;
+        if(player == PlayerManager::getCurrentPlayer())
+            current_player_index = n;
     }
 
     m_players->updateItemDisplay();
 
     // Select the current player. That can only be done after
     // updateItemDisplay is called.
-    if(current_player_index.size()>0)
-    {
-        m_players->setSelection(current_player_index, PLAYER_ID_GAME_MASTER,
-                                /*focus*/ true);
-        PlayerProfile *player = PlayerManager::getCurrentPlayer();
-        const stringw &online_name = player->getLastOnlineName();
-        m_username_tb->setText(online_name);
-        // Select 'online
-        m_online_cb->setState(player->wasOnlineLastTime() ||
-                              player->isLoggedIn()          );
-        makeEntryFieldsVisible();
-        // We have to deactivate after make visible (since make visible
-        // automatically activates widgets).
-        if(online_name.size()>0)
-            m_username_tb->setDeactivated();
-        else
-            m_username_tb->setActivated();
-    }
-    else   // no current player found
-    {
-        // The first player is the most frequently used, so select it
-        if (PlayerManager::get()->getNumPlayers() > 0)
-            selectUser(0);
-    }
+    if(current_player_index != -1)
+        selectUser(current_player_index);
+    // no current player found
+    // The first player is the most frequently used, so select it
+    else if (PlayerManager::get()->getNumPlayers() > 0)
+        selectUser(0);
 
 }   // init
 
@@ -157,9 +136,8 @@ void BaseUserScreen::selectUser(int index)
     PlayerProfile *profile = PlayerManager::get()->getPlayer(index);
     assert(profile);
 
-    getWidget<TextBoxWidget >("username")->setText(profile
-                                                   ->getLastOnlineName());
-    m_players->setSelection(StringUtils::toString(index), 0, /*focusIt*/true);
+    m_players->setSelection(StringUtils::toString(index), PLAYER_ID_GAME_MASTER,
+                            /*focusIt*/ true);
 
     // Last game was not online, so make the offline settings the default
     // (i.e. unckeck online checkbox, and make entry fields invisible).
@@ -175,6 +153,12 @@ void BaseUserScreen::selectUser(int index)
     m_online_cb->setState(true);
     makeEntryFieldsVisible();
     m_username_tb->setText(profile->getLastOnlineName());
+    getWidget<CheckBoxWidget>("remember-user")->setState(
+        profile->rememberPassword());
+    if(profile->getLastOnlineName().size()>0)
+        m_username_tb->setDeactivated();
+    else
+        m_username_tb->setActivated();
 
     // And make the password invisible if the session is saved (i.e
     // the user does not need to enter a password).
@@ -242,21 +226,24 @@ void BaseUserScreen::eventCallback(Widget* widget,
     }
     else if (name == "remember-user")
     {
-        UserConfigParams::m_remember_user =
-                       getWidget<CheckBoxWidget>("remember-user")->getState();
+        getSelectedPlayer()->setRememberPassword(
+            getWidget<CheckBoxWidget>("remember-user")->getState());
     }
     else if (name == "online")
     {
         // If online access is not allowed, do not accept an online account
         // but advice the user where to enable this option.
-        if (m_online_cb->getState() && UserConfigParams::m_internet_status ==
-                                       Online::RequestManager::IPERM_NOT_ALLOWED)
+        if (m_online_cb->getState())
         {
-            m_info_widget->setText(
-                _("Internet access is disabled, please enable it in the options"),
-                true);
-            sfx_manager->quickSound( "anvil" );
-            m_online_cb->setState(false);
+            if (UserConfigParams::m_internet_status ==
+                                       Online::RequestManager::IPERM_NOT_ALLOWED)
+            {
+                m_info_widget->setText(
+                    _("Internet access is disabled, please enable it in the options"),
+                    true);
+                sfx_manager->quickSound( "anvil" );
+                m_online_cb->setState(false);
+            }
         }
         makeEntryFieldsVisible();
     }
@@ -332,10 +319,11 @@ void BaseUserScreen::login()
         m_sign_out_name = current->getLastOnlineName();
         current->requestSignOut();
         m_state = (UserScreenState)(m_state | STATE_LOGOUT);
+
         // If the online user name was changed, reset the save data
         // for this user (otherwise later the saved session will be
         // resumed, not logging the user with the new account).
-        if(current->getLastOnlineName()!=new_username)
+        if(player==current && current->getLastOnlineName()!=new_username)
             current->clearSession();
     }
     PlayerManager::get()->setCurrentPlayer(player);
@@ -406,8 +394,8 @@ void BaseUserScreen::onUpdate(float dt)
         core::stringw message = (m_state & STATE_LOGOUT)
                               ? _(L"Signing out '%s'",m_sign_out_name.c_str())
                               : _(L"Signing in '%s'", m_sign_in_name.c_str());
-        m_info_widget->setText(Online::Messages::loadingDots(message.c_str()),
-                               false                                           );
+        m_info_widget->setText(StringUtils::loadingDots(message.c_str()),
+                               false                                      );
     }
     PlayerProfile *player = getSelectedPlayer();
     if(player)
diff --git a/src/utils/profiler.cpp b/src/utils/profiler.cpp
index 2be803c2c..af2010f2e 100644
--- a/src/utils/profiler.cpp
+++ b/src/utils/profiler.cpp
@@ -407,7 +407,9 @@ void Profiler::draw()
                 "Godrays",
                 "Bloom",
                 "Tonemap",
-                "Motion Blur"
+                "Motion Blur",
+                "MLAA",
+                "GUI",
             };
             std::ostringstream oss;
             oss << Phase[hovered_gpu_marker] << " : " << hovered_gpu_marker_elapsed << " us";
diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp
index 8c61bc40b..734dcdce9 100644
--- a/src/utils/string_utils.cpp
+++ b/src/utils/string_utils.cpp
@@ -21,6 +21,7 @@
 #include "utils/string_utils.hpp"
 
 #include "utils/log.hpp"
+#include "utils/time.hpp"
 
 #include "coreutil.h"
 
@@ -523,6 +524,29 @@ namespace StringUtils
         return std::string(s);
     }   // timeToString
 
+    // ------------------------------------------------------------------------
+    /** Shows a increasing number of dots.
+      * \param interval A float representing the time it takes to add a new dot
+      * \param max_dots The number of dots used. Defaults to 3.
+      */
+    irr::core::stringw loadingDots(float interval, int max_dots)
+    {
+        int nr_dots = int(floor(StkTime::getRealTime() / interval)) 
+                    % (max_dots + 1);
+        return irr::core::stringw((std::string(nr_dots, '.') + 
+                                   std::string(max_dots - nr_dots, ' ')).c_str());
+    }   // loadingDots
+
+    // ------------------------------------------------------------------------
+    /** Returns the string given with loadingDots appended. A simple
+     *  convenience function to type less in calls.
+     *  \parameter s The string to which the loading dots are appended.
+     */
+    irr::core::stringw loadingDots(const wchar_t *s)
+    {
+        return irr::core::stringw(s) + loadingDots();
+    }   // loadingDots
+
     // ------------------------------------------------------------------------
     /** Replaces values in a string.
      * \param other string in which to replace stuff
diff --git a/src/utils/string_utils.hpp b/src/utils/string_utils.hpp
index b1e70eeec..19d9f3fe5 100644
--- a/src/utils/string_utils.hpp
+++ b/src/utils/string_utils.hpp
@@ -46,6 +46,8 @@ namespace StringUtils
 
     bool notEmpty(const irr::core::stringw& input);
     std::string timeToString(float time);
+    irr::core::stringw loadingDots(float interval = 0.5f, int max_dots = 3);
+    irr::core::stringw loadingDots(const wchar_t *s);
     std::string                     toUpperCase(const std::string&);
     std::string                     toLowerCase(const std::string&);
     std::vector<std::string>        split(const std::string& s, char c,
diff --git a/src/utils/vec3.hpp b/src/utils/vec3.hpp
index 77d894369..c52e6d7e8 100644
--- a/src/utils/vec3.hpp
+++ b/src/utils/vec3.hpp
@@ -168,6 +168,14 @@ public:
     Vec3  operator-(const Vec3& v1) const {return (Vec3)(*(btVector3*)this
                                                          -(btVector3)v1); }
     // ------------------------------------------------------------------------
+    /** Computes this = this - v1. On VS this special version is needed,
+     *  since otherwise Vec3-btVector3 is ont unique (could be cast to
+     *  btVector3-btVector3, or convert btVector3 to Vec3()). */
+    Vec3 operator-(const btVector3 v1) const
+    {
+        return *(btVector3*)this - v1;
+    }
+    // ------------------------------------------------------------------------
     /** Helper functions to treat this vec3 as a 2d vector. This returns the
      *  square of the length of the first 2 dimensions. */
     float length2_2d() const     { return m_floats[0]*m_floats[0]
diff --git a/tools/font_tool/CFontTool.cpp b/tools/font_tool/CFontTool.cpp
index 587827d84..b75a84f4f 100644
--- a/tools/font_tool/CFontTool.cpp
+++ b/tools/font_tool/CFontTool.cpp
@@ -9,6 +9,10 @@ const int fontsizes[] = {4,6,8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,56,68,72
 
 char bUsed[0x10000]={0};
 
+/** True if pot files where given, which indicates that Asian fonts
+ *  are to be created, and an offset needs to be used for the index. */
+bool has_pot_files = false;
+
 inline u32 getTextureSizeFromSurfaceSize(u32 size)
 {
 	u32 ts = 0x01;
@@ -19,6 +23,7 @@ inline u32 getTextureSizeFromSurfaceSize(u32 size)
 }
 
 bool LoadPoFiles(const char* sListFileName){
+	has_pot_files = true;
 	char s[1024];
 	std::ifstream fin(sListFileName);
 	if(!fin){
@@ -57,6 +62,17 @@ bool LoadPoFiles(const char* sListFileName){
 	return true;
 }
 
+// ----------------------------------------------------------------------------
+/** Set all characters in the given character string to be used. */
+bool setUsedCharacters(const char* characters)
+{
+    int n = strlen(characters);
+    for(int i=0; i<n; i++)
+        bUsed[short(characters[i])] = true;
+    return true;
+}   // setUsedCharacters
+
+// ----------------------------------------------------------------------------
 // windows specific
 #ifdef _IRR_WINDOWS_
 
@@ -762,7 +778,8 @@ bool CFontTool::saveBitmapFont(const c8 *filename, const c8* format)
 	writer->writeLineBreak();
 
 	// write images and link to them
-    u32 offset_for_asian_fonts=100;
+    // Only use the offset if Asian fonts are created.
+    u32 offset_for_asian_fonts=has_pot_files ? 100 : 0;
 	for (u32 i=0; i<currentImages.size(); ++i)
 	{
 		imagename = filename;
diff --git a/tools/font_tool/CFontTool.h b/tools/font_tool/CFontTool.h
index 235fd6a24..331be7ff5 100644
--- a/tools/font_tool/CFontTool.h
+++ b/tools/font_tool/CFontTool.h
@@ -21,6 +21,7 @@
 #endif
 
 bool LoadPoFiles(const char* sListFileName);
+bool setUsedCharacters(const char* characters);
 
 namespace irr {
 	class CFontTool : public irr::IReferenceCounted
diff --git a/tools/font_tool/CMakeLists.txt b/tools/font_tool/CMakeLists.txt
index a0e58f792..1073b9185 100644
--- a/tools/font_tool/CMakeLists.txt
+++ b/tools/font_tool/CMakeLists.txt
@@ -14,10 +14,10 @@ if(FONT_TOOL)
         if(FREETYPE_FOUND)
             include_directories(${FREETYPE_INCLUDE_DIRS})
             add_executable(font_tool CFontTool.cpp main.cpp)
+            target_link_libraries(font_tool stkirrlicht)
             target_link_libraries(font_tool ${FREETYPE_LIBRARIES})
             target_link_libraries(font_tool ${X11_Xft_LIB} Xxf86vm)
             target_link_libraries(font_tool ${OPENGL_LIBRARIES})
-            target_link_libraries(font_tool stkirrlicht)
             target_link_libraries(font_tool ${FONTCONFIG_LIBRARY})
         else()
             message(STATUS "Freetype was not found, the font tool won't be built (only useful for developers)")
diff --git a/tools/font_tool/main.cpp b/tools/font_tool/main.cpp
index 5086835f7..81d6b590f 100644
--- a/tools/font_tool/main.cpp
+++ b/tools/font_tool/main.cpp
@@ -412,7 +412,7 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 
 	//new
 
-	env->addCheckBox(false, core::rect<s32>(xp,yp,xp+150,yp+h),win, 201, L"Export used characters only")->setEnabled(false);
+	env->addCheckBox(false, core::rect<s32>(xp,yp,xp+150,yp+h),win, 201, L"Export used characters only")->setChecked(false);
 	yp += (s32)(h*1.5f);
 
 	env->addCheckBox(false, core::rect<s32>(xp,yp,xp+150,yp+h),win, 202, L"Exclude basic latin characters");
@@ -512,10 +512,34 @@ int main(int argc,char **argv)
 
 	createGUI(device, fc);
 
-	//new
-	if(argc>1 && LoadPoFiles(argv[1])){
-		device->getGUIEnvironment()->getRootGUIElement()->getElementFromId(201,true)->setEnabled(true);
-	}
+    for(int i=1; i<argc; i++)
+    {
+        if(!strcmp(argv[i],"-c") && i<argc-1)
+        {
+            i++;
+            if(setUsedCharacters(argv[i]))
+            {
+                IGUICheckBox *box =
+                    dynamic_cast<IGUICheckBox*>(device->getGUIEnvironment()
+                                                     ->getRootGUIElement()
+                                                     ->getElementFromId(201, true));
+                box->setChecked(true);
+            }
+
+        }
+        else
+        {  
+            // Old style: just a single parameter, assume it's a file name with pot files in it
+            if(LoadPoFiles(argv[i]))
+            {
+                IGUICheckBox *box =
+                    dynamic_cast<IGUICheckBox*>(device->getGUIEnvironment()
+                    ->getRootGUIElement()
+                    ->getElementFromId(201, true));
+                box->setChecked(true);
+            }
+        }
+    }   // for i <argc
 
 	while(device->run())
 	{