diff --git a/prelude/prelude-editor.el b/prelude/prelude-editor.el
index 266fd26..18c7432 100644
--- a/prelude/prelude-editor.el
+++ b/prelude/prelude-editor.el
@@ -33,15 +33,26 @@
 ;;; Code:
 
 ;; customize
-(defgroup editor nil
-  "Emacs Prelude Editor enhancements"
-  :group 'prelude)
+(defgroup prelude nil
+  "Emacs Prelude configuration."
+  :prefix "prelude-"
+  :group "convenience")
 
 (defcustom prelude-auto-save t
   "Non-nil values enable Prelude's auto save."
   :type 'boolean
   :group 'prelude)
 
+(defcustom prelude-guru t
+  "Non-nil values enable guru-mode"
+  :type 'boolean
+  :group 'prelude)
+
+(defcustom prelude-whitespace nil
+  "Non-nil values enable Prelude's whitespace visualisation."
+  :type 'boolean
+  :group 'prelude)
+
 ;; Death to the tabs!  However, tabs historically indent to the next
 ;; 8-character offset; specifying anything else will cause *mass*
 ;; confusion, as it will change the appearance of every existing file.