Add shortcut handler and remove the bad fading.