Refactoring in zshrc and added caps/ctrl swap