diff --git a/changelog b/changelog
index 3b2debc..3fd1402 100644
--- a/changelog
+++ b/changelog
@@ -25,15 +25,21 @@ zpurge (purge an entire zone)
 zcheck (head builder tool to check balancing)
 mob autoroll (standard values set on mob level entry)
 checkload (list where a mob/obj is loaded)
-Auto Toggles (loot, goold, split, sac, assist, map)
+Auto Toggles (loot, gold, split, sac, assist, map, door, key)
 Hidden mob/obj
 mob/obj stacking
 hindex
 helpcheck
 OLC copy and delete options.
-export (QQ's a zone into a tarball)t
+export (QQ's a zone into a tarball)
 Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
+[May 21 2009] - Jamdog
+  Added autoassist, autoloot, autogold, autosplit, autosacrifice and automap commands.
+  Added autodoor toggle and command (autofind next door when opening/closing/unlocking/picking)
+  Added autokey toggle and command (autounlock door when opening, if holding the key)
+  Added prefedit OLC for players to set their toggles and preferences
+  Re-arranged IS_PLAYING define to make it more efficient
 [May 15 2009] - Jamdog
   Fixed variable definition halfway through do_oasis_zedit to allow compilation in MSVC. (thanks Lyceq)
   Crash-Bug-Fix: Added check for attacker and victim in the hit function (thanks Lyceq)
diff --git a/src/interpreter.c b/src/interpreter.c
index b0d86d0..adef8dc 100644
--- a/src/interpreter.c
+++ b/src/interpreter.c
@@ -36,6 +36,7 @@
 #include "modify.h" /* for do_skillset... */
 #include "quest.h"
 #include "asciimap.h"
+#include "prefedit.h"
 
 /* local (file scope) functions */
 static int perform_dupe_check(struct descriptor_data *d);
@@ -228,6 +229,7 @@ cpp_extern const struct command_info cmd_info[] = {
   { "policy"   , "pol"     , POS_DEAD    , do_gen_ps   , 0, SCMD_POLICIES },
   { "pour"     , "pour"    , POS_STANDING, do_pour     , 0, SCMD_POUR },
   { "prompt"   , "pro"     , POS_DEAD    , do_display  , 0, 0 },
+  { "prefedit" , "pre"     , POS_DEAD    , do_oasis_prefedit , 0, 0 },
   { "purge"    , "purge"   , POS_DEAD    , do_purge    , LVL_BUILDER, 0 },
 
   { "qedit"    , "qedit"   , POS_DEAD    , do_oasis_qedit, LVL_BUILDER, 0 },
@@ -1219,6 +1221,7 @@ void nanny(struct descriptor_data *d, char *arg)
     { CON_AEDIT, aedit_parse },
     { CON_HEDIT, hedit_parse },
     { CON_QEDIT, qedit_parse },
+    { CON_PREFEDIT, prefedit_parse },
     { -1, NULL }
   };
 
diff --git a/src/oasis.c b/src/oasis.c
index 52d11e8..bb387a9 100644
--- a/src/oasis.c
+++ b/src/oasis.c
@@ -186,6 +186,16 @@ void cleanup_olc(struct descriptor_data *d, byte cleanup_type)
      free_trigger(OLC_TRIG(d));
      OLC_TRIG(d) = NULL;
    }
+
+   /* Free this one regardless. If we've left olc, we've either copied the    *
+    * preferences to the player, or we lost connection. Either way, we need   *
+    * to get rid of this. */
+   if(OLC_PREFS(d)) {
+     /*. There is nothing else really to free, except this... .*/
+     free(OLC_PREFS(d));
+     OLC_PREFS(d) = NULL;
+   }
+
    /* OLC_SCRIPT is always set as trig_proto of OLC_OBJ/MOB/ROOM. Therefore it
     * should not be free'd here. */
 
diff --git a/src/oasis.h b/src/oasis.h
index 42c4a14..94a054a 100644
--- a/src/oasis.h
+++ b/src/oasis.h
@@ -95,6 +95,7 @@ struct oasis_olc_data {
   struct extra_descr_data *desc; /* used in '[r|o|m]edit'    */
   struct social_messg *action;   /* Aedit uses this one      */
   struct trig_data *trig;
+  struct prefs_data *prefs;      /* used for 'prefedit'      */
   int script_mode;
   int trigger_position;
   int item_type;
@@ -125,7 +126,7 @@ extern const char *nrm, *grn, *cyn, *yel;
 
 #define OLC_ACTION(d)  (OLC(d)->action)   /**< Action structure     */
 #define OLC_HELP(d)    (OLC(d)->help)     /**< Hedit structure      */
-
+#define OLC_PREFS(d)   (OLC(d)->prefs)    /**< Preferences structure */
 /* Other macros. */
 #define OLC_EXIT(d)		(OLC_ROOM(d)->dir_option[OLC_VAL(d)])
 
diff --git a/src/prefedit.c b/src/prefedit.c
new file mode 100755
index 0000000..5fb1ae7
--- /dev/null
+++ b/src/prefedit.c
@@ -0,0 +1,919 @@
+/**************************************************************************
+*  File: prefedit.c                                        Part of tbaMUD *
+*  Usage: Player-level OLC for setting preferences and toggles            *
+*                                                                         *
+*  Created by Jamdog for tbaMUD 3.59                                      *
+*  All rights reserved.  See license for complete information.            *
+*                                                                         *
+*  Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University *
+*  CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991.               *
+**************************************************************************/
+
+#include "conf.h"
+#include "sysdep.h"
+#include "structs.h"
+#include "comm.h"
+#include "utils.h"
+#include "handler.h"
+#include "interpreter.h"
+#include "db.h"
+#include "oasis.h"
+#include "prefedit.h"
+#include "screen.h"
+
+/* Internal (static) functions */
+static void prefedit_setup(struct descriptor_data *d, struct char_data *vict);
+static void prefedit_save_to_char(struct descriptor_data *d);
+static void prefedit_disp_main_menu(struct descriptor_data *d);
+static void prefedit_disp_toggle_menu(struct descriptor_data *d);
+static void prefedit_disp_prompt_menu(struct descriptor_data *d);
+static void prefedit_disp_color_menu(struct descriptor_data *d);
+static void prefedit_disp_syslog_menu(struct descriptor_data *d);
+
+/* Note: there is no setup_new, as you can ONLY edit an existing player */
+/*       vict is normally = d->character, except when imps edit players */
+static void prefedit_setup(struct descriptor_data *d, struct char_data *vict)
+{
+  int i;
+  struct prefs_data *toggles;
+
+  if (!vict) vict = d->character;
+
+  /*. Build a copy of the player's toggles .*/
+  CREATE (toggles, struct prefs_data, 1);
+
+  /* no strings to allocate space for */
+  for (i=0; i<PR_ARRAY_MAX; i++)
+    toggles->pref_flags[i] = PRF_FLAGS(vict)[i];
+
+  toggles->wimp_level   = GET_WIMP_LEV(vict);
+  toggles->page_length  = GET_PAGE_LENGTH(vict);
+  toggles->screen_width = GET_SCREEN_WIDTH(vict);
+
+  toggles->ch = vict;
+
+  /*. Attach toggles copy to editors descriptor .*/
+  OLC_PREFS(d) = toggles;
+  OLC_VAL(d) = 0;
+  prefedit_disp_main_menu(d);
+}
+
+static void prefedit_save_to_char(struct descriptor_data *d)
+{
+  int i;
+  struct char_data *vict;
+
+  vict = PREFEDIT_GET_CHAR;
+
+  if (vict && vict->desc && IS_PLAYING(vict->desc))
+  {
+    for (i=0; i<PR_ARRAY_MAX; i++)
+      PRF_FLAGS(vict)[i]  = OLC_PREFS(d)->pref_flags[i];
+
+    GET_WIMP_LEV(vict)     = OLC_PREFS(d)->wimp_level;
+    GET_PAGE_LENGTH(vict)  = OLC_PREFS(d)->page_length;
+    GET_SCREEN_WIDTH(vict) = OLC_PREFS(d)->screen_width;
+
+    save_char(vict);
+  }
+  else
+  {
+	if (!vict) {
+	  mudlog(BRF, LVL_BUILDER, TRUE, "SYSERR: Unable to save toggles (no vict)");
+	  send_to_char(d->character, "Unable to save toggles (no vict)");
+    } else if (!vict->desc) {
+	  mudlog(BRF, LVL_BUILDER, TRUE, "SYSERR: Unable to save toggles (no vict descriptor)");
+	  send_to_char(d->character, "Unable to save toggles (no vict descriptor)");
+	} else if (!IS_PLAYING(vict->desc)) {
+	  mudlog(BRF, LVL_BUILDER, TRUE, "SYSERR: Unable to save toggles (vict not playing)");
+	  send_to_char(d->character, "Unable to save toggles (vict not playing)");
+	} else {
+	  mudlog(BRF, LVL_BUILDER, TRUE, "SYSERR: Unable to save toggles (unknown reason)");
+	  send_to_char(d->character, "Unable to save toggles (unknown reason)");
+    }
+  }
+}
+
+static void prefedit_disp_main_menu(struct descriptor_data *d)
+{
+  struct char_data *vict;
+  char prompt_string[10], color_string[10], syslog_string[10];
+  const char *multi_types[] = { "Off", "Brief", "Normal", "Complete", "\n" };
+
+  /* Set up the required variables and strings */
+  vict = PREFEDIT_GET_CHAR;
+
+  sprintf(prompt_string, "%s%s%s", PREFEDIT_FLAGGED(PRF_DISPHP) ? "H" : "",   PREFEDIT_FLAGGED(PRF_DISPMANA) ? "M" : "",
+                                   PREFEDIT_FLAGGED(PRF_DISPMOVE) ? "V" : "" );
+
+  sprintf(color_string, "%s", multi_types[(PREFEDIT_FLAGGED(PRF_COLOR_1) ? 1 : 0) + (PREFEDIT_FLAGGED(PRF_COLOR_2) ? 2 : 0)]);
+
+  send_to_char(d->character, "\r\n%sPreferences for %s%s\r\n",
+                              CCYEL(d->character, C_NRM),
+                              GET_NAME(vict),
+                              CCNRM(d->character, C_NRM) );
+
+
+  /* The mortal preferences section of the actual menu */
+  send_to_char(d->character, "\r\n"
+                             "%sPreferences\r\n"
+                             "%sP%s) Prompt : %s[%s%-3s%s]         %sL%s) Pagelength : %s[%s%-3d%s]\r\n"
+                             "%sC%s) Color  : %s[%s%-8s%s]    %sS%s) Screenwidth: %s[%s%-3d%s]\r\n"
+                             "%sW%s) Wimpy  : %s[%s%-4d%s]%s\r\n",
+             CCWHT(d->character, C_NRM),
+/* Line 1 - prompt and pagelength */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM),
+             prompt_string, CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+             CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM), PREFEDIT_GET_PAGELENGTH, CCCYN(d->character, C_NRM),
+/* Line 2 - color and screenwidth */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM),
+             color_string, CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+             CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM), PREFEDIT_GET_SCREENWIDTH, CCCYN(d->character, C_NRM),
+/* Line 2 - wimpy                 */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM),
+             PREFEDIT_GET_WIMP_LEV, CCCYN(d->character, C_NRM), CCNRM(d->character, C_NRM)
+             );
+
+  send_to_char(d->character, "%sT%s) Toggle Preferences...\r\n",
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM) );
+
+  /* Imm Prefs */
+  if (GET_LEVEL(PREFEDIT_GET_CHAR) >= LVL_IMMORT)
+  {
+    sprintf(syslog_string, "%s", multi_types[((PREFEDIT_FLAGGED(PRF_LOG1) ? 1 : 0)+ (PREFEDIT_FLAGGED(PRF_LOG2) ? 2 : 0))] );
+
+    send_to_char(d->character, "\r\n"
+                               "%sImmortal Preferences\r\n"
+                               "%s1%s) Syslog Level %s[%s%8s%s]   %s4%s) ClsOLC    %s[%s%3s%s]\r\n"
+                               "%s2%s) Show Flags   %s[%s%3s%s]        %s5%s) No WizNet %s[%s%3s%s]\r\n"
+                               "%s3%s) No Hassle    %s[%s%3s%s]        %s6%s) Holylight %s[%s%3s%s]\r\n",
+             CBWHT(d->character, C_NRM),
+/* Line 1 - syslog and clsolc */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM),
+             syslog_string, CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+             CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM), ONOFF(PREFEDIT_FLAGGED(PRF_CLS)), CCCYN(d->character, C_NRM),
+/* Line 2 - show vnums and nowiz */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_SHOWVNUMS)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+             CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM), ONOFF(PREFEDIT_FLAGGED(PRF_NOWIZ)), CCCYN(d->character, C_NRM),
+/* Line 3 - nohassle and holylight */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_NOHASSLE)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+             CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM), ONOFF(PREFEDIT_FLAGGED(PRF_HOLYLIGHT)), CCCYN(d->character, C_NRM)
+             );
+  }
+
+/* Finishing Off */
+  send_to_char(d->character, "\r\n"
+                             "%sD%s) Restore all default values\r\n"
+                             "%sQ%s) Quit\r\n"
+                             "\r\n",
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM)
+             );
+
+
+  /* Bottom of the menu */
+
+  OLC_MODE(d) = PREFEDIT_MAIN_MENU;
+}
+
+static void prefedit_disp_toggles_menu(struct descriptor_data *d)
+{
+  struct char_data *vict;
+
+  /* Set up the required variables and strings */
+  vict = OLC_PREFS(d)->ch;
+
+  /* Top of the menu */
+  send_to_char(d->character, "Toggle preferences for %s%-20s\r\n",
+             CBGRN(d->character, C_NRM), GET_NAME(vict));
+
+  send_to_char(d->character, "\r\n"
+                             "%sAuto-flags                 Channels\r\n",
+             CBWHT(d->character, C_NRM));
+
+  /* The top section of the actual menu */
+  send_to_char(d->character, "%s1%s) Autoexits    %s[%s%3s%s]      %sA%s) Gossip   %s[%s%3s%s]\r\n"
+                             "%s2%s) Autoloot     %s[%s%3s%s]      %sB%s) Shout    %s[%s%3s%s]\r\n"
+                             "%s3%s) Autogold     %s[%s%3s%s]      %sC%s) Tell     %s[%s%3s%s]\r\n"
+                             "%s4%s) Autosac      %s[%s%3s%s]      %sD%s) Auction  %s[%s%3s%s]\r\n"
+                             "%s5%s) Autoassist   %s[%s%3s%s]      %sE%s) Gratz    %s[%s%3s%s]\r\n"
+                             "%s6%s) Autosplit    %s[%s%3s%s]\r\n",
+/* Line 1 - autoexits and gossip */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOEXIT) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_AUTOEXIT)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM),
+             PREFEDIT_FLAGGED(PRF_NOGOSS) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOGOSS)), CCCYN(d->character, C_NRM),
+/* Line 2 - autoloot and shout */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOLOOT) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_AUTOLOOT)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM),
+             PREFEDIT_FLAGGED(PRF_NOSHOUT) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOSHOUT)), CCCYN(d->character, C_NRM),
+/* Line 3 - autogold and tell */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOGOLD) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_AUTOGOLD)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM),
+             PREFEDIT_FLAGGED(PRF_NOTELL) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOTELL)), CCCYN(d->character, C_NRM),
+/* Line 4 - autosac and auction */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOSAC) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_AUTOSAC)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM),
+             PREFEDIT_FLAGGED(PRF_NOAUCT) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOAUCT)), CCCYN(d->character, C_NRM),
+/* Line 5 - autoassist and grats */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOASSIST) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_AUTOASSIST)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM),
+             PREFEDIT_FLAGGED(PRF_NOGRATZ) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOGRATZ)), CCCYN(d->character, C_NRM),
+/* Line 6 - autosplit */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOSPLIT) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_AUTOSPLIT)), CCCYN(d->character, C_NRM)
+             );
+
+  send_to_char(d->character, "%s7%s) Automap      %s[%s%3s%s]\r\n"
+                             "%s8%s) Autokey      %s[%s%3s%s]\r\n"
+                             "%s9%s) Autodoor     %s[%s%3s%s]\r\n",
+/* Line 7 - automap */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOMAP) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_AUTOMAP)), CCCYN(d->character, C_NRM),
+/* Line 8 - autokey */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOKEY) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_AUTOKEY)), CCCYN(d->character, C_NRM),
+/* Line 9 - autodoor */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTODOOR) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_AUTODOOR)), CCCYN(d->character, C_NRM)
+             );
+
+  /* The bottom section of the toggles menu */
+  send_to_char(d->character, "\r\n"
+                             "%sOther Flags\r\n"
+                             "%sF%s) No Summon    %s[%s%3s%s]      %sH%s) Brief    %s[%s%3s%s]\r\n"
+                             "%sG%s) No Repeat    %s[%s%3s%s]      %sI%s) Compact  %s[%s%3s%s]\r\n",
+             CBWHT(d->character, C_NRM),
+/* Line 10 - nosummon and brief */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM),
+             ONOFF(!PREFEDIT_FLAGGED(PRF_SUMMONABLE)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+             CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM), ONOFF(PREFEDIT_FLAGGED(PRF_BRIEF)), CCCYN(d->character, C_NRM),
+/* Line 11 - norepeat and compact */
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM),
+             ONOFF(PREFEDIT_FLAGGED(PRF_NOREPEAT)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+             CCCYN(d->character, C_NRM), CCYEL(d->character, C_NRM), ONOFF(PREFEDIT_FLAGGED(PRF_COMPACT)), CCCYN(d->character, C_NRM)
+             );
+
+/* Finishing Off */
+  send_to_char(d->character, "%sQ%s) Quit toggle preferences...\r\n",
+             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM) );
+
+  OLC_MODE(d) = PREFEDIT_TOGGLE_MENU;
+}
+
+static void prefedit_disp_prompt_menu(struct descriptor_data *d)
+{
+  char prompt_string[6];
+
+  if (PREFEDIT_FLAGGED(PRF_DISPAUTO))
+    sprintf(prompt_string, "<Auto>");
+  else
+    sprintf(prompt_string, "%s%s%s", PREFEDIT_FLAGGED(PRF_DISPHP) ? "H" : "",   PREFEDIT_FLAGGED(PRF_DISPMANA) ? "M" : "",
+                                     PREFEDIT_FLAGGED(PRF_DISPMOVE) ? "V" : "");
+
+  send_to_char(d->character, "%sPrompt Settings\r\n"
+                             "%s1%s) Toggle HP\r\n"
+                             "%s2%s) Toggle Mana\r\n"
+                             "%s3%s) Toggle Moves\r\n"
+                             "%s4%s) Toggle auto flag\r\n\r\n"
+                             "%sCurrent Prompt: %s%s%s\r\n\r\n"
+                             "%s0%s) Quit (to main menu)\r\n",
+                             CBWHT(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), prompt_string, CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM) );
+
+  send_to_char(d->character, "Enter Choice :");
+  OLC_MODE(d) = PREFEDIT_PROMPT;
+}
+
+static void prefedit_disp_color_menu(struct descriptor_data *d)
+{
+  send_to_char(d->character, "%sColor level\r\n"
+                             "%s1%s) Off      %s(do not display any color - monochrome)%s\r\n"
+                             "%s2%s) Brief    %s(show minimal color where necessary)%s\r\n"
+                             "%s3%s) Normal   %s(show game-enhancing color)%s\r\n"
+                             "%s4%s) On       %s(show all colors whenever possible)%s\r\n",
+                             CBWHT(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCYEL(d->character, C_NRM), CCNRM(d->character, C_NRM) );
+
+  send_to_char(d->character, "Enter Choice :");
+  OLC_MODE(d) = PREFEDIT_COLOR;
+}
+
+static void prefedit_disp_syslog_menu(struct descriptor_data *d)
+{
+  send_to_char(d->character, "%sSyslog level\r\n"
+                             "%s1%s) Off      %s(do not display any logs or error messages)%s\r\n"
+                             "%s2%s) Brief    %s(show only important warnings or errors)%s\r\n"
+                             "%s3%s) Normal   %s(show all warnings and errors)%s\r\n"
+                             "%s4%s) Complete %s(show all logged information for your level)%s\r\n",
+                             CBWHT(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCYEL(d->character, C_NRM), CCNRM(d->character, C_NRM),
+                             CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCYEL(d->character, C_NRM), CCNRM(d->character, C_NRM) );
+
+  send_to_char(d->character, "Enter Choice :");
+  OLC_MODE(d) = PREFEDIT_SYSLOG;
+}
+
+void prefedit_parse(struct descriptor_data * d, char *arg)
+{
+  int number;
+
+  switch (OLC_MODE(d)) {
+  case PREFEDIT_CONFIRM_SAVE:
+    switch (*arg) {
+    case 'y':
+    case 'Y':
+      prefedit_save_to_char(d);
+      mudlog(CMP, LVL_BUILDER, TRUE, "OLC: %s edits toggles for %s", GET_NAME(d->character), GET_NAME(OLC_PREFS(d)->ch));
+      /*. No strings to save - cleanup all .*/
+      cleanup_olc(d, CLEANUP_ALL);
+      break;
+    case 'n':
+    case 'N':
+      /* don't save to char, just free everything up */
+      cleanup_olc(d, CLEANUP_ALL);
+      break;
+    default:
+      send_to_char(d->character, "Invalid choice!\r\n");
+      send_to_char(d->character, "Do you wish to save these toggle settings? : ");
+      break;
+    }
+    return;
+
+  case PREFEDIT_MAIN_MENU:
+    switch (*arg) {
+    case 'q':
+    case 'Q':
+      if (OLC_VAL(d))
+      { /*. Something has been modified .*/
+        send_to_char(d->character, "Do you wish to save these toggle settings? : ");
+        OLC_MODE(d) = PREFEDIT_CONFIRM_SAVE;
+      } else
+        cleanup_olc(d, CLEANUP_ALL);
+      return;
+
+    case 'p':
+    case 'P':
+      prefedit_disp_prompt_menu(d);
+      return;
+
+    case 'c':
+    case 'C':
+      prefedit_disp_color_menu(d);
+      return;
+
+    case 'l':
+    case 'L':
+      send_to_char(d->character, "Enter number of lines per page (10-60): ");
+      OLC_MODE(d) = PREFEDIT_PAGELENGTH;
+      return;
+
+    case 's':
+    case 'S':
+      send_to_char(d->character, "Enter number of columns per page (40-120): ");
+      OLC_MODE(d) = PREFEDIT_SCREENWIDTH;
+      return;
+
+    case 'w':
+    case 'W':
+      send_to_char(d->character, "Enter HP at which to flee (0-%d): ", MIN(GET_MAX_HIT(d->character)/2, 500));
+      OLC_MODE(d) = PREFEDIT_WIMPY;
+      return;
+
+    case 't':
+    case 'T':
+      prefedit_disp_toggles_menu(d);
+      return;
+
+    case 'd':
+    case 'D':
+      prefedit_Restore_Defaults(d);
+      break;
+
+    /* Below this point are Imm-only toggles */
+    case '1':
+      if (GET_LEVEL(PREFEDIT_GET_CHAR) < LVL_IMMORT)
+      {
+        send_to_char(d->character, "%sInvalid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+        prefedit_disp_main_menu(d);
+      }
+      else
+      {
+        prefedit_disp_syslog_menu(d);
+        return;
+      }
+      break;
+
+    case '2':
+      if (GET_LEVEL(PREFEDIT_GET_CHAR) < LVL_IMMORT)
+      {
+        send_to_char(d->character, "%sInvalid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+        prefedit_disp_main_menu(d);
+      }
+      else
+      {
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_SHOWVNUMS);
+      }
+      break;
+
+    case '3':
+      if (GET_LEVEL(PREFEDIT_GET_CHAR) < LVL_IMMORT)
+      {
+        send_to_char(d->character, "%sInvalid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+        prefedit_disp_main_menu(d);
+      }
+      else
+      {
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOHASSLE);
+      }
+      break;
+
+    case '4':
+      if (GET_LEVEL(PREFEDIT_GET_CHAR) < LVL_IMMORT)
+      {
+        send_to_char(d->character, "%sInvalid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+        prefedit_disp_main_menu(d);
+      }
+      else
+      {
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_CLS);
+      }
+      break;
+
+    case '5':
+      if (GET_LEVEL(PREFEDIT_GET_CHAR) < LVL_IMMORT)
+      {
+        send_to_char(d->character, "%sInvalid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+        prefedit_disp_main_menu(d);
+      }
+      else
+      {
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOWIZ);
+      }
+      break;
+
+    case '6':
+      if (GET_LEVEL(PREFEDIT_GET_CHAR) < LVL_IMMORT)
+      {
+        send_to_char(d->character, "%sInvalid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+        prefedit_disp_main_menu(d);
+      }
+      else
+      {
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_HOLYLIGHT);
+      }
+      break;
+
+    default:
+        send_to_char(d->character, "%sInvalid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+      prefedit_disp_main_menu(d);
+      break;
+    }
+    break;
+
+  case PREFEDIT_PAGELENGTH:
+    number = atoi(arg);
+    OLC_PREFS(d)->page_length = MAX(10, MIN(number, 60));
+    break;
+
+  case PREFEDIT_SCREENWIDTH:
+    number = atoi(arg);
+    OLC_PREFS(d)->page_length = MAX(40, MIN(number, 120));
+    break;
+
+  case PREFEDIT_WIMPY:
+    number = atoi(arg);
+    OLC_PREFS(d)->wimp_level = MAX(0, MIN(number, 500));
+    break;
+
+  case PREFEDIT_COLOR:
+    number = atoi(arg) - 1;
+    if ((number < 0) || (number > 3)) {
+      send_to_char(d->character, "%sThat's not a valid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+      prefedit_disp_color_menu(d);
+      return;
+    }
+    REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_COLOR_1);
+    REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_COLOR_2);
+    if (number % 2)   SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_COLOR_1);
+    if (number >= 2)  SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_COLOR_2);
+
+    break;
+
+  case PREFEDIT_TOGGLE_MENU:
+    switch (*arg) {
+      case 'q':
+      case 'Q':
+      case 'x' :
+      case 'X' : prefedit_disp_main_menu(d);
+                 return;
+
+      case '1':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOEXIT);
+        break;
+
+      case '2':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOLOOT);
+        break;
+
+      case '3':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOGOLD);
+        break;
+
+      case '4':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOSAC);
+        break;
+
+      case '5':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOASSIST);
+        break;
+
+      case '6':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOSPLIT);
+        break;
+
+      case '7':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOMAP);
+        break;
+
+      case '8':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOKEY);
+        break;
+
+      case '9':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTODOOR);
+        break;
+
+      case 'a':
+      case 'A':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOGOSS);
+        break;
+
+      case 'b':
+      case 'B':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOSHOUT);
+        break;
+
+      case 'c':
+      case 'C':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOTELL);
+        break;
+
+      case 'd':
+      case 'D':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOAUCT);
+        break;
+
+      case 'e':
+      case 'E':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOGRATZ);
+        break;
+
+      case 'f':
+      case 'F':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_SUMMONABLE);
+        break;
+
+      case 'g':
+      case 'G':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOREPEAT);
+        break;
+
+      case 'h':
+      case 'H':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_BRIEF);
+        break;
+
+      case 'i':
+      case 'I':
+        TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_COMPACT);
+        break;
+
+      default  : send_to_char(d->character, "Invalid Choice, try again (Q to Quit to main menu): ");
+                 return;
+    }
+    /* Set the 'value has changed' flag thing */
+    OLC_VAL(d) = 1;
+    prefedit_disp_toggles_menu(d);
+
+    return;
+
+  case PREFEDIT_SYSLOG:
+    number = atoi(arg) - 1;
+    if ((number < 0) || (number > 3)) {
+      send_to_char(d->character, "%sThat's not a valid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+      prefedit_disp_color_menu(d);
+      return;
+    }
+
+    if ((number % 2) == 1) SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_LOG1);
+    else                   REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_LOG1);
+
+    if (number >= 2) SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_LOG2);
+    else             REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_LOG2);
+
+    break;
+
+  /* Sub-menu's and flag toggle menu's */
+  case PREFEDIT_PROMPT:
+    number = atoi(arg);
+    if ((number < 0) || (number > 7)) {
+      send_to_char(d->character, "%sThat's not a valid choice!%s\r\n", CBRED(d->character, C_NRM), CCNRM(d->character, C_NRM));
+      prefedit_disp_prompt_menu(d);
+    } else {
+      if (number == 0)
+        break;
+      else
+      {
+        /* toggle bits */
+        if (number == 1)
+        {
+          if (PREFEDIT_FLAGGED(PRF_DISPHP))
+            REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPHP);
+          else
+            SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPHP);
+        }
+        else if (number == 2)
+        {
+          if (PREFEDIT_FLAGGED(PRF_DISPMANA))
+            REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPMANA);
+          else
+            SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPMANA);
+        }
+        else if (number == 3)
+        {
+          if (PREFEDIT_FLAGGED(PRF_DISPMOVE))
+            REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPMOVE);
+          else
+            SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPMOVE);
+        }
+        else if (number == 4)
+        {
+          if (PREFEDIT_FLAGGED(PRF_DISPAUTO))
+            REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPAUTO);
+          else
+            SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPAUTO);
+        }
+        prefedit_disp_prompt_menu(d);
+      }
+    }
+    return;
+
+  default:
+    /* we should never get here */
+    mudlog(BRF,LVL_BUILDER,TRUE,"SYSERR: Reached default case in parse_prefedit");
+    break;
+  }
+  /*. If we get this far, something has be changed .*/
+  OLC_VAL(d) = 1;
+  prefedit_disp_main_menu(d);
+}
+
+void prefedit_Restore_Defaults(struct descriptor_data *d)
+{
+  /* Let's do toggles one at a time */
+  /* PRF_BRIEF      - Off */
+  if (PREFEDIT_FLAGGED(PRF_BRIEF))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_BRIEF);
+
+  /* PRF_COMPACT    - Off */
+  if (PREFEDIT_FLAGGED(PRF_COMPACT))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_COMPACT);
+
+  /* PRF_NOSHOUT       - Off */
+  if (PREFEDIT_FLAGGED(PRF_NOSHOUT))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOSHOUT);
+
+  /* PRF_NOTELL     - Off */
+  if (PREFEDIT_FLAGGED(PRF_NOTELL))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOTELL);
+
+  /* PRF_DISPHP     - On */
+  if (!PREFEDIT_FLAGGED(PRF_DISPHP))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPHP);
+
+  /* PRF_DISPMANA   - On */
+  if (!PREFEDIT_FLAGGED(PRF_DISPMANA))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPMANA);
+
+  /* PRF_DISPMOVE   - On */
+  if (!PREFEDIT_FLAGGED(PRF_DISPMOVE))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPMOVE);
+
+  /* PRF_AUTOEXIT   - On */
+  if (!PREFEDIT_FLAGGED(PRF_AUTOEXIT))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOEXIT);
+
+  /* PRF_NOHASSLE   - On for Imms */
+  if (!PREFEDIT_FLAGGED(PRF_NOHASSLE) && GET_LEVEL(PREFEDIT_GET_CHAR) > LVL_IMMORT)
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOHASSLE);
+  else
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOHASSLE);
+
+  /* PRF_QUEST      - Off */
+  if (PREFEDIT_FLAGGED(PRF_QUEST))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_QUEST);
+
+  /* PRF_SUMMONABLE - Off */
+  if (PREFEDIT_FLAGGED(PRF_SUMMONABLE))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_SUMMONABLE);
+
+  /* PRF_NOREPEAT   - Off */
+  if (PREFEDIT_FLAGGED(PRF_NOREPEAT))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOREPEAT);
+
+  /* PRF_HOLYLIGHT  - On for Imms */
+  if (!PREFEDIT_FLAGGED(PRF_HOLYLIGHT) && GET_LEVEL(PREFEDIT_GET_CHAR) > LVL_IMMORT)
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_HOLYLIGHT);
+  else
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_HOLYLIGHT);
+
+  /* PRF_COLOR      - On (Complete) */
+  if (!PREFEDIT_FLAGGED(PRF_COLOR_1))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_COLOR_1);
+  if (!PREFEDIT_FLAGGED(PRF_COLOR_2))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_COLOR_2);
+
+  /* PRF_NOWIZ      - Off */
+  if (PREFEDIT_FLAGGED(PRF_NOWIZ))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOWIZ);
+
+  /* PRF_LOG1       - Off */
+  if (PREFEDIT_FLAGGED(PRF_LOG1))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_LOG1);
+
+  /* PRF_LOG2       - Off */
+  if (PREFEDIT_FLAGGED(PRF_LOG2))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_LOG2);
+
+  /* PRF_NOAUCT     - Off */
+  if (PREFEDIT_FLAGGED(PRF_NOAUCT))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOAUCT);
+
+  /* PRF_NOGOSS     - Off */
+  if (PREFEDIT_FLAGGED(PRF_NOGOSS))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOGOSS);
+
+  /* PRF_NOGRATZ    - Off */
+  if (PREFEDIT_FLAGGED(PRF_NOGRATZ))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOGRATZ);
+
+  /* PRF_SHOWVNUMS  - On for Imms */
+  if (!PREFEDIT_FLAGGED(PRF_SHOWVNUMS) && GET_LEVEL(PREFEDIT_GET_CHAR) > LVL_IMMORT)
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_SHOWVNUMS);
+  else
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_SHOWVNUMS);
+
+  /* PRF_DISPAUTO   - Off */
+  if (PREFEDIT_FLAGGED(PRF_DISPAUTO))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_DISPAUTO);
+
+  /* PRF_CLS - Off */
+  if (PREFEDIT_FLAGGED(PRF_CLS))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_CLS);
+
+  /* PRF_AFK - Off */
+  if (PREFEDIT_FLAGGED(PRF_AFK))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AFK);
+
+  /* PRF_AUTOLOOT   - On */
+  if (!PREFEDIT_FLAGGED(PRF_AUTOLOOT))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOLOOT);
+
+  /* PRF_AUTOGOLD   - On */
+  if (!PREFEDIT_FLAGGED(PRF_AUTOGOLD))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOGOLD);
+
+  /* PRF_AUTOSPLIT  - Off */
+  if (PREFEDIT_FLAGGED(PRF_AUTOSPLIT))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOSPLIT);
+
+  /* PRF_AUTOSAC    - Off */
+  if (PREFEDIT_FLAGGED(PRF_AUTOSAC))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOSAC);
+
+  /* PRF_AUTOASSIST - Off */
+  if (PREFEDIT_FLAGGED(PRF_AUTOASSIST))
+     REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOASSIST);
+
+  /* PRF_AUTOMAP    - On */
+  if (PREFEDIT_FLAGGED(PRF_AUTOMAP))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOMAP);
+
+  /* PRF_AUTOKEY    - On */
+  if (PREFEDIT_FLAGGED(PRF_AUTOKEY))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOKEY);
+
+  /* PRF_AUTODOOR   - On */
+  if (PREFEDIT_FLAGGED(PRF_AUTODOOR))
+     SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTODOOR);
+
+  /* Other (non-toggle) options */
+  PREFEDIT_GET_WIMP_LEV   = 0;   /* Wimpy off by default */
+  PREFEDIT_GET_PAGELENGTH = 22;  /* Default telnet screen is 22 lines   */
+  PREFEDIT_GET_SCREENWIDTH = 80; /* Default telnet screen is 80 columns */
+}
+
+ACMD(do_oasis_prefedit)
+{
+  struct descriptor_data *d;
+  struct char_data *vict;
+  char *buf3;
+  char buf1[MAX_STRING_LENGTH];
+  char buf2[MAX_STRING_LENGTH];
+
+  /****************************************************************************/
+  /** Parse any arguments.                                                   **/
+  /****************************************************************************/
+  buf3 = two_arguments(argument, buf1, buf2);
+
+  /****************************************************************************/
+  /** If there aren't any arguments...well...they can only modify their      **/
+  /** own toggles, can't they?                                               **/
+  /****************************************************************************/
+  if (!*buf1) {
+    vict = ch;
+  }
+  else if (GET_LEVEL(ch) >= LVL_IMPL)
+  {
+    if ((vict = get_player_vis(ch, buf1, NULL, FIND_CHAR_WORLD)) == NULL)
+    {
+      send_to_char(ch, "There is no-one here by that name.\r\n");
+      return;
+    }
+  }
+  else
+  {
+      send_to_char(ch, "You can't do that!\r\n");
+      return;
+  }
+
+  if (IS_NPC(vict))
+  {
+      send_to_char(ch, "Don't be ridiculous! Mobs don't have toggles.\r\n");
+      return;
+  }
+
+  /****************************************************************************/
+  /** Check that whatever it is isn't already being edited.                  **/
+  /****************************************************************************/
+  for (d = descriptor_list; d; d = d->next) {
+    if (STATE(d) == CON_PREFEDIT) {
+      if (d->olc && OLC_PREFS(d)->ch == vict) {
+        if (ch == vict)
+          send_to_char(ch, "Your preferences are currently being edited by %s.\r\n", PERS(d->character, ch));
+        else
+          send_to_char(ch, "Their preferences are currently being edited by %s.\r\n", PERS(d->character, ch));
+        return;
+      }
+    }
+  }
+
+  /****************************************************************************/
+  /** Point d to the builder's descriptor (for easier typing later).         **/
+  /****************************************************************************/
+  d = ch->desc;
+
+  /****************************************************************************/
+  /** Give the descriptor an OLC structure.                                  **/
+  /****************************************************************************/
+  if (d->olc) {
+    mudlog(BRF, LVL_IMMORT, TRUE, "SYSERR: do_oasis_prefedit: Player already had olc structure.");
+    free(d->olc);
+  }
+
+  CREATE(d->olc, struct oasis_olc_data, 1);
+
+  OLC_NUM(d) = 0;
+
+  /****************************************************************************/
+  /** If this is a new quest, setup a new quest, otherwise setup the       **/
+  /** existing quest.                                                       **/
+  /****************************************************************************/
+  prefedit_setup(d, vict);
+
+  STATE(d) = CON_PREFEDIT;
+
+  /****************************************************************************/
+  /** Send the OLC message to the players in the same room as the builder.   **/
+  /****************************************************************************/
+  act("$n starts editing toggles.", TRUE, d->character, 0, 0, TO_ROOM);
+  SET_BIT_AR(PLR_FLAGS(ch), PLR_WRITING);
+
+  /****************************************************************************/
+  /** Log the OLC message.                                                   **/
+  /****************************************************************************/
+/* No need - done elsewhere */
+//  mudlog(CMP, LVL_IMMORT, TRUE, "OLC: (prefedit) %s starts editing toggles for %s", GET_NAME(ch), GET_NAME(vict));
+}
+
diff --git a/src/prefedit.h b/src/prefedit.h
new file mode 100755
index 0000000..6eda4d9
--- /dev/null
+++ b/src/prefedit.h
@@ -0,0 +1,60 @@
+/**************************************************************************
+*  File: prefedit.c                                        Part of tbaMUD *
+*  Usage: Player-level OLC for setting preferences and toggles            *
+*                                                                         *
+*  Created by Jamdog for tbaMUD 3.59                                      *
+*  All rights reserved.  See license for complete information.            *
+*                                                                         *
+*  Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University *
+*  CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991.               *
+**************************************************************************/
+
+/* Toggle structure held for OLC purposes */
+struct prefs_data
+{
+  struct char_data *ch;            /* Pointer to char being edited   */
+  int   pref_flags[PR_ARRAY_MAX];  /* Copy of player's pref flags    */
+  int   wimp_level;                /* Copy of player's wimp level    */
+  int   page_length;               /* Copy of player's pagelength    */
+  int   screen_width;              /* Copy of player's screenwidth   */
+};
+
+/* Prefedit utility macros */
+
+/** Get the character being edited */
+#define PREFEDIT_GET_CHAR        (OLC_PREFS(d)->ch ? (OLC_PREFS(d)->ch) : (d->character))
+
+/** Get a pointer to the pref toggles of the character being edited   */
+#define PREFEDIT_GET_FLAGS       OLC_PREFS(d)->pref_flags
+
+/** Get the wimpy level of the character being edited                 */
+#define PREFEDIT_GET_WIMP_LEV    OLC_PREFS(d)->wimp_level
+
+/** Get the page length of the character being edited                 */
+#define PREFEDIT_GET_PAGELENGTH  OLC_PREFS(d)->page_length
+
+/** Get the screen width of the character being edited                */
+#define PREFEDIT_GET_SCREENWIDTH OLC_PREFS(d)->screen_width
+
+/** Get one of the flag array elements for the character being edited */
+#define PREFEDIT_GET_FLAG(i)     OLC_PREFS(d)->pref_flags[(i)]
+
+/** Get the state of a flag (on/off) for the character being edited   */
+#define PREFEDIT_FLAGGED(flag)  IS_SET_AR(PREFEDIT_GET_FLAGS, (flag))
+
+/* Prefedit OLC sub-modes */
+#define PREFEDIT_MAIN_MENU                0
+#define PREFEDIT_PROMPT                   1
+#define PREFEDIT_COLOR                    2
+#define PREFEDIT_PAGELENGTH               3
+#define PREFEDIT_SCREENWIDTH              4
+#define PREFEDIT_WIMPY                    5
+#define PREFEDIT_CONFIRM_SAVE             6
+#define PREFEDIT_SYSLOG                   7
+#define PREFEDIT_TOGGLE_MENU              8
+
+/* External Functions in prefedit.c */
+void prefedit_Restore_Defaults(struct descriptor_data *d);
+void prefedit_parse(struct descriptor_data * d, char *arg);
+ACMD(do_oasis_prefedit);
+
diff --git a/src/structs.h b/src/structs.h
index d2293e8..7c40b4b 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -313,6 +313,11 @@
 #define CON_TRIGEDIT     26 /**< OLC mode - trigger edit              */
 #define CON_HEDIT        27 /**< OLC mode - help edit */
 #define CON_QEDIT        28 /**< OLC mode - quest edit */
+#define CON_PREFEDIT     29 /**< OLC mode - preference edit */
+
+/* OLC States range - used by IS_IN_OLC and IS_PLAYING */
+#define FIRST_OLC_STATE CON_OEDIT     /**< The first CON_ state that is an OLC */
+#define LAST_OLC_STATE  CON_PREFEDIT  /**< The last CON_ state that is an OLC  */
 
 /* Character equipment positions: used as index for char_data.equipment[] */
 /* NOTE: Don't confuse these constants with the ITEM_ bitvectors
diff --git a/src/utils.h b/src/utils.h
index 031e854..b1b7799 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -598,13 +598,11 @@ void char_from_furniture(struct char_data *ch);
 /** Connected state of d. */
 #define STATE(d)	((d)->connected)
 
+/** Defines whether d is using an OLC or not. */
+#define IS_IN_OLC(d)   ((STATE(d) >= FIRST_OLC_STATE) && (STATE(d) <= LAST_OLC_STATE))
+
 /** Defines whether d is playing or not. */
-#define IS_PLAYING(d)   (STATE(d) == CON_TEDIT || STATE(d) == CON_REDIT ||      \
-                        STATE(d) == CON_MEDIT || STATE(d) == CON_OEDIT ||       \
-                        STATE(d) == CON_ZEDIT || STATE(d) == CON_SEDIT ||       \
-                        STATE(d) == CON_CEDIT || STATE(d) == CON_PLAYING ||     \
-                        STATE(d) == CON_TRIGEDIT || STATE(d) == CON_AEDIT ||    \
-                        STATE(d) == CON_HEDIT || STATE(d) == CON_QEDIT)
+#define IS_PLAYING(d)   (IS_IN_OLC(d) || STATE(d) == CON_PLAYING)
 
 /** Defines if it is ok to send a message to ch. */
 #define SENDOK(ch)	(((ch)->desc || SCRIPT_CHECK((ch), MTRIG_ACT)) && \