diff --git a/pwnagotchi/defaults.yml b/pwnagotchi/defaults.yml
index 8016174..eb389ac 100644
--- a/pwnagotchi/defaults.yml
+++ b/pwnagotchi/defaults.yml
@@ -83,6 +83,12 @@ main:
             enabled: false
             #The IP Address of your phone with Paw Server running, default (option is empty) is 192.168.44.1
             ip: ''
+        gpio_buttons:
+            enabled: false
+            #The following is a list of the GPIO number for your button, and the command you want to run when it is pressed
+            gpios:
+            - 20: 'sudo touch /root/.pwnagotchi-auto && sudo systemctl restart pwnagotchi'
+            - 21: 'shutdown -h now'
     # monitor interface to use
     iface: mon0
     # command to run to bring the mon interface up in case it's not up already
diff --git a/pwnagotchi/plugins/default/gpio_buttons.py b/pwnagotchi/plugins/default/gpio_buttons.py
index d9860d1..c0f6ceb 100644
--- a/pwnagotchi/plugins/default/gpio_buttons.py
+++ b/pwnagotchi/plugins/default/gpio_buttons.py
@@ -34,5 +34,5 @@ def on_loaded():
     command = i[gpio]
     GPIOs[gpio] = command
     GPIO.setup(gpio, GPIO.IN, GPIO.PUD_UP)
-    GPIO.add_event_detect(gpio, GPIO.FALLING, callback=runCommand, bouncetime=300)
+    GPIO.add_event_detect(gpio, GPIO.FALLING, callback=runCommand, bouncetime=250)
     logging.info("Added command: %s to GPIO #%d", command, gpio)