diff --git a/game/config.ini b/game/config.ini
index d0fc89cf3..cbe0029eb 100644
--- a/game/config.ini
+++ b/game/config.ini
@@ -1,216 +1,204 @@
-[Game]
-Players=1
-Difficulty=Easy
-Language=English
-Tabs=Off
-SongMenu=List
-Sorting=Artist
-ShowScores=On
-Debug=Off
-AVDelay=0
-MicDelay=280
-
-[Graphics]
-Screens=1
-Split=Off
-FullScreen=Off
-Visualization=Off
-Resolution=1600x900
-Depth=32 bit
-TextureSize=256
-Oscilloscope=Off
-MovieSize=Full [BG+Vid]
-VideoPreview=On
-VideoEnabled=On
-MaxFramerate=60
-ResolutionFullscreen=1920x1080
-PositionX=0
-PositionY=0
-
-[Sound]
-ClickAssist=Off
-BeatClick=Off
-AudioOutputBufferSize=Auto
-BackgroundMusic=Off
-PreviewVolume=70%
-PreviewFading=3 Secs
-SavePlayback=Off
-VoicePassthrough=Off
-MusicAutoGain=Off
-
-[Lyrics]
-LyricsFont=Noto Sans
-LyricsStyle=Outline
-LyricsEffect=Slide
-NoteLines=On
-Encoding=Auto
-
-[Themes]
-Theme=Modern
-Skin=Blue
-Color=Blue
-
-[Record]
-MicBoost=+12dB
-Threshold=15%
-DeviceName[1]=Mikrofon (2- Realtek High Definition Audio)
-Input[1]=0
-Latency[1]=-1
-Channel1[1]=1
-Channel2[1]=2
-DeviceName[2]=Mikrofon (Realtek High Definition Audio)
-Input[2]=0
-Latency[2]=-1
-DeviceName[3]=Mikrofon (USBMIC Serial# 101113608 )
-Input[3]=0
-Latency[3]=-1
-Channel1[3]=1
-Channel2[3]=2
-DeviceName[4]=CABLE Output (VB-Audio Virtual Cable)
-Input[4]=0
-Latency[4]=-1
-DeviceName[5]=Analogue 1 + 2 (2- Focusrite USB Audio)
-Input[5]=0
-Latency[5]=-1
-DeviceName[6]=VoiceMeeter Output (VB-Audio VoiceMeeter VAIO)
-Input[6]=0
-Latency[6]=-1
-DeviceName[7]=VoiceMeeter Aux Output (VB-Audio VoiceMeeter AUX VAIO)
-Input[7]=0
-Latency[7]=-1
-DeviceName[8]=Microphone (Logitech BRIO)
-Input[8]=0
-Latency[8]=-1
-Channel1[8]=1
-
-[Advanced]
-LoadAnimation=On
-EffectSing=On
-ScreenFade=Off
-AskbeforeDel=On
-OnSongClick=Sing
-LineBonus=On
-PartyPopup=On
-SingScores=On
-TopScores=All
-SyncTo=Music
-SingTimebarMode=Remaining
-JukeboxTimebarMode=Current
-
-[Controller]
-Joypad=Off
-Mouse=Off
-
-[Directories]
-WebScoresDir=
-SongDir1=
-
-[Jukebox]
-LyricsFont=Noto Sans
-LyricsStyle=Outline
-LyricsEffect=Slide
-LyricsAlpha=0.90
-SingLineColor=FFFF00
-ActualLineColor=FFFFFF
-NextLineColor=D6D6D6
-SingLineOColor=000000
-ActualLineOColor=000000
-NextLineOColor=000000
-
-[Name]
-P1=USDXstyle
-P2=Player2
-P3=Player3
-P4=Player4
-P5=Player5
-P6=Player6
-P7=Player7
-P8=Player8
-P9=Player9
-P10=Player10
-P11=Player11
-P12=Player12
-P13=
-P14=
-P15=
-P16=
-
-[NameTeam]
-T1=Team1
-T2=Team2
-T3=Team3
-
-[NameTemplate]
-Name1=Template1
-Name2=Template2
-Name3=Template3
-Name4=Template4
-Name5=Template5
-Name6=Template6
-Name7=Template7
-Name8=Template8
-Name9=Template9
-Name10=Template10
-Name11=Template11
-Name12=Template12
-
-[PlayerColor]
-P1=1
-P2=4
-P3=3
-P4=2
-P5=5
-P6=6
-P7=7
-P8=8
-P9=9
-P10=10
-P11=11
-P12=12
-
-[PlayerAvatar]
-P1=
-P2=
-P3=
-P4=
-P5=
-P6=
-P7=
-P8=
-P9=
-P10=
-P11=
-P12=
-
-[PlayerLevel]
-P1=0
-P2=0
-P3=0
-P4=0
-P5=0
-P6=0
-P7=0
-P8=0
-P9=0
-P10=0
-P11=0
-P12=0
-
-[Webcam]
-ID=1
-Resolution=800x600
-FPS=30
-Flip=On
-Brightness=0
-Saturation=0
-Hue=0
-Effect=0
-
-[TeamColor]
-T1=1
-T2=2
-T3=3
-
-[KeyBindings]
-PianoKeysLow=92,97,122,115,120,100,99,118,103,98,104,110,109,107,44,108,46,59,47
-PianoKeysHigh=49,113,50,119,51,101,114,53,116,54,121,117,56,105,57,111,48,112,91,61,93
+[Game]
+Players=6
+Difficulty=Easy
+Language=English
+Tabs=Off
+SongMenu=Roulette
+Sorting=Artist
+ShowScores=On
+Debug=Off
+AVDelay=0
+MicDelay=140
+
+[Graphics]
+Screens=1
+Split=Off
+FullScreen=Off
+Visualization=Off
+Resolution=1024x768
+Depth=32 bit
+TextureSize=256
+Oscilloscope=On
+MovieSize=Full [BG+Vid]
+VideoPreview=On
+VideoEnabled=On
+MaxFramerate=60
+ResolutionFullscreen=1920x1080
+PositionX=0
+PositionY=0
+
+[Sound]
+ClickAssist=Off
+BeatClick=Off
+AudioOutputBufferSize=Auto
+BackgroundMusic=On
+PreviewVolume=70%
+PreviewFading=3 Secs
+SavePlayback=Off
+VoicePassthrough=Off
+MusicAutoGain=Off
+
+[Lyrics]
+LyricsFont=Noto Sans
+LyricsStyle=Outline
+LyricsEffect=Slide
+NoteLines=On
+Encoding=Auto
+
+[Themes]
+Theme=Modern
+Skin=Blue
+Color=Blue
+
+[Record]
+MicBoost=+12dB
+Threshold=15%
+DeviceName[1]=Mikrofon (2- Realtek High Definition Audio)
+Input[1]=0
+Latency[1]=-1
+Channel1[1]=1
+Channel2[1]=2
+DeviceName[2]=Mikrofon (Realtek High Definition Audio)
+Input[2]=0
+Latency[2]=-1
+Channel1[2]=0
+Channel2[2]=0
+DeviceName[3]=Mikrofon (USBMIC Serial# 101113608 )
+Input[3]=0
+Latency[3]=-1
+Channel1[3]=1
+Channel2[3]=2
+DeviceName[4]=CABLE Output (VB-Audio Virtual Cable)
+Input[4]=0
+
+[Advanced]
+LoadAnimation=On
+EffectSing=On
+ScreenFade=On
+AskbeforeDel=On
+OnSongClick=Sing
+LineBonus=On
+PartyPopup=On
+SingScores=On
+TopScores=All
+SyncTo=Music
+SingTimebarMode=Remaining
+JukeboxTimebarMode=Current
+
+[Controller]
+Joypad=Off
+Mouse=Game
+
+[Directories]
+WebScoresDir=
+SongDir1=
+
+[Jukebox]
+LyricsFont=Noto Sans
+LyricsStyle=Outline
+LyricsEffect=Slide
+LyricsAlpha=0.90
+SingLineColor=FFFF00
+ActualLineColor=FFFFFF
+NextLineColor=D6D6D6
+SingLineOColor=000000
+ActualLineOColor=000000
+NextLineOColor=000000
+
+[Name]
+P1=USDXstyle
+P2=Player2
+P3=Player3
+P4=Player4
+P5=Player5
+P6=Player6
+P7=Player7
+P8=Player8
+P9=Player9
+P10=Player10
+P11=Player11
+P12=Player12
+P13=
+P14=
+P15=
+P16=
+
+[NameTeam]
+T1=Team1
+T2=Team2
+T3=Team3
+
+[NameTemplate]
+Name1=Template1
+Name2=Template2
+Name3=Template3
+Name4=Template4
+Name5=Template5
+Name6=Template6
+Name7=Template7
+Name8=Template8
+Name9=Template9
+Name10=Template10
+Name11=Template11
+Name12=Template12
+
+[PlayerColor]
+P1=1
+P2=4
+P3=3
+P4=2
+P5=5
+P6=6
+P7=7
+P8=8
+P9=9
+P10=10
+P11=11
+P12=12
+
+[PlayerAvatar]
+P1=
+P2=
+P3=
+P4=
+P5=
+P6=
+P7=
+P8=
+P9=
+P10=
+P11=
+P12=
+
+[PlayerLevel]
+P1=0
+P2=0
+P3=0
+P4=0
+P5=0
+P6=0
+P7=0
+P8=0
+P9=0
+P10=0
+P11=0
+P12=0
+
+[Webcam]
+ID=1
+Resolution=800x600
+FPS=30
+Flip=On
+Brightness=0
+Saturation=0
+Hue=0
+Effect=0
+
+[TeamColor]
+T1=1
+T2=2
+T3=3
+
+[KeyBindings]
+PianoKeysLow=92,97,122,115,120,100,99,118,103,98,104,110,109,107,44,108,46,59,47
+PianoKeysHigh=49,113,50,119,51,101,114,53,116,54,121,117,56,105,57,111,48,112,91,61,93
diff --git a/src/screens/UScreenEditSub.pas b/src/screens/UScreenEditSub.pas
index a7c3a6467..9e5aff2c1 100644
--- a/src/screens/UScreenEditSub.pas
+++ b/src/screens/UScreenEditSub.pas
@@ -2591,14 +2591,15 @@ function TScreenEditSub.ParseInputEditPiano(PressedKey: cardinal; CharCode: UCS4
 
   if PressedDown then
   begin
-    Log.LogWarn('Pressed Key' + IntToStr(PressedKey), 'ScreenEditSub');
     // check special keys
     case PressedKey of
       SDLK_ESCAPE, SDLK_F6:
         begin
           PianoEditMode := false;
         end;
-      else
+    end;
+    if PianoEditMode = true then
+    begin
       for i := Low(PianoKeysLow) to High(PianoKeysLow) do
       begin
         if PressedKey = PianoKeysLow[i] then
@@ -2619,7 +2620,7 @@ function TScreenEditSub.ParseInputEditPiano(PressedKey: cardinal; CharCode: UCS4
         end;
       end;
 
-      if (NewNote <> -1000) then
+      if NewNote <> -1000 then
       begin
         Tracks[CurrentTrack].Lines[Tracks[CurrentTrack].CurrentLine].Notes[CurrentNote[CurrentTrack]].Tone := NewNote;
         // Play Midi
@@ -2635,8 +2636,10 @@ function TScreenEditSub.ParseInputEditPiano(PressedKey: cardinal; CharCode: UCS4
           Tracks[CurrentTrack].Lines[Tracks[CurrentTrack].CurrentLine].Notes[CurrentNote[CurrentTrack]].StartBeat +
           Tracks[CurrentTrack].Lines[Tracks[CurrentTrack].CurrentLine].Notes[CurrentNote[CurrentTrack]].Duration); {$ENDIF}
         LastClick := -100;
-      end; //if (NewNote != -1000)
-    end; //case
+      end
+      else
+        Result := False;
+    end; //if (PianoEditMode)
   end; //if (PressedDown)
 end;