diff --git a/languages/coffee-script.el b/languages/coffee-script.el
index 467ddc5..a067f68 100644
--- a/languages/coffee-script.el
+++ b/languages/coffee-script.el
@@ -1,2 +1,6 @@
 (add-to-list 'auto-mode-alist '("\\.coffee$" . coffee-mode))
 (add-to-list 'auto-mode-alist '("Cakefile" . coffee-mode))
+
+(add-hook 'coffee-mode-hook
+          (lambda ()
+            (fci-mode)))
diff --git a/languages/cucumber.el b/languages/cucumber.el
index 81b2886..2bc5cb6 100644
--- a/languages/cucumber.el
+++ b/languages/cucumber.el
@@ -2,4 +2,5 @@
 
 (add-hook 'feature-mod-hook
           (lambda ()
+            (fci-mode)
             (setq whitespace-action (quote (auto-cleanup)))))
diff --git a/languages/elisp.el b/languages/elisp.el
index 7598702..a3fdd6f 100644
--- a/languages/elisp.el
+++ b/languages/elisp.el
@@ -3,4 +3,4 @@
           (lambda ()
             (flyspell-prog-mode)
             (setq whitespace-action (quote (auto-cleanup)))
-            (column-marker-1 80)))
+            (fci-mode)))
diff --git a/languages/markdown.el b/languages/markdown.el
index c1dbc25..730b84d 100644
--- a/languages/markdown.el
+++ b/languages/markdown.el
@@ -1,8 +1,10 @@
-(add-hook 'markdown-mode-hook
-          (lambda ()
-            (setq whitespace-action nil)
-            (flyspell-mode 1)))
-
 (setq auto-mode-alist (cons '("\\.md" . markdown-mode) auto-mode-alist))
 (setq auto-mode-alist (cons '("\\.mdown" . markdown-mode) auto-mode-alist))
 (setq auto-mode-alist (cons '("\\.markdown" . markdown-mode) auto-mode-alist))
+
+(add-hook 'markdown-mode-hook
+          (lambda ()
+            (setq whitespace-action nil)
+            (fci-mode)
+            (flyspell-mode 1)
+            (define-key markdown-mode-map (kbd "C-c p") 'markdown-preview)))
diff --git a/languages/php.el b/languages/php.el
index 247b54a..33a5647 100644
--- a/languages/php.el
+++ b/languages/php.el
@@ -1,4 +1,4 @@
 (add-hook 'php-mode-hook
           (lambda ()
             (setq whitespace-action (quote (auto-cleanup)))
-            (column-marker-1 80)))
+            (fci-mode)))
diff --git a/languages/ruby.el b/languages/ruby.el
index 3250f74..88a08d9 100644
--- a/languages/ruby.el
+++ b/languages/ruby.el
@@ -25,7 +25,7 @@
             (setq ruby-use-encoding-map nil)
             (setq ruby-electric-expand-delimiters-list (quote (124)))
             (setq whitespace-action (quote (auto-cleanup)))
-            (column-marker-1 80)
+            (fci-mode)
             (define-key ruby-mode-map
               (kbd "RET") 'reindent-then-newline-and-indent)
             (define-key ruby-mode-map
diff --git a/languages/yaml.el b/languages/yaml.el
index d4ac63a..ea318dc 100644
--- a/languages/yaml.el
+++ b/languages/yaml.el
@@ -4,4 +4,5 @@
 
 (add-hook 'yaml-mode-hook
           '(lambda ()
+             (fci-mode)
              (define-key yaml-mode-map (kbd "RET") 'newline-and-indent)))