Add some shortcuts
Update some configurations