diff --git a/keyboards/draytronics/elise_v2/keyboard.json b/keyboards/draytronics/elise_v2/keyboard.json
index 217f837e197..dfa1c48132f 100644
--- a/keyboards/draytronics/elise_v2/keyboard.json
+++ b/keyboards/draytronics/elise_v2/keyboard.json
@@ -9,8 +9,6 @@
         "device_version": "2.0.0"
     },
     "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
         "led_count": 16,
         "sleep": true,
         "animations": {
@@ -39,6 +37,7 @@
         "rgblight": true
     },
     "qmk": {
+        "tap_keycode_delay": 10,
         "locking": {
             "enabled": true,
             "resync": true
diff --git a/keyboards/draytronics/elise_v2/keymaps/blake_iso/config.h b/keyboards/draytronics/elise_v2/keymaps/blake_iso/config.h
new file mode 100644
index 00000000000..a30e57780a2
--- /dev/null
+++ b/keyboards/draytronics/elise_v2/keymaps/blake_iso/config.h
@@ -0,0 +1,24 @@
+/*Copyright 2021 Blake Drayson / Draytronics
+
+Contact info@draytronics.co.uk
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//KVM Specific tweaks to prevent key repeat on wake from sleep.
+//Please comment out and recompile if you do not wish to use them.
+#pragma once
+
+#define USB_POLLING_INTERVAL_MS 8
+#define USB_SUSPEND_WAKEUP_DELAY 3000
diff --git a/keyboards/draytronics/elise_v2/keymaps/default/config.h b/keyboards/draytronics/elise_v2/keymaps/default/config.h
new file mode 100644
index 00000000000..a30e57780a2
--- /dev/null
+++ b/keyboards/draytronics/elise_v2/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*Copyright 2021 Blake Drayson / Draytronics
+
+Contact info@draytronics.co.uk
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//KVM Specific tweaks to prevent key repeat on wake from sleep.
+//Please comment out and recompile if you do not wish to use them.
+#pragma once
+
+#define USB_POLLING_INTERVAL_MS 8
+#define USB_SUSPEND_WAKEUP_DELAY 3000
diff --git a/keyboards/draytronics/elise_v2/keymaps/default_iso/config.h b/keyboards/draytronics/elise_v2/keymaps/default_iso/config.h
new file mode 100644
index 00000000000..a30e57780a2
--- /dev/null
+++ b/keyboards/draytronics/elise_v2/keymaps/default_iso/config.h
@@ -0,0 +1,24 @@
+/*Copyright 2021 Blake Drayson / Draytronics
+
+Contact info@draytronics.co.uk
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//KVM Specific tweaks to prevent key repeat on wake from sleep.
+//Please comment out and recompile if you do not wish to use them.
+#pragma once
+
+#define USB_POLLING_INTERVAL_MS 8
+#define USB_SUSPEND_WAKEUP_DELAY 3000