diff --git a/applications/tappytux/gameconfigform.lfm b/applications/tappytux/gameconfigform.lfm
index 927ce048e..b950f9f90 100644
--- a/applications/tappytux/gameconfigform.lfm
+++ b/applications/tappytux/gameconfigform.lfm
@@ -100,7 +100,6 @@ object formConfig: TformConfig
       'ON'
       'OFF'
     )
-    OnChange = comboSoundChange
     TabOrder = 3
     Text = 'Select'
   end
diff --git a/applications/tappytux/gameconfigform.pas b/applications/tappytux/gameconfigform.pas
index c37532a28..06c49c420 100644
--- a/applications/tappytux/gameconfigform.pas
+++ b/applications/tappytux/gameconfigform.pas
@@ -34,8 +34,6 @@ type
     memoCredits: TMemo;
     procedure btnLoadClick(Sender: TObject);
     procedure comboGameTypeChange(Sender: TObject);
-    procedure comboSoundChange(Sender: TObject);
-    procedure FormClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
   private
     { private declarations }
@@ -56,23 +54,8 @@ implementation
 
 procedure TformConfig.comboGameTypeChange(Sender: TObject);
 begin
-
-  Case comboGameType.itemIndex of
-  0: begin
-    memoGameType.Clear;
-    memoGameType.Lines.Add('Description: <Descrição do TappyWords>');
-    memoGameType.Lines.Add('');
-    memoGameType.Lines.Add('Hint: <Alguma dica para TappyWords>');
-    end;
-
-  1: begin
-    memoGameType.Clear;
-    memoGameType.Lines.Add('Description: <Descrição do TappyMath>');
-    memoGameType.Lines.Add('');
-    memoGameType.Lines.Add('Hint: <Alguma dica para TappyMath>');
-    end;
-
-  end;
+  memoGameType.Clear;
+  memoGameType.Lines.Add(GetModule(comboGameType.itemIndex).LongDescription);
 
 end;
 
@@ -86,16 +69,6 @@ begin
   Hide;
 end;
 
-procedure TformConfig.comboSoundChange(Sender: TObject);
-begin
-
-end;
-
-procedure TformConfig.FormClick(Sender: TObject);
-begin
-
-end;
-
 procedure TformConfig.FormCreate(Sender: TObject);
 var
   i: Integer;
diff --git a/applications/tappytux/gameplayform.lfm b/applications/tappytux/gameplayform.lfm
index 7edb6b514..7fcee1d69 100644
--- a/applications/tappytux/gameplayform.lfm
+++ b/applications/tappytux/gameplayform.lfm
@@ -1,7 +1,7 @@
 object formTappyTuxGame: TformTappyTuxGame
-  Left = 375
+  Left = 626
   Height = 425
-  Top = 210
+  Top = 277
   Width = 621
   Caption = 'Tappy Tux'
   ClientHeight = 425
@@ -9,6 +9,7 @@ object formTappyTuxGame: TformTappyTuxGame
   OnCreate = FormCreate
   OnShow = FormShow
   LCLVersion = '0.9.31'
+  Visible = True
   object btnExit: TButton
     Left = 8
     Height = 31
@@ -237,7 +238,10 @@ object formTappyTuxGame: TformTappyTuxGame
     Top = 152
     Width = 172
     Caption = 'Game Over'#13#10'Continue?'
+    Checked = True
     Color = clRed
+    Enabled = False
+    State = cbChecked
     TabOrder = 11
     Visible = False
   end
@@ -261,5 +265,6 @@ object formTappyTuxGame: TformTappyTuxGame
     Color = clRed
     OnClick = NoClick
     TabOrder = 13
+    Visible = False
   end
 end
diff --git a/applications/tappytux/images/modules/tappywords/0.txt b/applications/tappytux/images/modules/tappywords/0.txt
new file mode 100644
index 000000000..c3dfbe2c1
--- /dev/null
+++ b/applications/tappytux/images/modules/tappywords/0.txt
@@ -0,0 +1,71 @@
+cachorro
+gato
+peixe
+pássaro
+macaco
+leão
+tigre
+elefante
+crocodilo
+abelha
+mosca
+água-viva
+tartaruga
+lagartixa
+sapo
+minhoca
+centopéia
+rinoceronte
+coiote
+águia
+canguru
+coala
+morcego
+gavião
+pavão
+cobra
+camelo
+lontra
+tubarão
+coelho
+baleia
+urso
+foca
+escorpião
+touro
+vaca
+galinha
+formiga
+borboleta
+girafa
+arara
+salamandra
+rã
+pinguim
+tatu
+avestruz
+hiena
+pelicano
+pombo
+orangotango
+coruja
+papagaio
+tucano
+ornitorrinco
+gambá
+rato
+esquilo
+golfinho
+ovelha
+morsa
+suricato
+ornitorrinco
+toupeira
+barata
+lula
+polvo
+tamanduá
+camarão
+lêmure
+besouro
+onça
\ No newline at end of file
diff --git a/applications/tappytux/mod_tappymath.pas b/applications/tappytux/mod_tappymath.pas
index 2832accbb..4ae19581a 100644
--- a/applications/tappytux/mod_tappymath.pas
+++ b/applications/tappytux/mod_tappymath.pas
@@ -85,12 +85,14 @@ end;
 
 procedure TTappyMath.TranslateTextsToEnglish;
 begin
-  ShortDescription := 'TappyMath - A game to learn arithmetics';
+  ShortDescription := 'TappyMath';
+  LongDescription := 'A game to learn arithmetics';
 end;
 
 procedure TTappyMath.TranslateTextsToPortuguese;
 begin
-  ShortDescription := 'TappyMath - Um jogo para aprender aritmética';
+  ShortDescription := 'TappyMath';
+  LongDescription := 'Um jogo para aprender aritmética';
 end;
 
 procedure TTappyMath.StartNewGame(SndFX: Integer; Music: Integer; Level: Integer; QuestionList: Integer);
@@ -154,7 +156,6 @@ end;
 
 procedure TTappyMath.QuestionGenerator(qNumber : Integer);
 begin
-
   questionType[1] := random(3);
 
   Case questionType[1] of
diff --git a/applications/tappytux/mod_tappywords.pas b/applications/tappytux/mod_tappywords.pas
index 22ad9454b..684cdb51b 100644
--- a/applications/tappytux/mod_tappywords.pas
+++ b/applications/tappytux/mod_tappywords.pas
@@ -24,7 +24,7 @@ type
     gameSLevel : Integer;
     gameSndFX : Boolean;
     gameMusic : Boolean;
-    gameQuestionList : Integer;
+    gameQuestionList : TStringList;
     timerWords: TTimer;
     procedure HandleOnTimer(Sender: TObject);
 
@@ -84,12 +84,14 @@ end;
 
 procedure TTappyWords.TranslateTextsToEnglish;
 begin
-  ShortDescription := 'TappyWords - A game to learn typing and ortography';
+  ShortDescription := 'TappyWords';
+  LongDescription := 'A game to learn typing and ortography.'; // Hint: Try to keep looking at the screen instead of the keyboard!
 end;
 
 procedure TTappyWords.TranslateTextsToPortuguese;
 begin
-  ShortDescription := 'TappyWords - Um jogo para aprender a digitar e ortografia';
+  ShortDescription := 'TappyWords';
+  LongDescription := 'Um jogo para aprender a digitar e ortografia';
 end;
 
 procedure TTappyWords.StartNewGame(SndFX: Integer; Music: Integer; Level: Integer; QuestionList: Integer);
@@ -107,6 +109,10 @@ begin
   if (Music = 1) then gameMusic := false;
   gameSLevel := gameLevel;
 
+  gameQuestionList := TStringList.Create;
+  gameQuestionList.LoadFromFile(vTappyTuxConfig.GetResourcesDir()+ 'images'+PathDelim+'modules'+PathDelim+'tappywords'+PathDelim+'0.txt');
+  //gameQuestionList.LoadFromFile('C:/0.txt');
+
   formTappyTuxGame.Answer.ReadOnly := false;
   formTappyTuxGame.GameOver.Visible := false;
   formTappyTuxGame.Yes.Visible := false;
@@ -117,7 +123,8 @@ begin
 
   for i:= 1 to 5 do
   begin
-    Questions[i].Text := formTappyTuxGame.Test.Lines.Strings[random(71)];
+    //Questions[i].Text := formTappyTuxGame.Test.Lines.Strings[random(71)];
+    Questions[i].Text := gameQuestionList[random(gameQuestionList.Count - 1)];
   end
 
 end;