 ;;;; `~/.emacs.d/init.el'
 
 
-;;; TODO Install Org-mode, Magit, Ledger-mode and others (maybe restclient)
+;;; TODO Install and configure Org-mode, Magit, Ledger-mode and others (maybe restclient, evil-org, evil-matchit)
 ;;; TODO Set up for programming (e.g. C#, VimL, Perl, Python, C, C++, Clojure, etc.)
 ;;; TODO Sort out package archive priority (https://emacs.stackexchange.com/questions/2969/is-it-possible-to-use-both-melpa-and-melpa-stable-at-the-same-time)
-;;; TODO Move this file to an org-mode file
+;;; TODO Move this file to an org-mode file?
 ;;; TODO Tidy up file & shorten comments
-;;; TODO Set fonts (Consolas on Windows, maybe Source-Code-Pro or Monospace on Linux)
+;;; TODO Set fonts (Consolas on Windows, maybe Source-Code-Pro, Tamsyn or Monospace on Linux)
 ;;; TODO Set location to store backup files
 ;;; TODO Try and set up unlimited undo
 ;;; TODO Set up Vim-like folding (https://github.com/mrkkrp/vimish-fold, https://github.com/alexmurray/evil-vimish-fold)
+;;; FIXME Work in terminal (just in case)
+;;; TODO Get `g$' working correctly (setq evil-move-beyond-eol nil does not work)
+;;; TODO Try to make config work in shell (terminal Emacs)
+;;; TODO Disable escape keymap when evil mode is disabled (may have to ask on /r/emacs [& check if the mapping can be improved])
+;;; TODO Check that evil-leader starts up correctly (`SPC-SPC')
+;;; TODO Improve scrolling in Emacs and Vim?
+;;; TODO Set up additional evil keybindings for different parts of Emacs (e.g. package.el & buffer list)?
+;;; TODO Improve Ivy config (ask on IRC or /r/emacs if there is a package or config to emulate wildmenu in emacs)
+;;; TODO Update Emacs packages
+;;; TODO Improve eshell (add evil ex command `:terminal')
+;;; TODO Set up ctags and/or etags
 
 
 ;; Disable UI elements in GUI Emacs

(set-language-environment "UTF-8")

;; Highlight TODOs, NOTEs, FIXMEs etc. TODO: Hightlight only in comments
;; Space-vim-dark: #d78700 | Old: #d7a3ad
(defun axvr/highlight-todos () ; Source (modified): https://writequit.org/org/
  "Highlight FIXME, TODO and NOTE"
  (font-lock-add-keywords

  (require 'use-package))
(require 'diminish)

;; Evil-Mode Configuration
(use-package evil
  :ensure t
  :init
  (setq evil-want-C-u-scroll t
        evil-want-C-i-jump nil) ; http://stackoverflow.com/questions/22878668/emacs-org-mode-evil-mode-tab-key-not-working
  :config

  (use-package evil-leader
