diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 3cb56df..d79fbe6 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -7,7 +7,9 @@
 (package-refresh-contents)
 
 (setq my-packages
-      '(go-mode
+      '(fill-column-indicator
+	go-mode
+	gruvbox-theme
 	org
 	org-bullets
 	paper-theme))
@@ -16,7 +18,10 @@
   (unless (package-installed-p pkg)
     (package-install pkg)))
 
+(setq gofmt-command "/home/niclas/bin/goimports")
+
 (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+(add-hook 'before-save-hook 'gofmt-before-save)
 
 (setq custom-file null-device)
 
@@ -30,6 +35,10 @@
 (setq fill-column 80)
 (setq make-backup-files nil)
 
+(require 'fill-column-indicator)
+(setq fci-rule-column 80)
+(setq fci-rule-color "red")
+
 (setq c-default-style "linux")
 
 (defun indent-buffer()