From e71cddbb44df1c88bdd4ad9a492275dce63b01dc Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Tue, 18 Dec 2018 20:53:29 +0100
Subject: [PATCH 01/21] Add missing ``Skin Settings`` to view menu, replaces
 the now defunct ``Show Samplers``.

---
 res/keyboard/en_US.kbd.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
index 89e9acc27a8..23a2aee7b5c 100644
--- a/res/keyboard/en_US.kbd.cfg
+++ b/res/keyboard/en_US.kbd.cfg
@@ -125,7 +125,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4

From 45c495b80da05eb1ab2c4027ed88960d408a0d92 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Tue, 18 Dec 2018 21:02:31 +0100
Subject: [PATCH 02/21] Add Missing shortcuts for Developer menu, visible when
 starting Mixxx with the ``--developer`` argument.  If these shortcuts are not
 explicitly listed in other languages mappings, they are not visible to the
 user (replaced by question mark).

---
 res/keyboard/en_US.kbd.cfg | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
index 23a2aee7b5c..9956866f629 100644
--- a/res/keyboard/en_US.kbd.cfg
+++ b/res/keyboard/en_US.kbd.cfg
@@ -138,4 +138,10 @@ OptionsMenu_EnableVinyl2 Ctrl+y
 OptionsMenu_EnableVinyl3 Ctrl+u
 OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+`

From ebb5899459495de80d3b75b1291596d97f317805 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Tue, 18 Dec 2018 21:04:18 +0100
Subject: [PATCH 03/21] Replace deprecated ``flanger`` shortcuts with the
 Quickeffect control

---
 res/keyboard/en_US.kbd.cfg | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
index 9956866f629..da74b2881fd 100644
--- a/res/keyboard/en_US.kbd.cfg
+++ b/res/keyboard/en_US.kbd.cfg
@@ -19,6 +19,12 @@ start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play d
 cue_set Shift+d
@@ -43,7 +49,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger 5
 
 hotcue_1_activate z
 hotcue_2_activate x
@@ -93,7 +98,6 @@ rate_temp_up_small Shift+F8
 
 pfl y
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,

From 1bff933d147a0c4e3dc428c5b65ecae7b63afe18 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Tue, 18 Dec 2018 21:05:24 +0100
Subject: [PATCH 04/21] Replace deprecated ``beatsync`` shortcut with
 ``sync_enabled``

---
 res/keyboard/en_US.kbd.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
index da74b2881fd..e70c18f9916 100644
--- a/res/keyboard/en_US.kbd.cfg
+++ b/res/keyboard/en_US.kbd.cfg
@@ -35,7 +35,7 @@ back a
 reverse Shift+a
 fwd s
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift+!
 
 rate_perm_down F1
@@ -84,7 +84,7 @@ back j
 reverse Shift+j
 fwd k
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+^
 
 rate_perm_down F5

From 56aa7f94f5351490a880389d0b1c46068b99d7f2 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Tue, 18 Dec 2018 22:02:25 +0100
Subject: [PATCH 05/21] Replace shortcuts for some transport controls like
 ``back``, ``Reverse``, and ``fwd``. These controls do not have a
 representation in the UI anymore, replaced by the beatjump controls. Now the
 keyboard user is more flexible, and the shortcuts work depending on the value
 of the beatjump- selector in the UI. Visual feedback by the beatjump buttons.

---
 res/keyboard/en_US.kbd.cfg | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
index e70c18f9916..ccdc5fbaf5d 100644
--- a/res/keyboard/en_US.kbd.cfg
+++ b/res/keyboard/en_US.kbd.cfg
@@ -31,9 +31,10 @@ cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
 sync_enabled 1
 bpm_tap Shift+!
@@ -80,9 +81,10 @@ cue_set Shift+l
 cue_default ;
 cue_gotoandstop Shift+:
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
 sync_enabled 6
 bpm_tap Shift+^

From f96df51f193be715702b43d3ff2ac58e6a2a486b Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Tue, 18 Dec 2018 22:09:12 +0100
Subject: [PATCH 06/21] ``reloop``,  ``loop_in``, and ``loop_out`` shortcuts
 work now analog to the buttons in the UI.

---
 res/keyboard/en_US.kbd.cfg | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
index ccdc5fbaf5d..28f6b0abead 100644
--- a/res/keyboard/en_US.kbd.cfg
+++ b/res/keyboard/en_US.kbd.cfg
@@ -64,8 +64,11 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+@
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+#
+reloop_toggle 4
+reloop_andstop Shift+$
 
 beatloop_4_toggle q
 loop_halve w
@@ -114,8 +117,11 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+&
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+*
+reloop_toggle 9
+reloop_andstop Shift+(
 
 beatloop_4_toggle u
 loop_halve i

From a232e02915ebc3eb6ffe9d66d2325ac751cb007f Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Tue, 18 Dec 2018 22:13:08 +0100
Subject: [PATCH 07/21] ``beatloop`` and ``beatlooproll`` shortcuts work analog
 to the buttons in the UI. Not sure about the ``loop_halve`` and
 ``loop_double`` controls, need feedback.

---
 res/keyboard/en_US.kbd.cfg | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg
index 28f6b0abead..eaadc73d53c 100644
--- a/res/keyboard/en_US.kbd.cfg
+++ b/res/keyboard/en_US.kbd.cfg
@@ -70,9 +70,12 @@ loop_out_goto Shift+#
 reloop_toggle 4
 reloop_andstop Shift+$
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Y
@@ -123,9 +126,12 @@ loop_out_goto Shift+*
 reloop_toggle 9
 reloop_andstop Shift+(
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U

From 4db75b67a0ebc4ecbfbceab057075a332b2fda1d Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:04:18 +0100
Subject: [PATCH 08/21] Adapt changes from en_US keyboard mapping for de_DE

---
 res/keyboard/de_DE.kbd.cfg | 63 ++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/res/keyboard/de_DE.kbd.cfg b/res/keyboard/de_DE.kbd.cfg
index d7d08ffd3de..9429c999941 100644
--- a/res/keyboard/de_DE.kbd.cfg
+++ b/res/keyboard/de_DE.kbd.cfg
@@ -13,26 +13,30 @@ crossfader_down_small Shift+g
 [Microphone]
 talkover <
 
-[VinylControl]
-Toggle Ctrl+t
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play d
 cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift+!
 
 rate_perm_down F1
@@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger 5
 
 hotcue_1_activate y
 hotcue_2_activate x
@@ -61,12 +64,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+"
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+§
+reloop_toggle 4
+reloop_andstop Shift+$
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Z
@@ -78,11 +87,12 @@ cue_set Shift+l
 cue_default ö
 cue_gotoandstop Shift+Ö
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+&
 
 rate_perm_down F5
@@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl z
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+/
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+(
+reloop_toggle 9
+reloop_andstop Shift+)
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -128,7 +143,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -136,7 +151,15 @@ ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+z
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+t
+OptionsMenu_EnableVinyl2 Ctrl+z
+OptionsMenu_EnableVinyl3 Ctrl+u
+OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+<

From c0b0b9ca885e3c640fa646649855e70e52b4fc1c Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:06:15 +0100
Subject: [PATCH 09/21] Adapt changes from en_US keyboard mapping for de_CH

---
 res/keyboard/de_CH.kbd.cfg | 57 ++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/res/keyboard/de_CH.kbd.cfg b/res/keyboard/de_CH.kbd.cfg
index 681ac2aa23c..19e37428ebb 100644
--- a/res/keyboard/de_CH.kbd.cfg
+++ b/res/keyboard/de_CH.kbd.cfg
@@ -19,17 +19,24 @@ start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play d
 cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift++
 
 rate_perm_down F1
@@ -43,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger 5
 
 hotcue_1_activate y
 hotcue_2_activate x
@@ -58,12 +64,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+"
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+*
+reloop_toggle 4
+reloop_andstop Shift+ç
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Z
@@ -75,11 +87,12 @@ cue_set Shift+l
 cue_default ö
 cue_gotoandstop Shift+é
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+&
 
 rate_perm_down F5
@@ -93,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl z
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -108,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+/
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+(
+reloop_toggle 9
+reloop_andstop Shift+)
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -125,7 +143,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -134,9 +152,14 @@ ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+t
-OptionsMenu_EnableVinyl2 Ctrl+y
+OptionsMenu_EnableVinyl2 Ctrl+z
 OptionsMenu_EnableVinyl3 Ctrl+u
 OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
-
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+<

From b256912b5b36f95d78dc0fb6ff6fca400959ef05 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:12:03 +0100
Subject: [PATCH 10/21] Adapt changes from en_US keyboard mapping for it_IT

---
 res/keyboard/it_IT.kbd.cfg | 57 +++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/res/keyboard/it_IT.kbd.cfg b/res/keyboard/it_IT.kbd.cfg
index e15c28509a2..c2be27250a8 100644
--- a/res/keyboard/it_IT.kbd.cfg
+++ b/res/keyboard/it_IT.kbd.cfg
@@ -13,26 +13,30 @@ crossfader_down_small Shift+g
 [Microphone]
 talkover <
 
-[VinylControl]
-Toggle Ctrl+t
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play d
 cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift+!
 
 rate_perm_down F1
@@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger 5
 
 hotcue_1_activate z
 hotcue_2_activate x
@@ -61,12 +64,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+"
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+£
+reloop_toggle 4
+reloop_andstop Shift+$
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Y
@@ -78,11 +87,12 @@ cue_set Shift+l
 cue_default ò
 cue_gotoandstop Shift+ç
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+&
 
 rate_perm_down F5
@@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl y
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+/
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+(
+reloop_toggle 9
+reloop_andstop Shift+)
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -128,7 +143,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -136,7 +151,9 @@ ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+t
+OptionsMenu_EnableVinyl2 Ctrl+y
+OptionsMenu_EnableVinyl3 Ctrl+u
+OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
 OptionsMenu_ReloadSkin Ctrl+Shift+R

From 9d59e4d076d25724a0cf55337a593ac2d31aaa1a Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:24:02 +0100
Subject: [PATCH 11/21] Add missing part to the it_IT mapping

---
 res/keyboard/it_IT.kbd.cfg | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/res/keyboard/it_IT.kbd.cfg b/res/keyboard/it_IT.kbd.cfg
index c2be27250a8..a8f146632a5 100644
--- a/res/keyboard/it_IT.kbd.cfg
+++ b/res/keyboard/it_IT.kbd.cfg
@@ -156,4 +156,10 @@ OptionsMenu_EnableVinyl2 Ctrl+y
 OptionsMenu_EnableVinyl3 Ctrl+u
 OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+<

From c3f0271193c2b99733927b12538d73b58375b842 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:24:33 +0100
Subject: [PATCH 12/21] Adapt changes from en_US keyboard mapping for fr_FR

---
 res/keyboard/fr_FR.kbd.cfg | 57 +++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/res/keyboard/fr_FR.kbd.cfg b/res/keyboard/fr_FR.kbd.cfg
index 056c5334dd6..e31e5857b90 100644
--- a/res/keyboard/fr_FR.kbd.cfg
+++ b/res/keyboard/fr_FR.kbd.cfg
@@ -13,9 +13,6 @@ crossfader_down_small Shift+g
 [Microphone]
 talkover <
 
-[VinylControl]
-Toggle Ctrl+t
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
@@ -28,9 +25,10 @@ cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back q
-reverse Shift+q
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
 beatsync &
 bpm_tap Shift+1
@@ -46,7 +44,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger (
 
 hotcue_1_activate w
 hotcue_2_activate x
@@ -61,12 +58,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in é
+loop_in_goto Shift+2
 loop_out "
-reloop_exit '
+loop_out_goto Shift+3
+reloop_toggle '
+reloop_andstop Shift+4
 
-beatloop_4_toggle a
+beatloop_activate a
+beatlooproll_activate Shift+A
 loop_halve z
+beatjump_forward Shift+Z
 loop_double e
+beatjump_backward Shift+E
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Y
@@ -76,13 +79,14 @@ vinylcontrol_cueing Ctrl+Alt+Y
 play l
 cue_set Shift+l
 cue_default m
-cue_gotoandstop Shift+m
+cue_gotoandstop Shift+M
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+J
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync §
+sync_enabled §
 bpm_tap Shift+6
 
 rate_perm_down F5
@@ -96,7 +100,6 @@ rate_temp_up_small Shift+F8
 
 pfl y
 filterLowKill n
-flanger à
 
 hotcue_1_activate ,
 hotcue_2_activate ;
@@ -111,12 +114,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in è
+loop_in_goto Shift+7
 loop_out !
-reloop_exit ç
+loop_out_goto Shift+8
+reloop_toggle ç
+reloop_andstop Shift+9
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -128,7 +137,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -136,7 +145,15 @@ ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+t
+OptionsMenu_EnableVinyl2 Ctrl+y
+OptionsMenu_EnableVinyl3 Ctrl+u
+OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+`

From 07756daba1b5b236a68e16bbab50548118f8f34d Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:30:45 +0100
Subject: [PATCH 13/21] Adapt changes from en_US keyboard mapping for fr_CH

---
 res/keyboard/fr_CH.kbd.cfg | 57 ++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/res/keyboard/fr_CH.kbd.cfg b/res/keyboard/fr_CH.kbd.cfg
index 9e82c10ab31..fbf5dabc56c 100644
--- a/res/keyboard/fr_CH.kbd.cfg
+++ b/res/keyboard/fr_CH.kbd.cfg
@@ -19,17 +19,24 @@ start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play d
 cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift++
 
 rate_perm_down F1
@@ -43,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger 5
 
 hotcue_1_activate y
 hotcue_2_activate x
@@ -58,12 +64,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+"
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+*
+reloop_toggle 4
+reloop_andstop Shift+ç
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Z
@@ -75,11 +87,12 @@ cue_set Shift+l
 cue_default é
 cue_gotoandstop Shift+ö
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+&
 
 rate_perm_down F5
@@ -93,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl z
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -108,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+/
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+(
+reloop_toggle 9
+reloop_andstop Shift+)
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -125,7 +143,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -134,9 +152,14 @@ ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
 OptionsMenu_EnableVinyl1 Ctrl+t
-OptionsMenu_EnableVinyl2 Ctrl+y
+OptionsMenu_EnableVinyl2 Ctrl+z
 OptionsMenu_EnableVinyl3 Ctrl+u
 OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
-
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+<

From bddba69c3d4dccc9034d2cc6a71c2067d67891fb Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:35:32 +0100
Subject: [PATCH 14/21] Adapt changes from en_US keyboard mapping for fi_FI

---
 res/keyboard/fi_FI.kbd.cfg | 63 ++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/res/keyboard/fi_FI.kbd.cfg b/res/keyboard/fi_FI.kbd.cfg
index 92d4382c101..49d9b520b05 100644
--- a/res/keyboard/fi_FI.kbd.cfg
+++ b/res/keyboard/fi_FI.kbd.cfg
@@ -13,26 +13,30 @@ crossfader_down_small Shift+g
 [Microphone]
 talkover <
 
-[VinylControl]
-Toggle Ctrl+t
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play d
 cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift+!
 
 rate_perm_down F1
@@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger 5
 
 hotcue_1_activate z
 hotcue_2_activate x
@@ -61,12 +64,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+"
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+#
+reloop_toggle 4
+reloop_andstop Shift+€
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Y
@@ -78,11 +87,12 @@ cue_set Shift+l
 cue_default ö
 cue_gotoandstop Shift+Ö
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+&
 
 rate_perm_down F5
@@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl y
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+/
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+(
+reloop_toggle 9
+reloop_andstop Shift+)
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -128,7 +143,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -136,7 +151,15 @@ ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+t
+OptionsMenu_EnableVinyl2 Ctrl+y
+OptionsMenu_EnableVinyl3 Ctrl+u
+OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+<

From b779046faf5aeb7df70e86b0107ae0776a5f4f8e Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:42:06 +0100
Subject: [PATCH 15/21] Adapt changes from en_US keyboard mapping for es_ES

---
 res/keyboard/es_ES.kbd.cfg | 65 ++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/res/keyboard/es_ES.kbd.cfg b/res/keyboard/es_ES.kbd.cfg
index 356aff120bb..e7d80edc1ad 100644
--- a/res/keyboard/es_ES.kbd.cfg
+++ b/res/keyboard/es_ES.kbd.cfg
@@ -13,27 +13,31 @@ crossfader_down_small Shift+g
 [Microphone]
 talkover <
 
-[VinylControl]
-Toggle Ctrl+t
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play d
 cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync 1
-bpm_tap Shift+!
+sync_enabled 1
+bpm_tap Shift+¡
 
 rate_perm_down F1
 rate_perm_up F2
@@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger 5
 
 hotcue_1_activate z
 hotcue_2_activate x
@@ -61,12 +64,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+@
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+#
+reloop_toggle 4
+reloop_andstop Shift+$
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Y
@@ -78,11 +87,12 @@ cue_set Shift+l
 cue_default ñ
 cue_gotoandstop Shift+Ñ
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+/
 
 rate_perm_down F5
@@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl y
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+&
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+*
+reloop_toggle 9
+reloop_andstop Shift+(
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -128,7 +143,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -136,7 +151,15 @@ ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+t
+OptionsMenu_EnableVinyl2 Ctrl+y
+OptionsMenu_EnableVinyl3 Ctrl+u
+OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+<

From dcc715cc7e85cf22fca6f7395cb0ab96839b02c1 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:48:13 +0100
Subject: [PATCH 16/21] Adapt changes from en_US keyboard mapping for cs_CZ

---
 res/keyboard/cs_CZ.kbd.cfg | 57 +++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/res/keyboard/cs_CZ.kbd.cfg b/res/keyboard/cs_CZ.kbd.cfg
index d4e2e274bbf..5f139f4fefe 100644
--- a/res/keyboard/cs_CZ.kbd.cfg
+++ b/res/keyboard/cs_CZ.kbd.cfg
@@ -13,9 +13,6 @@ crossfader_down_small Shift+g
 [Microphone]
 talkover \
 
-[VinylControl]
-Toggle Ctrl+t
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
@@ -28,11 +25,12 @@ cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync +
+sync_enabled +
 bpm_tap Shift+1
 
 rate_perm_down F1
@@ -46,7 +44,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger ř
 
 hotcue_1_activate y
 hotcue_2_activate x
@@ -61,12 +58,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in ě
+loop_in_goto Shift+2
 loop_out š
-reloop_exit č
+loop_out_goto Shift+3
+reloop_toggle č
+reloop_andstop Shift+4
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Z
@@ -78,11 +81,12 @@ cue_set Shift+l
 cue_default ů
 cue_gotoandstop Shift+"
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync ž
+sync_enabled ž
 bpm_tap Shift+6
 
 rate_perm_down F5
@@ -96,7 +100,6 @@ rate_temp_up_small Shift+F8
 
 pfl z
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -111,12 +114,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in ý
+loop_in_goto Shift+7
 loop_out á
-reloop_exit í
+loop_out_goto Shift+8
+reloop_toggle í
+reloop_andstop Shift+9
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -128,7 +137,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -136,7 +145,15 @@ ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+t
+OptionsMenu_EnableVinyl2 Ctrl+z
+OptionsMenu_EnableVinyl3 Ctrl+u
+OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+\

From 0c83976f7661d14cfa008c765c6fdad695ea6124 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 13:52:45 +0100
Subject: [PATCH 17/21] Adapt changes from en_US keyboard mapping for da_DK

---
 res/keyboard/da_DK.kbd.cfg | 65 ++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/res/keyboard/da_DK.kbd.cfg b/res/keyboard/da_DK.kbd.cfg
index 664690fc2f5..d6d643a9332 100644
--- a/res/keyboard/da_DK.kbd.cfg
+++ b/res/keyboard/da_DK.kbd.cfg
@@ -13,26 +13,30 @@ crossfader_down_small Shift+g
 [Microphone]
 talkover <
 
-[VinylControl]
-Toggle Ctrl+t
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play d
 cue_set Shift+d
 cue_default f
 cue_gotoandstop Shift+f
 
-back a
-reverse Shift+a
-fwd s
+beatjump_backward a
+beatjump_1_backward Shift+a
+beatjump_forward s
+beatjump_1_forward Shift+s
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift+!
 
 rate_perm_down F1
@@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl t
 filterLowKill b
-flanger 5
 
 hotcue_1_activate z
 hotcue_2_activate x
@@ -61,12 +64,18 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+@
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+#
+reloop_toggle 4
+reloop_andstop Shift+$
 
-beatloop_4_toggle q
+beatloop_activate q
+beatlooproll_activate Shift+q
 loop_halve w
+beatjump_forward Shift+w
 loop_double e
+beatjump_backward Shift+e
 
 passthrough Ctrl+j
 vinylcontrol_mode Ctrl+Shift+Y
@@ -74,15 +83,16 @@ vinylcontrol_cueing Ctrl+Alt+Y
 
 [Channel2]
 play l
-cue_set Shift+!
+cue_set Shift+l
 cue_default æ
 cue_gotoandstop Shift+Æ
 
-back j
-reverse Shift+j
-fwd k
+beatjump_backward j
+beatjump_1_backward Shift+j
+beatjump_forward k
+beatjump_1_forward Shift+k
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+&
 
 rate_perm_down F5
@@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl y
 filterLowKill n
-flanger 0
 
 hotcue_1_activate m
 hotcue_2_activate ,
@@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+/
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+(
+reloop_toggle 9
+reloop_andstop Shift+)
 
-beatloop_4_toggle u
+beatloop_activate u
+beatlooproll_activate Shift+u
 loop_halve i
+beatjump_forward Shift+i
 loop_double o
+beatjump_backward Shift+o
 
 passthrough Ctrl+k
 vinylcontrol_mode Ctrl+Shift+U
@@ -128,7 +143,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -136,7 +151,15 @@ ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+t
+OptionsMenu_EnableVinyl2 Ctrl+y
+OptionsMenu_EnableVinyl3 Ctrl+u
+OptionsMenu_EnableVinyl4 Ctrl+i
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+<

From 2b23f532cade3bd65fe541ad6c2c1566aa25e443 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 14:05:21 +0100
Subject: [PATCH 18/21] Adapt changes from en_US keyboard mapping for el_GR.
 Needs testing

---
 res/keyboard/el_GR.kbd.cfg | 78 ++++++++++++++++++++++++++------------
 1 file changed, 53 insertions(+), 25 deletions(-)

diff --git a/res/keyboard/el_GR.kbd.cfg b/res/keyboard/el_GR.kbd.cfg
index 71bd7a69aa8..7f0266e46f3 100644
--- a/res/keyboard/el_GR.kbd.cfg
+++ b/res/keyboard/el_GR.kbd.cfg
@@ -13,26 +13,30 @@ crossfader_down_small Shift+Γ
 [Microphone]
 talkover `
 
-[VinylControl]
-Toggle Ctrl+τ
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play δ
 cue_set Shift+Δ
 cue_default φ
 cue_gotoandstop Shift+Φ
 
-back α
-reverse Shift+Α
-fwd σ
+beatjump_backward α
+beatjump_1_backward Shift+Α
+beatjump_forward σ
+beatjump_1_forward Shift+Σ
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift+!
 
 rate_perm_down F1
@@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4
 
 pfl τ
 filterLowKill β
-flanger 5
 
 hotcue_1_activate ζ
 hotcue_2_activate χ
@@ -61,28 +64,39 @@ LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+@
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+#
+reloop_toggle 4
+reloop_andstop Shift+$
 
-beatloop_4_toggle ;
+beatloop_activate ;
+beatlooproll_activate Shift+:
 loop_halve ς
+beatjump_forward Shift+΅
 loop_double ε
+beatjump_backward Shift+Ε
 
 passthrough Ctrl+ξ
-vinylcontrol_mode Ctrl+Shift+υ
-vinylcontrol_cueing Ctrl+Alt+υ
+vinylcontrol_mode Ctrl+Shift+Υ
+vinylcontrol_cueing Ctrl+Alt+Υ
+
+waveform_zoom_up -
+waveform_zoom_down =
+waveform_zoom_set_default Shift++
 
 [Channel2]
 play λ
 cue_set Shift+Λ
-cue_default ´
-cue_gotoandstop Shift+"
+cue_default ΄
+cue_gotoandstop Shift+
 
-back ξ
-reverse Shift+Ξ
-fwd κ
+beatjump_backward ξ
+beatjump_1_backward Shift+Ξ
+beatjump_forward κ
+beatjump_1_forward Shift+Κ
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+^
 
 rate_perm_down F5
@@ -96,7 +110,6 @@ rate_temp_up_small Shift+F8
 
 pfl υ
 filterLowKill ν
-flanger 0
 
 hotcue_1_activate μ
 hotcue_2_activate ,
@@ -111,12 +124,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+&
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+*
+reloop_toggle 9
+reloop_andstop Shift+(
 
-beatloop_4_toggle θ
+beatloop_activate θ
+beatlooproll_activate Shift+Θ
 loop_halve ι
+beatjump_forward Shift+Ι
 loop_double ο
+beatjump_backward Shift+Ο
 
 passthrough Ctrl+κ
 vinylcontrol_mode Ctrl+Shift+Θ
@@ -128,7 +147,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -136,7 +155,16 @@ ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
-OptionsMenu_RecordMix Ctrl+r
+OptionsMenu_EnableVinyl1 Ctrl+τ
+OptionsMenu_EnableVinyl2 Ctrl+υ
+OptionsMenu_EnableVinyl3 Ctrl+θ
+OptionsMenu_EnableVinyl4 Ctrl+ι
+OptionsMenu_RecordMix Ctrl+ρ
+OptionsMenu_ReloadSkin Ctrl+Shift+ρ
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+`
\ No newline at end of file

From 5736425eb26823a4ffd34a8b4944fb2160ccbc93 Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 14:15:57 +0100
Subject: [PATCH 19/21] Adapt changes from en_US keyboard mapping for ru_RU.
 Needs testing

---
 res/keyboard/ru_RU.kbd.cfg | 79 ++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 28 deletions(-)

diff --git a/res/keyboard/ru_RU.kbd.cfg b/res/keyboard/ru_RU.kbd.cfg
index 9c266e73bab..2a11d4149cc 100644
--- a/res/keyboard/ru_RU.kbd.cfg
+++ b/res/keyboard/ru_RU.kbd.cfg
@@ -13,26 +13,30 @@ crossfader_down_small Shift+П
 [Microphone]
 talkover ]
 
-[VinylControl]
-Toggle Ctrl+е
-
 [PreviewDeck1]
 LoadSelectedTrackAndPlay Alt+Return
 start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled 5
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled 0
+
 [Channel1]
 play в
-cue_set Shift+в
+cue_set Shift+В
 cue_default а
-cue_gotoandstop Shift+а
+cue_gotoandstop Shift+А
 
-back ф
-reverse Shift+ф
-fwd ы
+beatjump_backward ф
+beatjump_1_backward Shift+Ф
+beatjump_forward ы
+beatjump_1_forward Shift+Ы
 
-beatsync 1
+sync_enabled 1
 bpm_tap Shift+!
 
 rate_perm_down F1
@@ -46,27 +50,32 @@ rate_temp_up_small Shift+F4
 
 pfl е
 filterLowKill и
-flanger 5
 
 hotcue_1_activate я
 hotcue_2_activate ч
 hotcue_3_activate с
 hotcue_4_activate м
-hotcue_1_clear Shift+я
-hotcue_2_clear Shift+ч
-hotcue_3_clear Shift+с
-hotcue_4_clear Shift+м
+hotcue_1_clear Shift+Я
+hotcue_2_clear Shift+Ч
+hotcue_3_clear Shift+С
+hotcue_4_clear Shift+М
 
 LoadSelectedTrack Shift+Left
 eject Alt+Shift+Left
 
 loop_in 2
+loop_in_goto Shift+"
 loop_out 3
-reloop_exit 4
+loop_out_goto Shift+№
+reloop_toggle 4
+reloop_andstop Shift+%
 
-beatloop_4_toggle й
+beatloop_activate й
+beatlooproll_activate Shift+Й
 loop_halve ц
+beatjump_forward Shift+Ц
 loop_double у
+beatjump_backward Shift+У
 
 passthrough Ctrl+о
 vinylcontrol_mode Ctrl+Shift+Н
@@ -74,15 +83,16 @@ vinylcontrol_cueing Ctrl+Alt+Н
 
 [Channel2]
 play д
-cue_set Shift+д
+cue_set Shift+Д
 cue_default ж
-cue_gotoandstop Shift+ж
+cue_gotoandstop Shift+Ж
 
-back о
-reverse Shift+о
-fwd л
+beatjump_backward о
+beatjump_1_backward Shift+О
+beatjump_forward л
+beatjump_1_forward Shift+Л
 
-beatsync 6
+sync_enabled 6
 bpm_tap Shift+,
 
 rate_perm_down F5
@@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8
 
 pfl н
 filterLowKill т
-flanger 0
 
 hotcue_1_activate ь
 hotcue_2_activate б
@@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
 eject Alt+Shift+Right
 
 loop_in 7
+loop_in_goto Shift+.
 loop_out 8
-reloop_exit 9
+loop_out_goto Shift+;
+reloop_toggle 9
+reloop_andstop Shift+(
 
-beatloop_4_toggle г
+beatloop_activate г
+beatlooproll_activate Shift+Г
 loop_halve ш
+beatjump_forward Shift+Ш
 loop_double щ
+beatjump_backward Shift+Щ
 
 passthrough Ctrl+л
 vinylcontrol_mode Ctrl+Shift+Г
@@ -128,7 +143,7 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
 FileMenu_Quit Ctrl+q
 LibraryMenu_NewPlaylist Ctrl+n
 LibraryMenu_NewCrate Ctrl+Shift+N
-ViewMenu_ShowSamplers Ctrl+1
+ViewMenu_ShowSkinSettings Ctrl+1
 ViewMenu_ShowMicrophone Ctrl+2
 ViewMenu_ShowVinylControl Ctrl+3
 ViewMenu_ShowPreviewDeck Ctrl+4
@@ -136,7 +151,15 @@ ViewMenu_ShowEffects Ctrl+5
 ViewMenu_ShowCoverArt Ctrl+6
 ViewMenu_MaximizeLibrary Space
 OptionsMenu_EnableLiveBroadcasting Ctrl+l
-OptionsMenu_EnableVinyl1 Ctrl+y
-OptionsMenu_EnableVinyl2 Ctrl+u
+OptionsMenu_EnableVinyl1 Ctrl+е
+OptionsMenu_EnableVinyl2 Ctrl+н
+OptionsMenu_EnableVinyl3 Ctrl+г
+OptionsMenu_EnableVinyl4 Ctrl+ш
 OptionsMenu_RecordMix Ctrl+r
+// DEVELOPER MENU
 OptionsMenu_ReloadSkin Ctrl+Shift+R
+OptionsMenu_DeveloperTools Ctrl+Shift+T
+OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
+OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
+DeveloperMenu_EnableDebugger Ctrl+Shift+D
+OptionsMenu_EnableShortcuts Ctrl+]

From 6dddf3e37f9f2f411fec8b4d443e282077fe187c Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 14:19:00 +0100
Subject: [PATCH 20/21] Add missing controls in fr_FR mapping

---
 res/keyboard/fr_FR.kbd.cfg | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/keyboard/fr_FR.kbd.cfg b/res/keyboard/fr_FR.kbd.cfg
index e31e5857b90..f0ff974afb8 100644
--- a/res/keyboard/fr_FR.kbd.cfg
+++ b/res/keyboard/fr_FR.kbd.cfg
@@ -19,6 +19,12 @@ start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled (
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled à
+
 [Channel1]
 play d
 cue_set Shift+d
@@ -30,7 +36,7 @@ beatjump_1_backward Shift+a
 beatjump_forward s
 beatjump_1_forward Shift+s
 
-beatsync &
+sync_enabled &
 bpm_tap Shift+1
 
 rate_perm_down F1

From e2c78b37ba8e311ff6ba92243473584b4c3d80ea Mon Sep 17 00:00:00 2001
From: "S.Brandt" <s.brandt@mixxx.org>
Date: Sun, 23 Dec 2018 14:20:51 +0100
Subject: [PATCH 21/21] Add missing controls in cs_CZ mapping

---
 res/keyboard/cs_CZ.kbd.cfg | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/res/keyboard/cs_CZ.kbd.cfg b/res/keyboard/cs_CZ.kbd.cfg
index 5f139f4fefe..e1e6db26228 100644
--- a/res/keyboard/cs_CZ.kbd.cfg
+++ b/res/keyboard/cs_CZ.kbd.cfg
@@ -19,6 +19,12 @@ start_stop Return
 back Alt+Left
 fwd Alt+Right
 
+[QuickEffectRack1_[Channel1]_Effect1]
+enabled ř
+
+[QuickEffectRack1_[Channel2]_Effect1]
+enabled ž
+
 [Channel1]
 play d
 cue_set Shift+d