diff --git a/index.php b/index.php
index ff28d651bd..704d2a2a4f 100755
--- a/index.php
+++ b/index.php
@@ -21,10 +21,10 @@
   include("header.inc.php");
   // Note: I need to add checks to make sure these apps are installed.
 
-  if ($cd=="yes" && $phpgw_info["user"]["preferences"]["default_app"]
-      && $phpgw_info["user"]["apps"][$phpgw_info["user"]["preferences"]["default_app"]]) {
+  if ($cd=="yes" && $phpgw_info["user"]["preferences"]["common"]["default_app"]
+      && $phpgw_info["user"]["apps"][$phpgw_info["user"]["preferences"]["common"]["default_app"]]) {
      Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/"
-							  . $phpgw_info["user"]["preferences"]["default_app"]));
+							  . $phpgw_info["user"]["preferences"]["common"]["default_app"]));
      exit;
   }
   $phpgw->common->phpgw_header();
@@ -70,7 +70,7 @@
   }
 
   if ($phpgw_info["user"]["permissions"]["email"]
-  && $phpgw_info["user"]["preferences"]["mainscreen_showmail"]) {
+  && $phpgw_info["user"]["preferences"]["common"]["mainscreen_showmail"]) {
     echo "<!-- Mailox info -->\n";
 
     $mbox = $phpgw->msg->login();
@@ -92,7 +92,7 @@
   }
 
   if ($phpgw_info["user"]["permissions"]["addressbook"]
-  && $phpgw_info["user"]["preferences"]["mainscreen_showbirthdays"]) {
+  && $phpgw_info["user"]["preferences"]["common"]["mainscreen_showbirthdays"]) {
     echo "<!-- Birthday info -->\n";
     $phpgw->db->query("select DISTINCT firstname,lastname from addressbook where "
       . "bday like '" . $phpgw->common->show_date(time(),"n/d")
@@ -122,7 +122,7 @@
 
   // This is disbaled until I can convert the calendar over
   if ($phpgw_info["user"]["permissions"]["calendar"]
-  && $phpgw_info["user"]["preferences"]["mainscreen_showevents"]) {
+  && $phpgw_info["user"]["preferences"]["common"]["mainscreen_showevents"]) {
     echo "<!-- Calendar info -->\n";
     include($phpgw_info["server"]["server_root"] . "/calendar/inc/functions.inc.php");
     $repeated_events = read_repeated_events($phpgw_info["user"]["userid"]);
diff --git a/preferences/settings.php b/preferences/settings.php
index 533f6a37f9..197204cb21 100755
--- a/preferences/settings.php
+++ b/preferences/settings.php
@@ -37,7 +37,7 @@
          ?>
        </td>
        <td>
-        <input type="checkbox" name="<?php echo $option; ?>" value="True"<?php if ($phpgw_info["user"]["preferences"][$option]) echo " checked"; ?>>
+        <input type="checkbox" name="<?php echo $option; ?>" value="True"<?php if ($phpgw_info["user"]["preferences"]["common"][$option]) echo " checked"; ?>>
        </td>
       </tr>
 <?php
@@ -48,7 +48,7 @@
         <?php echo lang("email signature"); ?>
        </td>
        <td>
-        <textarea name="email_sig" rows="3" cols="30"><?php echo $phpgw_info["user"]["preferences"]["email_sig"]; ?></textarea>
+        <textarea name="email_sig" rows="3" cols="30"><?php echo $phpgw_info["user"]["preferences"]["common"]["email_sig"]; ?></textarea>
        </td>
       </tr>
 <?php
@@ -64,14 +64,14 @@
         <td><?php echo lang("max matchs per page"); ?>: </td>
         <td>
          <input name="maxmatchs" value="<?php
-           echo $phpgw_info["user"]["preferences"]["maxmatchs"]; ?>" size="2">
+           echo $phpgw_info["user"]["preferences"]["common"]["maxmatchs"]; ?>" size="2">
         </td>
        </tr>
        <tr>
         <td><?php echo lang("Show text on navigation icons"); ?>: </td>
         <td>
          <input type="checkbox" name="navbar_text"<?php
-           if ($phpgw_info["user"]["preferences"]["navbar_text"])
+           if ($phpgw_info["user"]["preferences"]["common"]["navbar_text"])
               echo " checked";
            ; ?>>
         </td>
@@ -82,7 +82,7 @@
          <select name="tz_offset"><?php
            for ($i = -23; $i<24; $i++) {
                echo "<option value=\"$i\"";
-               if ($i == $phpgw_info["user"]["preferences"]["tz_offset"])
+               if ($i == $phpgw_info["user"]["preferences"]["common"]["tz_offset"])
                   echo " selected";
                if ($i < 1)
                   echo ">$i</option>\n";
@@ -97,7 +97,7 @@
        <tr>
         <td><?php echo lang("date format"); ?>:</td>
         <td>
-         <?php $df[$phpgw_info["user"]["preferences"]["dateformat"]] = " selected"; ?>
+         <?php $df[$phpgw_info["user"]["preferences"]["common"]["dateformat"]] = " selected"; ?>
          <select name="dateformat">
           <option value="m/d/Y"<?php echo $df["m/d/Y"]; ?>>m/d/y</option>
           <option value="m-d-Y"<?php echo $df["m-d-Y"]; ?>>m-d-y</option>
@@ -120,7 +120,7 @@
        <tr>
         <td><?php echo lang("time format"); ?>:</td>
         <td><?php
-            $timeformat_select[$phpgw_info["user"]["preferences"]["timeformat"]] = " selected";
+            $timeformat_select[$phpgw_info["user"]["preferences"]["common"]["timeformat"]] = " selected";
             echo "<select name=\"timeformat\">"
                . "<option value=\"12\"$timeformat_select[12]>12 Hour</option>"
                . "<option value=\"24\"$timeformat_select[24]>24 Hour</option>"
@@ -131,7 +131,7 @@
        <tr>
          <td><?php echo lang("language"); ?></td>
          <td>
-          <?php $lang_select[$phpgw_info["user"]["preferences"]["lang"]] = " selected"; ?>
+          <?php $lang_select[$phpgw_info["user"]["preferences"]["common"]["lang"]] = " selected"; ?>
           <select name="lang">
            <option value="en"<?php echo $lang_select["en"]; ?>>English</option>
            <option value="de"<?php echo $lang_select["de"]; ?>>Deutsch</option>
@@ -163,7 +163,7 @@
              while ($permission = each($db_perms)) {
                if ($phpgw_info["apps"][$permission[0]]["enabled"]) {
 				  echo "<option value=\"" . $permission[0] . "\"";
-				  if ($phpgw_info["user"]["preferences"]["default_app"] == $permission[0]) {
+				  if ($phpgw_info["user"]["preferences"]["common"]["default_app"] == $permission[0]) {
 					 echo " selected";
                   }
 				  echo ">" . lang($phpgw_info["apps"][$permission[0]]["title"])
@@ -177,7 +177,7 @@
          <tr>
           <td><?php echo lang("Default sorting order"); ?></td>
 	      <td><?php
-                $default_order_display[$phpgw_info["user"]["preferences"]["default_sorting"]] = " selected"; ?>
+                $default_order_display[$phpgw_info["user"]["preferences"]["common"]["default_sorting"]] = " selected"; ?>
                   <select name="default_sorting">
              	   <option value="old_new"<?php echo $default_order_display["old_new"]; ?>>oldest -> newest</option>   
              	   <option value="new_old"<?php echo $default_order_display["new_old"]; ?>>newest -> oldest</option>
@@ -198,7 +198,7 @@
 
  <?php
   } else {
-     $phpgw->common->preferences_delete("notheme",$phpgw_info["user"]["userid"]);
+     $phpgw->common->preferences_delete("byappnotheme",$phpgw_info["user"]["userid"],"common");
 
      // If they don't have permissions to the headlines,
      // we don't need to lock the table.