diff --git a/applications/tappytux/gameconfigform.lfm b/applications/tappytux/gameconfigform.lfm
index 09bb113f4..8aba9e869 100644
--- a/applications/tappytux/gameconfigform.lfm
+++ b/applications/tappytux/gameconfigform.lfm
@@ -6,7 +6,6 @@ object formConfig: TformConfig
   Caption = 'TappyTux Loader'
   ClientHeight = 432
   ClientWidth = 582
-  OnClick = btnLoadClick
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poDesktopCenter
@@ -31,7 +30,7 @@ object formConfig: TformConfig
     TabOrder = 1
   end
   object labelWordlist: TLabel
-    Left = 208
+    Left = 212
     Height = 17
     Top = 16
     Width = 93
@@ -46,8 +45,8 @@ object formConfig: TformConfig
     ItemHeight = 0
     TabOrder = 2
   end
-  object lblSettings: TLabel
-    Left = 392
+  object labelSettings: TLabel
+    Left = 432
     Height = 17
     Top = 16
     Width = 52
@@ -132,7 +131,7 @@ object formConfig: TformConfig
     Text = 'Select'
   end
   object lblCredits: TLabel
-    Left = 440
+    Left = 432
     Height = 17
     Top = 200
     Width = 46
@@ -190,13 +189,13 @@ object formConfig: TformConfig
     ScrollBars = ssAutoVertical
     TabOrder = 6
   end
-  object btnLoad: TButton
+  object buttonLoad: TButton
     Left = 19
     Height = 37
     Top = 379
     Width = 542
     Caption = 'Play'
-    OnClick = btnLoadClick
+    OnClick = buttonLoadClick
     TabOrder = 7
   end
   object btnWordlist: TButton
@@ -209,12 +208,12 @@ object formConfig: TformConfig
     OnClick = btnWordlistClick
     TabOrder = 8
   end
-  object lblGameType: TLabel
-    Left = 16
+  object labelGameType: TLabel
+    Left = 9
     Height = 17
     Top = 16
-    Width = 67
-    Caption = 'GameType'
+    Width = 72
+    Caption = 'Game type:'
     ParentColor = False
   end
   object lblLevel1: TLabel
diff --git a/applications/tappytux/gameconfigform.pas b/applications/tappytux/gameconfigform.pas
index f12001bfa..808825dbc 100644
--- a/applications/tappytux/gameconfigform.pas
+++ b/applications/tappytux/gameconfigform.pas
@@ -16,17 +16,17 @@ type
   { TformConfig }
 
   TformConfig = class(TForm)
-    btnLoad: TButton;
+    buttonLoad: TButton;
     btnWordlist: TButton;
     comboLanguage: TComboBox;
     comboGameType: TComboBox;
     comboSound: TComboBox;
     comboMusic: TComboBox;
     comboLevel: TComboBox;
-    lblGameType: TLabel;
+    labelGameType: TLabel;
     labelWordlist: TLabel;
     lblLevel1: TLabel;
-    lblSettings: TLabel;
+    labelSettings: TLabel;
     lblSound: TLabel;
     lblMusic: TLabel;
     lblLevel: TLabel;
@@ -34,7 +34,7 @@ type
     listWordlist: TListBox;
     memoGameType: TMemo;
     memoCredits: TMemo;
-    procedure btnLoadClick(Sender: TObject);
+    procedure buttonLoadClick(Sender: TObject);
     procedure btnWordlistClick(Sender: TObject);
     procedure comboGameTypeChange(Sender: TObject);
     procedure comboLanguageChange(Sender: TObject);
@@ -73,18 +73,22 @@ end;
 procedure TformConfig.comboLanguageChange(Sender: TObject);
 begin
   case comboLanguage.ItemIndex of
-  0:
+  0: // english
   begin
-
+    labelGameType.Caption := 'Game type:';
+    labelSettings.Caption := 'Settings';
+    buttonLoad.Caption := 'Play';
   end;
-  1:
+  1: // portuguese
   begin
-
+    labelGameType.Caption := 'Tipo do jogo:';
+    labelSettings.Caption := 'Configurações';
+    buttonLoad.Caption := 'Iniciar o Jogo';
   end;
   end;
 end;
 
-procedure TformConfig.btnLoadClick(Sender: TObject);
+procedure TformConfig.buttonLoadClick(Sender: TObject);
 begin
   SetCurrentModule(comboGameType.ItemIndex);
   formTappyTuxGame.Show;
@@ -112,6 +116,7 @@ end;
 
 procedure TformConfig.FormShow(Sender: TObject);
 begin
+  comboLanguageChange(Self);
   comboGameTypeChange(Self);
 end;