              (subword-mode nil subword)
              (rainbow-mode nil rainbow-mode))))
 
+;; Adjust frame-wide font size
+(use-package zoom-frm
+  :config
+  (bind-keys ("C-x C-+" . zoom-in/out)
+             ("C-x C--" . zoom-in/out)
+             ("C-x C-=" . zoom-in/out)
+             ("C-x C-0" . zoom-in/out)))
+
 ;; Turn on keyboard shortcut remainder
 (use-package which-key
   :delight
   :config
   (bind-keys ("C-h b" . which-key-show-top-level)))
-
-;; Modern code folding
-(use-package origami
-  :config
-  (bind-keys ("M-0"   . origami-open-all-nodes)
-             ("M-9"   . origami-close-all-nodes)
-             ("C-M-/" . origami-recursively-toggle-node)))
 
 ;; Enhances ido and isearch's fuzzy search
 (use-package flx-ido

(eval-when-compile (require 'use-package))
(require 'bind-key)

;; Unmap extraneous undo-tree mode keys
(assq-delete-all 'undo-tree-mode minor-mode-map-alist)

;; Unbind hide/show mode's ridiculous keybindings
(assq-delete-all 'hs-minor-mode minor-mode-map-alist)

(bind-keys ("M-s f"   . follow-mode)
           ("M-s s"   . align)
           ("M-;"     . comment-dwim-line-or-region)
           ;; Rebind windmove keys
           ("M-s h"   . windmove-left)
           ("M-s l"   . windmove-right)
           ("M-s k"   . windmove-up)
           ("M-s j"   . windmove-down)
           ;; Replace default buffer menu with ibuffer
           ("C-x C-b" . ibuffer)
           ;; Misc
           ("C-x u"   . undo-tree-visualize))

;; Completely unbind annoying abbrev, dabbrev, expand, hippie-expand. These
;; ancient completion commands are just too stupid for this day and age

             ("TAB"   . nil)
             ("<tab>" . nil)
             ("C-c i" . yas-expand)))

;; Modern code folding
(use-package origami
  :config
  ;; Unbind hide/show mode's ridiculous keybindings
  (assq-delete-all 'hs-minor-mode minor-mode-map-alist)
  (bind-keys ("M-0"   . origami-open-all-nodes)
             ("M-9"   . origami-close-all-nodes)
             ("C-M-/" . origami-recursively-toggle-node)))

;; Auto-completion
(use-package company
