Add key handling
Fix text color