diff --git a/misc/sampleconfigs/gpio_settings.ini.sample b/misc/sampleconfigs/gpio_settings.ini.sample
index 92839ebd9..e14444991 100644
--- a/misc/sampleconfigs/gpio_settings.ini.sample
+++ b/misc/sampleconfigs/gpio_settings.ini.sample
@@ -1,92 +1,121 @@
 [DEFAULT]
 enabled: True
+antibouncehack: False
+
 [VolumeControl]
-enabled: True
+enabled: False
 Type: TwoButtonControl ;or RotaryEncoder
-PinUp: 5
-PinDown: 6
-pull_up: True
+Pin1: 5
+Pin2: 6
+pull_up_down: pull_up
 hold_time: 0.3
-hold_repeat: True
+hold_mode: Repeat
 timeBase: 0.1 ;only for RotaryEncoder
-functionCallDown: functionCallVolD
-functionCallUp: functionCallVolU
+functionCall1: functionCallVolU
+functionCall2: functionCallVolD
 functionCallTwoButtons: functionCallVol0 ;only for TwoButtonControl
 
 [PrevNextControl]
-enabled: True
+enabled: False
 Type: TwoButtonControl
 Pin1: 22
 Pin2: 23
 functionCall1: functionCallPlayerPrev
 functionCall2: functionCallPlayerNext
 functionCallTwoButtons: None
-pull_up: True
+pull_up_down: pull_up
 hold_time: 0.3
-hold_repeat: False
+hold_mode: None
 
 [PlayPause]
-enabled: True
+enabled: False
 Type: Button
 Pin: 27
-pull_up: True
-hold_time: 0.3
+pull_up_down: pull_up
 functionCall: functionCallPlayerPause
 
 [Shutdown]
 enabled: False
 Type:  Button
 Pin: 3
-pull_up: True
+pull_up_down: pull_up
+hold_mode: Postpone
 hold_time: 2
 functionCall: functionCallShutdown
 
+[PauseShutdown]
+enabled: False
+Type:  Button
+Pin: 3
+pull_up_down: pull_up
+hold_time: 2.0
+hold_mode: SecondFunc
+functionCall: functionCallPlayerPause
+functionCall2: functionCallShutdown
+
 [Volume0]
 enabled: False
 Type:  Button
 Pin: 17
-pull_up: True
-hold_time: 0.3
+pull_up_down: pull_up
 functionCall: functionCallVol0
 
 [VolumeUp]
 enabled: False
 Type:  Button
 Pin: 16
-pull_up: True
+pull_up_down: pull_up
 hold_time: 0.3
-hold_repeat: True
+hold_mode: Repeat
 functionCall: functionCallVolU
 
 [VolumeDown]
 enabled: False
 Type:  Button
 Pin: 19
-pull_up: True
+pull_up_down: pull_up
 hold_time: 0.3
-hold_repeat: True
+hold_mode: Repeat
 functionCall: functionCallVolD
 
 [NextSong]
 enabled: False
 Type:  Button
 Pin: 26
-pull_up: True
-hold_time: 0.3
+pull_up_down: pull_up
 functionCall: functionCallPlayerNext
 
 [PrevSong]
 enabled: False
 Type:  Button
 Pin: 20
-pull_up: True
-hold_time: 0.3
+pull_up_down: pull_up
 functionCall: functionCallPlayerPrev
 
+[FastForward]
+enabled: False
+Type:  Button
+Pin: 7
+pull_up_down: pull_up
+functionCall: functionCallPlayerSeekFwd
+
+[Rewind]
+enabled: False
+Type:  Button
+Pin: 8
+pull_up_down: pull_up
+functionCall: functionCallPlayerSeekBack
+
 [Halt]
 enabled: False
 Type:  Button
-Pin: 21
-pull_up: True
-hold_time: 0.3
+Pin: 25
+pull_up_down: pull_up
 functionCall: functionCallPlayerPauseForce
+
+[RFIDDevice]
+enabled: False
+Type: Button
+Pin: 21
+pull_up_down: pull_up
+functionCall: functionCallPlayerStop