diff --git a/emacs.d/wpc/packages/wpc-misc.el b/emacs.d/wpc/packages/wpc-misc.el
index 4edcdcda0..ee80e019a 100644
--- a/emacs.d/wpc/packages/wpc-misc.el
+++ b/emacs.d/wpc/packages/wpc-misc.el
@@ -70,7 +70,7 @@
       create-lockfiles nil)
 
 ;; ensure code wraps at 80 characters by default
-(setq-default fill-column 80)
+(setq-default fill-column wpc/fill-column)
 
 (put 'narrow-to-region 'disabled nil)
 
diff --git a/emacs.d/wpc/packages/wpc-ui.el b/emacs.d/wpc/packages/wpc-ui.el
index 307379495..03899e61b 100644
--- a/emacs.d/wpc/packages/wpc-ui.el
+++ b/emacs.d/wpc/packages/wpc-ui.el
@@ -127,8 +127,11 @@
 ;; highlight lines that are over 100 characters long
 (use-package whitespace
   :config
-  (setq whitespace-line-column 100)
-  (setq whitespace-style '(face lines-tail)))
+  (setq whitespace-line-column wpc/fill-column)
+  (setq whitespace-style '(face lines-tail))
+  (add-hook 'prog-mode-hook #'whitespace-mode))
+
+
 
 ;; disable GUI scrollbars
 (when (display-graphic-p)
diff --git a/emacs.d/wpc/variables.el b/emacs.d/wpc/variables.el
index bd5af2a01..d0bba2615 100644
--- a/emacs.d/wpc/variables.el
+++ b/emacs.d/wpc/variables.el
@@ -18,5 +18,9 @@
     [mouse-5] [down-mouse-5] [drag-mouse-5] [double-mouse-5] [triple-mouse-5])
   "This variable stores all of the mouse-related keybindings that Emacs recognizes.")
 
+(defconst wpc/fill-column
+  80
+  "Variable used to set the defaults for wrapping, highlighting, etc.")
+
 (provide 'variables)
 ;;; variables.el ends here