diff --git a/.emacs.d/mc-lists.el b/.emacs.d/mc-lists.el
index e631e4f9..661b94ad 100644
--- a/.emacs.d/mc-lists.el
+++ b/.emacs.d/mc-lists.el
@@ -3,7 +3,8 @@
 
 (setq mc/cmds-to-run-for-all
       '(
-        fill-paragraph
+        org-beginning-of-line
+        org-delete-char
         ))
 
 (setq mc/cmds-to-run-once
diff --git a/.emacs.d/modes.el b/.emacs.d/modes.el
index 3ef7b16e..ce4642c0 100644
--- a/.emacs.d/modes.el
+++ b/.emacs.d/modes.el
@@ -566,3 +566,53 @@ properly escaped with double-quotes in case it has spaces."
    (local-set-key (kbd "C-c C-b") 'texinfo-my-menu-update)
    (local-set-key (kbd "C-c C-v") 'texinfo-pdf-view)
    (local-set-key "\C-c\C-t\C-b" 'texinfo-my-compile)))
+
+
+;;==============================================================================
+;; Flex mode
+;;==============================================================================
+
+(require 'derived)
+;(require 'cc-mode)
+
+(define-derived-mode flex-mode c-mode "Flex"
+  "Major mode for editing flex files"
+
+  ;; Try to set the indentation correctly
+  (setq-default c-basic-offset 4)
+  (make-variable-buffer-local 'c-basic-offset)
+
+  (c-set-offset 'knr-argdecl-intro 0)
+  (make-variable-buffer-local 'c-offsets-alist)
+
+  ;; Remove auto and hungry anything
+  (c-toggle-auto-hungry-state -1)
+  (c-toggle-auto-state -1)
+  (c-toggle-hungry-state -1)
+
+  (use-local-map flex-mode-map)
+
+  ;; Get rid of that damn electric-brace which is not useful with flex
+  (define-key flex-mode-map "{"	'self-insert-command)
+  (define-key flex-mode-map "}"	'self-insert-command)
+
+  (define-key flex-mode-map [tab] 'flex-indent-command)
+
+  (setq comment-start "/*"
+	comment-end "*/"
+	)
+  )
+
+(defalias 'flex-indent-command 'c-indent-command)
+
+(provide 'flex-mode)
+
+;;==============================================================================
+;; Org mode
+;;==============================================================================
+
+;; PDFs visited in Org-mode are opened in Evince (and not in the default choice)
+(eval-after-load "org"
+  '(progn
+     ;; Change .pdf association directly within the alist
+     (setcdr (assoc "\\.pdf\\'" org-file-apps) "zathura --fork %s")))
diff --git a/.emacs.d/plugins.el b/.emacs.d/plugins.el
index 947a8761..7400f0bd 100644
--- a/.emacs.d/plugins.el
+++ b/.emacs.d/plugins.el
@@ -161,3 +161,4 @@
       (define-key my-keys-minor-mode-map (kbd "C-c C-n") 'mc/mark-next-word-like-this)
       (define-key my-keys-minor-mode-map (kbd "C-c C-p") 'mc/mark-previous-word-like-this)
       (define-key my-keys-minor-mode-map (kbd "C-c C-l") 'mc/mark-all-like-this-dwim)))
+
diff --git a/.mutt.d/colors.ambrevar b/.mutt.d/colors.ambrevar
index 9306af75..8e0c514b 100644
--- a/.mutt.d/colors.ambrevar
+++ b/.mutt.d/colors.ambrevar
@@ -1,5 +1,5 @@
 # -*- mode:sh -*-
-## Theme kindly inspired from 
+## Theme kindly inspired from
 ## http://nongeekshandbook.blogspot.ie/2009/03/mutt-color-configuration.html
 
 ## Colours for items in the index
@@ -18,9 +18,9 @@ mono index bold ~D
 ## Highlights inside the body of a message.
 
 # URLs
-color body brightgreen black "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*"
+color body brightgreen black "(https?|ftp|news|telnet|finger)://[^ \"\t\r\n]*"
 color body brightgreen black "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
-mono body bold "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*"
+mono body bold "(https?|ftp|news|telnet|finger)://[^ \"\t\r\n]*"
 mono body bold "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
 
 ## Email addresses.
@@ -65,7 +65,7 @@ color quoted7 $my_col_comment black
 ## Default color definitions
 #color hdrdefault white green
 color signature $my_col_comment black
-color indicator black cyan 
+color indicator black cyan
 color attachment $my_col_shadow $my_col_shadow_bg
 color error red black
 color message white black