diff --git a/behaviour.el b/behaviour.el
index 7f88d7d..7e1b4f3 100644
--- a/behaviour.el
+++ b/behaviour.el
@@ -87,27 +87,16 @@
 (delete-selection-mode 1)
 
 ;;;;;;;;;;;;;;;;;;;;;; indentation functions ;;;;;;;;;;;;;;;;;;;;;;
-(defun set-line-99 ()
-  "Set line length to 99 columns."
-  (interactive)
-  (setq column-enforce-column 99)
-  (column-enforce-mode -1)
-  (column-enforce-mode 1))
-
-(defun set-line-80 ()
-  "Set line length to 80 columns."
-  (interactive)
-  (setq column-enforce-column 80)
-  (column-enforce-mode -1)
-  (column-enforce-mode 1))
-
-(defun set-line-120 ()
-  "Set line length to 120 columns."
-  (interactive)
-  (setq column-enforce-column 120)
+
+(defun set-width (columns)
+  "Set line length to X COLUMNS.
+Additional characters after X are highlighted."
+  (interactive "NNumber of columns to use:")
+  (setq column-enforce-column columns)
   (column-enforce-mode -1)
   (column-enforce-mode 1))
 
+;;; TODO: Convert to proper functions
 (defun set-tab-4 ()
   "Set tab length to 4 spaces."
   (interactive)
@@ -173,8 +162,8 @@
 You can disable `clean-buffer-list' by (cancel-timer clean-buffer-list-timer)."
   )
 
-;; run clean-buffer-list every 2 hours
-(setq clean-buffer-list-timer (run-at-time t 7200 'clean-buffer-list))
+;; run clean-buffer-list every 30 minutes
+(setq clean-buffer-list-timer (run-at-time t 1800 'clean-buffer-list))
 
 ;; kill everything, clean-buffer-list is very intelligent at not killing
 ;; unsaved buffer.
diff --git a/functions.el b/functions.el
index 6e5fa08..2039ac3 100644
--- a/functions.el
+++ b/functions.el
@@ -12,4 +12,15 @@
   (interactive "r")
   (align-regexp begin end
                 (rx ":" (group (zero-or-more (syntax whitespace))) ) 1 1))
+
+
+;;;; Functions to update font size
+(defun set-font-size (size)
+  "Set font SIZE to X px."
+  (interactive "NNew font size: ")
+  (set-face-attribute 'default nil :font (format "Hasklig %d" size))
+  (set-face-attribute 'helm-selection nil :font (format "Hasklig %d" size))
+  (set-face-attribute 'helm-header nil :font
+                      (format "Hasklig %d"
+                              (+ size 2))))
 ;;; functions.el ends here
diff --git a/languages.el b/languages.el
index c9e8d0a..5b6d1c5 100644
--- a/languages.el
+++ b/languages.el
@@ -26,7 +26,7 @@
 (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
 
 (add-hook 'ruby-mode-hook 'ruby-mode-config)
-(add-hook 'ruby-mode-hook 'set-line-80)
+(add-hook 'ruby-mode-hook (set-width 80))
 
 ;;; Rust
 (defun rust-mode-config ()
@@ -37,10 +37,10 @@
   (remove-hook 'html-mode-hook 'web-mode-config)
   (remove-hook 'haskell-mode-hook 'haskell-mode-config)
 
-  (set-tab-4))
+  (set-tab-4)
+  (set-width 99))
 
 (add-hook 'rust-mode-hook 'rust-mode-config)
-(add-hook 'rust-mode-hook 'set-line-99)
 (add-hook 'rust-mode-hook 'racer-mode)
 (add-hook 'rust-mode-hook 'flycheck-mode)
 
@@ -58,7 +58,7 @@
   (set-tab-2))
 
 (add-hook 'elixir-mode-hook 'elixir-mode-config)
-(add-hook 'elixir-mode-hook 'set-line-80)
+(add-hook 'elixir-mode-hook (set-width 80))
 (add-hook 'elixir-mode-hook 'alchemist-mode)
 (add-hook 'elixir-mode-hook 'ruby-end-mode)
 
@@ -71,10 +71,10 @@
   (remove-hook 'html-mode-hook 'web-mode-config)
   (remove-hook 'elixir-mode-hook 'elixir-mode-config)
 
-  (set-tab-4))
+  (set-tab-4)
+  (set-width 80))
 
 (add-hook 'haskell-mode-hook 'haskell-mode-config)
-(add-hook 'haskell-mode-hook 'set-line-80)
 (add-hook 'haskell-mode-hook 'flycheck-mode)
 
 ;;; Elisp
@@ -88,10 +88,10 @@
 
   (set-tab-2)
 
-  (flycheck-mode 1))
+  (flycheck-mode 1)
+  (set-width 80))
 
 (add-hook 'emacs-lisp-mode-hook 'elisp-mode-config)
-(add-hook 'emacs-lisp-mode-hook 'set-line-80)
 (add-hook 'emacs-lisp-mode-hook 'flycheck-mode)
 
 ;;;; Other things ;;;;;
@@ -105,11 +105,11 @@
   (remove-hook 'ruby-mode-hook 'ruby-mode-config)
   (remove-hook 'elixir-mode-hook 'elixir-mode-config)
 
-  (flycheck-mode 1))
+  (flycheck-mode 1)
+  (set-width 120))
 
 (add-hook 'html-mode-hook 'web-mode)
 (add-hook 'html-mode-hook 'web-mode-config)
-(add-hook 'html-mode-hook 'set-line-120)
 
 (setq web-mode-markup-indent-offset 2)
 (setq web-mode-code-indent-offset 2)
@@ -118,6 +118,9 @@
 (setq css-indent-offset 2)
 
 ;; Markdown mode
-(add-hook 'markdown-mode-hook 'set-line-80)
+(defun markdown-mode-config ()
+  "Setup markdown mode."
+  (set-width 80))
+(add-hook 'markdown-mode-hook 'markdown-mode-config)
 
 ;;; languages.el ends here
diff --git a/themes.el b/themes.el
index a323bbe..49db9b5 100644
--- a/themes.el
+++ b/themes.el
@@ -1,16 +1,8 @@
 ;;; themes.el -- Summary
 
 ;;; Commentary:
-
-;; (setq airline-helm-colors t)
-;; (setq airline-cursor-colors t)
-;; (setq airline-eshell-colors t)
-
 ;;; Code:
 
-;; Add mode line icons items
-;; (mode-icons-mode)
-
 ;; Use smart-mode-line
 (require 'smart-mode-line)
 (setq sml/no-confirm-load-theme t)