diff --git a/Cores/DeltaCore b/Cores/DeltaCore
index 911d36b..a721967 160000
--- a/Cores/DeltaCore
+++ b/Cores/DeltaCore
@@ -1 +1 @@
-Subproject commit 911d36bd01964ad7aeb0b4a37610402fd9845310
+Subproject commit a721967855c44b52557eb9c8799518115ed76483
diff --git a/Delta/Extensions/Input+Display.swift b/Delta/Extensions/Input+Display.swift
index ac80b19..6629abb 100644
--- a/Delta/Extensions/Input+Display.swift
+++ b/Delta/Extensions/Input+Display.swift
@@ -104,6 +104,26 @@ extension Input
             case .rightTrigger: return NSLocalizedString("R2", comment: "")
             }
             
+        case .controller(.keyboard):
+            let input = KeyboardGameController.Input(input: self)!
+            switch input
+            {
+            case .up: return NSLocalizedString("↑", comment: "")
+            case .down: return NSLocalizedString("↓", comment: "")
+            case .left: return NSLocalizedString("←", comment: "")
+            case .right: return NSLocalizedString("→", comment: "")
+            case .escape: return NSLocalizedString("⎋", comment: "")
+            case .shift: return NSLocalizedString("⇧", comment: "")
+            case .command: return NSLocalizedString("⌘", comment: "")
+            case .option: return NSLocalizedString("⌥", comment: "")
+            case .control: return NSLocalizedString("Ctrl", comment: "")
+            case .capsLock: return NSLocalizedString("⇪", comment: "")
+            case .space: return NSLocalizedString("Space", comment: "")
+            case .return: return NSLocalizedString("↩\u{FE0E}", comment: "")
+            case .tab: return NSLocalizedString("⇥", comment: "")
+            default: return input.stringValue.uppercased()
+            }
+            
         default: break
         }
         
diff --git a/Delta/Settings/Controllers/ControllerInputsViewController.swift b/Delta/Settings/Controllers/ControllerInputsViewController.swift
index fcbba3d..6a1a137 100644
--- a/Delta/Settings/Controllers/ControllerInputsViewController.swift
+++ b/Delta/Settings/Controllers/ControllerInputsViewController.swift
@@ -42,6 +42,10 @@ class ControllerInputsViewController: UIViewController
     
     @IBOutlet private var actionsMenuViewControllerHeightConstraint: NSLayoutConstraint!
     @IBOutlet private var cancelTapGestureRecognizer: UITapGestureRecognizer!
+    
+    public override var next: UIResponder? {
+        return KeyboardResponder(nextResponder: super.next)
+    }
         
     override func viewDidLoad()
     {