;; Files/buffers
(global-set-key (kbd "C-x C-f") 'counsel-find-file)
+(global-set-key (kbd "C-x f") 'counsel-find-file)
(global-set-key (kbd "C-c f") 'counsel-git)
(global-set-key (kbd "C-c g") 'counsel-git-grep)
(global-set-key (kbd "C-x C-k") 'kill-buffers-not-in-frame)
(global-set-key (kbd "<C-right>") 'windmove-right)
;; Movement
-(global-set-key (kbd "C-c c") 'ace-jump-mode)
+(global-set-key (kbd "M-g j") 'ace-jump-mode)
;; Text formatting
(global-set-key (kbd "M-/") 'hippie-expand)