diff --git a/index.js b/index.js
index 2d6723d..90126f4 100644
--- a/index.js
+++ b/index.js
@@ -12,12 +12,13 @@ let device = vJoyDevice.create(1);
 var midiConfig;
 
 var advancedDebug = false;
+var keysMode = false;
 
 var win;
 
 function createWindow () {
   win = new BrowserWindow({
-    width: 800,
+    width: 900,
     height: 600,
     resizable: true,
     title: "MidiDrumHero",
@@ -78,6 +79,14 @@ ipcMain.on('debugTypeChange', (event, arg) => {
   }
 });
 
+ipcMain.on('inputTypeChange', (event, arg) => {
+  if (arg == true) {
+    keysMode = true;
+  } else if (arg == false) {
+    keysMode = false;
+  }
+});
+
 ipcMain.on('saveDrumPad', (event, arg) => {
   storage.get('config', (error, data) => {
     if (error) throw error;
@@ -151,16 +160,39 @@ input.on('message', (deltaTime, message) => {
   if (advancedDebug == true) {
     win.webContents.send('midiLog', "Status byte: " + message[0].toString(16) + ", Midi Note: " + message[1] + ", Velocity: " + message[2]);
   }
-
-  if (message[0] >= 144 && message[0] <= 159 && message[2] != 0) {
-    if (advancedDebug == false) {
-      win.webContents.send('midiLog', "Midi Note: " + message[1] + ", Velocity: " + message[2]);
+  
+  if (keysMode == false) {
+    if (message[0] >= 144 && message[0] <= 159 && message[2] != 0) {
+      if (advancedDebug == false) {
+        win.webContents.send('midiLog', "Midi Note: " + message[1] + ", Velocity: " + message[2]);
+      }
+      for (var entry of midiConfig) {
+        if ((parseInt(entry["midi"]) == message[1]) && (parseInt(entry["velocity"]) <= message[2])) {
+          vJoySetButton(parseInt(entry["button"]), true);
+          setTimeout(vJoySetButton, 50, parseInt(entry["button"]), false);
+          break;
+        }
+      }
     }
-    for (var entry of midiConfig) {
-      if ((parseInt(entry["midi"]) == message[1]) && (parseInt(entry["velocity"]) <= message[2])) {
-        vJoySetButton(parseInt(entry["button"]), true);
-        setTimeout(vJoySetButton, 50, parseInt(entry["button"]), false);
-        break;
+  } else if (keysMode == true) {
+    if (message[0] >= 128 && message[0] <= 159) {
+      if (advancedDebug == false) {
+        win.webContents.send('midiLog', "Midi Note: " + message[1] + ", Velocity: " + message[2]);
+      }
+      for (var entry of midiConfig) {
+          if (message[0] >= 144 && message[0] <= 159 && message[2] != 0) {
+            if ((parseInt(entry["midi"]) == message[1]) && (parseInt(entry["velocity"]) <= message[2])) {
+              vJoySetButton(parseInt(entry["button"]), true);
+              break;
+            }
+          } else if ((message[0] >= 128 && message[0] <= 143) || (message[0] >= 144 && message[0] <= 159 && message[2] == 0)) {
+            if (parseInt(entry["midi"]) == message[1]) {
+              vJoySetButton(parseInt(entry["button"]), false);
+              break;
+            }
+          }
+          
+        
       }
     }
   }
diff --git a/src/index.html b/src/index.html
index f735266..c594111 100644
--- a/src/index.html
+++ b/src/index.html
@@ -116,6 +116,10 @@ <h1 class="h3 mb-0 text-gray-800">Dashboard</h1>
                 <li><a class='dropdown-item disabled'>No Midi Devices Available</a></li>
               </ul>
             </div>
+            <div class="custom-control custom-switch">
+              <input type="checkbox" class="custom-control-input" id="keysSwitch">
+              <label class="custom-control-label" for="keysSwitch">Keys mode</label>
+            </div>
             <a type="button" data-toggle="modal" data-target="#newDrumPadModal" class="btn btn-primary btn-icon-split btn-sm">
               <span class="icon text-white">
                 <i class="fas fa-plus"></i>
diff --git a/src/index.js b/src/index.js
index 03a4858..52484cb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -87,11 +87,20 @@ function addToDrumPadTable(velocity, button, midi) {
             "<th scope='row'>" + midi + "</th>" +
             "<td>" + velocity + "</td>" +
             "<td>" + button + "</td>" +
-            "<td><button type='button' class='btn btn-danger' onclick='removeDrumPad(this)'>Remove</button></td>" +
+            "<td><button type='button' class='btn btn-danger btn-sm' onclick='removeDrumPad(this)'>Remove</button></td>" +
         "</tr>"
     );
 }
 
+$('#keysSwitch').click(() => {
+    var checkedValue = document.querySelector('#keysSwitch').checked;
+    if (checkedValue == true) {
+        ipcRenderer.send('inputTypeChange', true);
+    } else if (checkedValue == false) {
+        ipcRenderer.send('inputTypeChange', false);
+    }
+});
+
 // Social Media
 $("#github").click(function() {
     shell.openExternal("https://github.com/ejj28/mididrumhero");