diff --git a/lib/mammoth/input/keyboard.cpp b/lib/mammoth/input/keyboard.cpp
index 77b4858..bd2d905 100644
--- a/lib/mammoth/input/keyboard.cpp
+++ b/lib/mammoth/input/keyboard.cpp
@@ -157,118 +157,110 @@ Keycode KeyboardListenerBase::ScancodeToKeycode(uint8_t scancode) {
   }
 
   switch (scancode) {
-    case 0x01:
-      return kEsc;
-    case 0x02:
-      return k1;
-    case 0x03:
-      return k2;
     case 0x04:
-      return k3;
-    case 0x05:
-      return k4;
-    case 0x06:
-      return k5;
-    case 0x07:
-      return k6;
-    case 0x08:
-      return k7;
-    case 0x09:
-      return k8;
-    case 0x0A:
-      return k9;
-    case 0x0B:
-      return k0;
-    case 0x0C:
-      return kMinus;
-    case 0x0D:
-      return kEquals;
-    case 0x0E:
-      return kBackspace;
-    case 0x0F:
-      return kTab;
-    case 0x10:
-      return kQ;
-    case 0x11:
-      return kW;
-    case 0x12:
-      return kE;
-    case 0x13:
-      return kR;
-    case 0x14:
-      return kT;
-    case 0x15:
-      return kY;
-    case 0x16:
-      return kU;
-    case 0x17:
-      return kI;
-    case 0x18:
-      return kO;
-    case 0x19:
-      return kP;
-    case 0x1A:
-      return kLBrace;
-    case 0x1B:
-      return kRBrace;
-    case 0x1C:
-      return kEnter;
-    case 0x1D:
-      return kLCtrl;
-    case 0x1E:
       return kA;
-    case 0x1F:
-      return kS;
-    case 0x20:
-      return kD;
-    case 0x21:
-      return kF;
-    case 0x22:
-      return kG;
-    case 0x23:
-      return kH;
-    case 0x24:
-      return kJ;
-    case 0x25:
-      return kK;
-    case 0x26:
-      return kL;
-    case 0x27:
-      return kSemicolon;
-    case 0x28:
-      return kQuote;
-    case 0x29:
-      return kBacktick;
-    case 0x2A:
-      return kLShift;
-    case 0x2B:
-      return kBSlash;
-    case 0x2C:
-      return kZ;
-    case 0x2D:
-      return kX;
-    case 0x2E:
-      return kC;
-    case 0x2F:
-      return kV;
-    case 0x30:
+    case 0x05:
       return kB;
-    case 0x31:
-      return kN;
-    case 0x32:
+    case 0x06:
+      return kC;
+    case 0x07:
+      return kD;
+    case 0x08:
+      return kE;
+    case 0x09:
+      return kF;
+    case 0x0A:
+      return kG;
+    case 0x0B:
+      return kH;
+    case 0x0C:
+      return kI;
+    case 0x0D:
+      return kJ;
+    case 0x0E:
+      return kK;
+    case 0x0F:
+      return kL;
+    case 0x10:
       return kM;
-    case 0x33:
-      return kComma;
-    case 0x34:
-      return kPeriod;
-    case 0x35:
-      return kFSlash;
-    case 0x36:
-      return kRShift;
-    case 0x38:
-      return kLAlt;
-    case 0x39:
+    case 0x11:
+      return kN;
+    case 0x12:
+      return kO;
+    case 0x13:
+      return kP;
+    case 0x14:
+      return kQ;
+    case 0x15:
+      return kR;
+    case 0x16:
+      return kS;
+    case 0x17:
+      return kT;
+    case 0x18:
+      return kU;
+    case 0x19:
+      return kV;
+    case 0x1A:
+      return kW;
+    case 0x1B:
+      return kX;
+    case 0x1C:
+      return kY;
+    case 0x1D:
+      return kZ;
+    case 0x1E:
+      return k1;
+    case 0x1F:
+      return k2;
+    case 0x20:
+      return k3;
+    case 0x21:
+      return k4;
+    case 0x22:
+      return k5;
+    case 0x23:
+      return k6;
+    case 0x24:
+      return k7;
+    case 0x25:
+      return k8;
+    case 0x26:
+      return k9;
+    case 0x27:
+      return k0;
+    case 0x28:
+      return kEnter;
+    case 0x29:
+      return kEsc;
+    case 0x2A:
+      return kBackspace;
+    case 0x2B:
+      return kTab;
+    case 0x2C:
       return kSpace;
+    case 0x2D:
+      return kMinus;
+    case 0x2E:
+      return kEquals;
+    case 0x2F:
+      return kLBrace;
+    case 0x30:
+      return kRBrace;
+    case 0x31:
+      return kBSlash;
+    case 0x33:
+      return kSemicolon;
+    case 0x34:
+      return kQuote;
+    case 0x35:
+      return kBacktick;
+    case 0x36:
+      return kComma;
+    case 0x38:
+      return kPeriod;
+    case 0x39:
+      return kEsc;  // Capslock
   }
 
   dbgln("Unknown scancode {x}", scancode);