--- a/dbdefs.inc.php	Sat Nov 01 13:41:26 2014 +0200
+++ b/dbdefs.inc.php	Sat Nov 01 16:14:10 2014 +0200
@@ -1,19 +1,20 @@
 <?
 
-$dbVersion = 15;
+$dbVersion = 16;
 
 //
 // Site settings and defaults we put in
 //
 $siteSettingsGroups = array(
   "general"   => array("General", "General settings"),
-  "html"      => array("HTML", "Global HTML blurbs"),
+  "html"      => array("Site HTML", "Global HTML blurbs"),
   "news"      => array("News", "News related settings"),
-  "register"  => array("Register", "Visitor registration"),
-  "event"     => array("Event", "Event related settings"),
+  "register"  => array("Registration", "Visitor registration"),
+  "event"     => array("Event / Schedule", "Event and schedule related settings"),
   "compos"    => array("Compos", "Compo related settings"),
 );
 
+
 $siteDefaultSettings = array(
 
   //
@@ -35,6 +36,8 @@
 
     "showInfoTextOnAbout" => array(VT_BOOL, false, "Show site info HTML on About page"),
 
+    "requireEMail"     => array(VT_BOOL, false, "Require e-mail address in registrations"),
+    "allowRegister"    => array(VT_BOOL, false, "Enable event registration"),
   ),
 
   "html" => array(
@@ -65,7 +68,6 @@
 </div>",
   "About page text"),
 
-
   "voteFinishedText" => array(VT_TEXT, "
 <h1>Yay, you have voted!</h1>
 <p>Now go FAP some more! And make a demo about it.</p>",
@@ -86,8 +88,6 @@
   // Attendee/visitor registration
   //
   "register" => array(
-    "requireEMail"     => array(VT_BOOL, false, "Require e-mail address in registrations"),
-    "allowRegister"    => array(VT_BOOL, false, "Enable event registration"),
     "registerInfoText" => array(VT_TEXT, "<p>
 Only your <b>handle</b> and the answer to the botcheck are strictly required.
 If you plan on joining the IRC channel