diff --git a/languages/coffee-script.el b/languages/coffee-script.el
index 8d0aba2..63a04fc 100644
--- a/languages/coffee-script.el
+++ b/languages/coffee-script.el
@@ -3,6 +3,7 @@
 
 (add-hook 'coffee-mode-hook
           (lambda ()
-            (fci-mode)
+            (flyspell-prog-mode)
             (linum-mode t)
+            (fci-mode)
             (setq tab-width 2)))
diff --git a/languages/cucumber.el b/languages/cucumber.el
index 644c631..c9dae61 100644
--- a/languages/cucumber.el
+++ b/languages/cucumber.el
@@ -2,6 +2,7 @@
 
 (add-hook 'feature-mode-hook
           (lambda ()
-            (fci-mode)
+            (setq whitespace-action (quote (auto-cleanup)))
+            (flyspell-mode)
             (linum-mode t)
-            (setq whitespace-action (quote (auto-cleanup)))))
+            (fci-mode)))
diff --git a/languages/elisp.el b/languages/elisp.el
index 350d324..f44fe7d 100644
--- a/languages/elisp.el
+++ b/languages/elisp.el
@@ -1,7 +1,7 @@
 ;; Lisp Hook
 (add-hook 'emacs-lisp-mode-hook
           (lambda ()
-            (flyspell-prog-mode)
             (setq whitespace-action (quote (auto-cleanup)))
-            (fci-mode)
-            (linum-mode t)))
+            (flyspell-prog-mode)
+            (linum-mode t)
+            (fci-mode)))
diff --git a/languages/erlang.el b/languages/erlang.el
index baa01fb..68b4cf1 100644
--- a/languages/erlang.el
+++ b/languages/erlang.el
@@ -10,4 +10,6 @@
 
 (add-hook 'erland-mode-hook
           (lambda ()
-            (linum-mode t)))
+            (flyspell-prog-mode)
+            (linum-mode t)
+            (fci-mode)))
diff --git a/languages/javascript.el b/languages/javascript.el
index 353e028..8de2110 100644
--- a/languages/javascript.el
+++ b/languages/javascript.el
@@ -1,5 +1,6 @@
 (add-hook 'js-mode-hook
           (lambda ()
-            (fci-mode)
+            (flyspell-prog-mode)
             (linum-mode t)
+            (fci-mode)
             (setq tab-width 2)))
diff --git a/languages/markdown.el b/languages/markdown.el
index 0985e07..e07800d 100644
--- a/languages/markdown.el
+++ b/languages/markdown.el
@@ -7,5 +7,5 @@
             (setq whitespace-action nil)
             (fci-mode)
             (linum-mode t)
-            (flyspell-mode 1)
+            (flyspell-mode)
             (define-key markdown-mode-map (kbd "C-c p") 'markdown-preview)))
diff --git a/languages/php.el b/languages/php.el
index 6b2286d..dd44d8f 100644
--- a/languages/php.el
+++ b/languages/php.el
@@ -1,5 +1,6 @@
 (add-hook 'php-mode-hook
           (lambda ()
             (setq whitespace-action (quote (auto-cleanup)))
-            (fci-mode)
-            (linum-mode t)))
+            (flyspell-prog-mode)
+            (linum-mode t)
+            (fci-mode)))
diff --git a/languages/python.el b/languages/python.el
index 3f91a2e..9fcb77c 100644
--- a/languages/python.el
+++ b/languages/python.el
@@ -1,5 +1,6 @@
 (add-hook 'python-mode-hook
           (lambda ()
-            (fci-mode)
+            (flyspell-prog-mode)
             (linum-mode t)
+            (fci-mode)
             (define-key python-mode-map (kbd "RET") 'newline-and-indent)))
diff --git a/languages/shell-script.el b/languages/shell-script.el
index 69997d3..72af954 100644
--- a/languages/shell-script.el
+++ b/languages/shell-script.el
@@ -1,4 +1,5 @@
 (add-hook 'sh-mode-hook
           (lambda ()
-            (fci-mode)
-            (linum-mode t)))
+            (flyspell-prog-mode)
+            (linum-mode t)
+            (fci-mode)))
diff --git a/languages/yaml.el b/languages/yaml.el
index 08daf3f..036dc65 100644
--- a/languages/yaml.el
+++ b/languages/yaml.el
@@ -4,6 +4,7 @@
 
 (add-hook 'yaml-mode-hook
           '(lambda ()
-             (fci-mode)
+             (flyspell-prog-mode)
              (linum-mode t)
+             (fci-mode)
              (define-key yaml-mode-map (kbd "RET") 'newline-and-indent)))