diff --git a/src/activities/gletters/gletters.js b/src/activities/gletters/gletters.js
index 7eeba3e7c..8fee6b860 100644
--- a/src/activities/gletters/gletters.js
+++ b/src/activities/gletters/gletters.js
@@ -1,445 +1,445 @@
 /* GCompris - gletters.js
  *
  * Copyright (C) 2014-2016 Holger Kaelberer
  *
  * Authors:
  *   Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
  *   Holger Kaelberer <holger.k@elberer.de> (Qt Quick port)
  *
  *   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, see <https://www.gnu.org/licenses/>.
  */
 
 /* ToDo / open issues:
  * - adjust wordlist filenames once we have an ApplicationInfo.dataPath() or so
  */
 
 .pragma library
 .import QtQuick 2.6 as Quick
 .import GCompris 1.0 as GCompris //for ApplicationInfo
 .import "qrc:/gcompris/src/core/core.js" as Core
 
 var currentLevel = 0;
 var currentSubLevel = 0;
 var level = null;
 var maxLevel = 0;
 var maxSubLevel = 0;
 var items;
 var uppercaseOnly;
 var speedSetting;
 var mode;
 
 //speed calculations, common:
 var speed = 0;           // how fast letters fall
 var fallSpeed = 0;       // how often new letters are dropped
 var incFallSpeed = 1000; // how much drop rate increases per sublevel 
 var incSpeed = 10;       // how much speed increases per sublevel
 // gletters:
 var fallRateBase = 40;   // default for how fast letters fall (smaller is faster)
 var fallRateMult = 80;   // default for how much falling speed increases per level (smaller is faster)
 var dropRateBase = 5000; // default for how often new letters are dropped
 var dropRateMult = 100;  // default for how much drop rate increases per level
 // wordsgame:
 var wgMaxFallSpeed = 7000;
 var wgMaxSpeed = 150;
 var wgMinFallSpeed = 3000;
 var wgMinSpeed = 50;
 var wgDefaultFallSpeed = 8000;
 var wgDefaultSpeed = 170;
 var wgAddSpeed = 20;
 var wgAddFallSpeed = 1000;
 var wgMaxFallingItems;
 
 var droppedWords;
 var droppedWordsCounter = 0;
 var currentWord = null;  // reference to the word currently typing, null if n/a
 var wordComponent = null;
 
 var successRate // Falling speed depends on it
 
 function start(items_, uppercaseOnly_,  _mode, speedSetting_) {
     items = items_;
     uppercaseOnly = uppercaseOnly_;
     mode = _mode;
     speedSetting = speedSetting_;
     currentLevel = 0;
     currentSubLevel = 0;
 
     incSpeed = 1 * speedSetting;
     incFallSpeed = 100 * speedSetting;
     
     fallRateBase = 400 / speedSetting;
     fallRateMult = 800 / speedSetting;
-    dropRateBase = Math.max(5000, 10000 / speedSetting);
-    dropRateMult = 10 * speedSetting;
+    dropRateBase = 60000 / speedSetting;
+    dropRateMult = 1000 / speedSetting;
 
     if (mode == "word") {
-        wgMaxFallSpeed = 80000 / speedSetting;
-        wgMaxSpeed = 1700 / speedSetting;
-        wgMinFallSpeed = 40000 / speedSetting;
-        wgMinSpeed = 1000 / speedSetting;
-        wgDefaultFallSpeed = 80000 / speedSetting;
-        wgDefaultSpeed = 1700 / speedSetting;
-        wgAddSpeed = 1 * speedSetting;
-        wgAddFallSpeed = 10 * speedSetting;
+        wgMaxFallSpeed = 90000 / speedSetting;
+        wgMaxSpeed = 1500 / speedSetting;
+        wgMinFallSpeed = 70000 / speedSetting;
+        wgMinSpeed = 1300 / speedSetting;
+        wgDefaultFallSpeed = 90000 / speedSetting;
+        wgDefaultSpeed = 1500 / speedSetting;
+        wgAddSpeed = 2 * speedSetting;
+        wgAddFallSpeed = 100 * speedSetting;
     }
 
     var locale = items.locale == "system" ? "$LOCALE" : items.locale
 
     // register the voices for the locale
     GCompris.DownloadManager.updateResource(GCompris.DownloadManager.getVoicesResourceForLocale(GCompris.ApplicationInfo.getVoicesLocale(items.locale)));
 
     items.wordlist.loadFromFile(GCompris.ApplicationInfo.getLocaleFilePath(
             items.ourActivity.dataSetUrl + "default-"+locale+".json"));
     // If wordlist is empty, we try to load from short locale and if not present again, we switch to default one
     var localeUnderscoreIndex = locale.indexOf('_')
     // probably exist a better way to see if the list is empty
     if(items.wordlist.maxLevel == 0) {
         var localeShort;
         // We will first look again for locale xx (without _XX if exist)
         if(localeUnderscoreIndex > 0) {
             localeShort = locale.substring(0, localeUnderscoreIndex)
         }
         else {
             localeShort = locale;
         }
         // If not found, we will use the default file
         items.wordlist.useDefault = true
         items.wordlist.loadFromFile(GCompris.ApplicationInfo.getLocaleFilePath(
         items.ourActivity.dataSetUrl + "default-"+localeShort+".json"));
         // We remove the using of default file for next time we enter this function
         items.wordlist.useDefault = false
     }
     maxLevel = items.wordlist.maxLevel;
     droppedWords = new Array();
     droppedWordsCounter = 0;
     initLevel();
 }
 
 function stop() {
     deleteWords();
     wordComponent = null
     items.wordDropTimer.stop();
 }
 
 function initLevel() {
     items.audioVoices.clearQueue()
     items.bar.level = currentLevel + 1;
     wgMaxFallingItems = 3
     successRate = 1.0
     droppedWordsCounter = 0
 
     // initialize level
     deleteWords();
     level = items.wordlist.getLevelWordList(currentLevel + 1);
     maxSubLevel = items.wordlist.getMaxSubLevel(currentLevel + 1);
 
     if (maxSubLevel == 0) {
         // If "sublevels" length is not set in wordlist, use the words length
         maxSubLevel = level.words.length
     }
     items.score.numberOfSubLevels = maxSubLevel;
     setSpeed();
     /*console.log("Gletters: initializing level " + (currentLevel + 1)
                 + " maxSubLvl=" + maxSubLevel
                 + " wordCount=" + level.words.length
                 + " speed=" + speed + " fallspeed=" + fallSpeed);*/
 
     {
         /* populate VirtualKeyboard for mobile:
              * 1. for < 10 letters print them all in the same row
              * 2. for > 10 letters create 3 rows with equal amount of keys per row
              *    if possible, otherwise more keys in the upper rows
              * 3. if we have both upper- and lowercase letters activate the shift
              *    key*/
         // first generate a map of needed letters
         var letters = new Array();
         items.keyboard.shiftKey = false;
         for (var i = 0; i < level.words.length; i++) {
             if(mode ==='letter') {
                 // The word is a letter, even if it has several chars (digraph)
                 var letter = level.words[i];
                 var isUpper = (letter == letter.toLocaleUpperCase());
                 if (isUpper && letters.indexOf(letter.toLocaleLowerCase()) !== -1)
                     items.keyboard.shiftKey = true;
                 else if (!isUpper && letters.indexOf(letter.toLocaleUpperCase()) !== -1)
                     items.keyboard.shiftKey = true;
                 else if (letters.indexOf(letter) === -1)
                     letters.push(level.words[i]);
             } else {
                 // We split each word in char to create the keyboard
                 for (var j = 0; j < level.words[i].length; j++) {
                     var letter = level.words[i].charAt(j);
                     var isUpper = (letter == letter.toLocaleUpperCase());
                     if (isUpper && letters.indexOf(letter.toLocaleLowerCase()) !== -1)
                         items.keyboard.shiftKey = true;
                     else if (!isUpper && letters.indexOf(letter.toLocaleUpperCase()) !== -1)
                         items.keyboard.shiftKey = true;
                     else if (letters.indexOf(letter) === -1)
                         letters.push(level.words[i].charAt(j));
                 }
             }
         }
         letters = GCompris.ApplicationInfo.localeSort(letters, items.locale);
         // generate layout from letter map
         var layout = new Array();
         var row = 0;
         var offset = 0;
         while (offset < letters.length-1) {
             var cols = letters.length <= 10 ? letters.length : (Math.ceil((letters.length-offset) / (3 - row)));
             layout[row] = new Array();
             for (var j = 0; j < cols; j++)
                 layout[row][j] = { label: letters[j+offset] };
             offset += j;
             row++;
         }
         items.keyboard.layout = layout;
     }
     items.wordlist.initRandomWord(currentLevel + 1)
     initSubLevel()
 }
 
 function initSubLevel() {
     currentWord = null;
     if (currentSubLevel != 0) {
         // increase speed
         speed = Math.max(speed - incSpeed, wgMinSpeed);
         items.wordDropTimer.interval = fallSpeed = Math.max(fallSpeed - incFallSpeed, wgMinFallSpeed);
     }
     items.score.currentSubLevel = currentSubLevel + 1;
     // note, last word is still fading out so better use droppedWordsCounter than droppedWords.length in this case
     if (currentSubLevel == 0 || droppedWordsCounter == 0)
         dropWord();
     //console.log("Gletters: initializing subLevel " + (currentSubLevel + 1) + " words=" + JSON.stringify(level.words));
 }
 
 function processKeyPress(text) {
     var typedText = uppercaseOnly ? text.toLocaleUpperCase() : text;
 
     if (currentWord !== null) {
         // check against a currently typed word
         if (!currentWord.checkMatch(typedText)) {
             currentWord = null;
             audioCrashPlay()
         } else {
             playLetter(text)
         }
     } else {
         // no current word, check against all available words
         var found = false
         for (var i = 0; i< droppedWords.length; i++) {
             if (droppedWords[i].checkMatch(typedText)) {
                 // typed correctly
                 currentWord = droppedWords[i];
                 playLetter(text)
                 found = true
                 break;
             }
         }
         if(!found) {
             audioCrashPlay()
         }
     }
 
     if (currentWord !== null && currentWord.isCompleted()) {
         // win!
         droppedWordsCounter -= 1
         currentWord.won();  // note: deleteWord() is triggered after fadeout
         successRate += 0.1
         currentWord = null
         nextSubLevel();
     }
 }
 
 function setSpeed()
 {
     if (mode === "letter") {
         speed = (level.speed !== undefined) ? level.speed : (fallRateBase + Math.floor(fallRateMult / (currentLevel + 1)));
-        fallSpeed = (level.fallspeed !== undefined) ? level.fallspeed : Math.floor((dropRateBase + (dropRateMult * (currentLevel + 1))));
+        fallSpeed = (level.fallspeed !== undefined) ? level.fallspeed : Math.floor((dropRateBase - (dropRateMult * (currentLevel + 1))));
     } else { // wordsgame
         speed = (level.speed !== undefined) ? level.speed : wgDefaultSpeed - (currentLevel + 1)*wgAddSpeed;
-        fallSpeed = (level.fallspeed !== undefined) ? level.fallspeed : wgDefaultFallSpeed - (currentLevel+1)*wgAddFallSpeed
+        fallSpeed = (level.fallspeed !== undefined) ? level.fallspeed : wgDefaultFallSpeed - (currentLevel + 1)*wgAddFallSpeed
 
         if(speed < wgMinSpeed ) speed = wgMinSpeed;
         if(speed > wgMaxSpeed ) speed = wgMaxSpeed;
         if(fallSpeed < wgMinFallSpeed ) fallSpeed = wgMinFallSpeed;
         if(fallSpeed > wgMaxFallSpeed ) fallSpeed = wgMaxFallSpeed;
     }
     items.wordDropTimer.interval = fallSpeed;
 }
 
 function deleteWords()
 {
     if (droppedWords === undefined || droppedWords.length < 1)
         return;
     for (var i = 0; i< droppedWords.length; i++)
         droppedWords[i].destroy();
     droppedWords.length = 0;
 }
 
 function deleteWord(w)
 {
     if (droppedWords === undefined || droppedWords.length < 1)
         return;
     if (w == currentWord)
         currentWord = null;
     for (var i = 0; i< droppedWords.length; i++)
         if (droppedWords[i] == w) {
             droppedWords[i].destroy();
             droppedWords.splice(i, 1);
             break;
         }
 }
 
 function createWord()
 {
     if (wordComponent.status == 1 /* Component.Ready */) {
         var text = items.wordlist.getRandomWord();
         if(!text) {
             items.wordDropTimer.restart();
             return
         }
 
         // if uppercaseOnly case does not matter otherwise it does
         if (uppercaseOnly)
             text = text.toLocaleUpperCase();
 
         var word
 
         if(items.ourActivity.getImage(text)) {
             word = wordComponent.createObject( items.background,
                 {
                     "text": text,
                     "image": items.ourActivity.getImage(text),
                     // assume x=width-25px for now, Word auto-adjusts onCompleted():
                     "x": Math.random() * (items.main.width - 25),
                     "y": -25,
                 });
         } else if(items.ourActivity.getDominoValues(text).length) {
             word = wordComponent.createObject( items.background,
                 {
                     "text": text,
                     "mode": items.ourActivity.getMode(),
                     "dominoValues": items.ourActivity.getDominoValues(text),
                     // assume x=width-25px for now, Word auto-adjusts onCompleted():
                     "x": Math.random() * (items.main.width - 25),
                     "y": -25,
                 });
         } else {
             word = wordComponent.createObject( items.background,
                 {
                     "text": text,
                     // assume x=width-25px for now, Word auto-adjusts onCompleted():
                     "x": Math.random() * (items.main.width - 25),
                     "y": -25,
                     "mode": mode,
                 });
         }
 
         if (word === null)
             console.log("Gletters: Error creating word object");
         else {
             droppedWords[droppedWords.length] = word;
             droppedWordsCounter += 1
             // speed to duration:
             var duration = (items.main.height / 2) * speed / successRate;
             /* console.debug("Gletters: dropping new word " + word.text
                     + " duration=" + duration + " (speed=" + speed + ")"  
                     + " num=" + droppedWords.length);*/
             word.startMoving(duration);
         }
         items.wordDropTimer.restart();
     } else if (wordComponent.status == 3 /* Component.Error */) {
         console.log("Gletters: error creating word component: " + wordComponent.errorString());
     }
 }
 
 function dropWord()
 {
     // Do not create too many falling items
     if(droppedWords.length > wgMaxFallingItems) {
         items.wordDropTimer.restart();
         return
     }
 
     if (wordComponent !== null)
         createWord();
     else {
         var text = items.wordlist.getRandomWord();
         items.wordlist.appendRandomWord(text)
         var fallingItem
         if(items.ourActivity.getImage(text))
             fallingItem = "FallingImage.qml"
         else if(items.ourActivity.getDominoValues(text).length)
             fallingItem = "FallingDomino.qml"
         else
             fallingItem = "FallingWord.qml"
 
 
         wordComponent = Qt.createComponent("qrc:/gcompris/src/activities/gletters/" + fallingItem);
         if (wordComponent.status == 1 /* Component.Ready */)
             createWord();
         else if (wordComponent.status == 3 /* Component.Error */) {
             console.log("Gletters: error creating word component: " + wordComponent.errorString());
         } else
             wordComponent.statusChanged.connect(createWord);
     }
 }
 
 function appendRandomWord(word) {
     items.wordlist.appendRandomWord(word)
 }
 
 function audioCrashPlay() {
     if(successRate > 0.5)
         successRate -= 0.1
     items.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/crash.wav")
 }
 
 function nextLevel() {
     if(maxLevel <= ++currentLevel ) {
         currentLevel = 0
     }
     currentSubLevel = 0;
     initLevel();
 }
 
 function previousLevel() {
     if(--currentLevel < 0) {
         currentLevel = maxLevel - 1
     }
     currentSubLevel = 0;
     initLevel();
 }
 
 function nextSubLevel() {
     if( ++currentSubLevel >= maxSubLevel) {
         currentSubLevel = 0
         items.bonus.good("lion")
     } else
         items.score.playWinAnimation();
         initSubLevel();
 }
 
 function playLetter(letter) {
     var locale = GCompris.ApplicationInfo.getVoicesLocale(items.locale)
 
     items.audioVoices.append(GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/"+locale+"/alphabet/"
                                                                        + Core.getSoundFilenamForChar(letter)))
 }
 
 
 function focusTextInput() {
     if (!GCompris.ApplicationInfo.isMobile && items && items.textinput)
         items.textinput.forceActiveFocus();
 }