Index: mythtv/libs/libmythtv/tv_play.cpp
===================================================================
--- mythtv/libs/libmythtv/tv_play.cpp   (revision 16407)
+++ mythtv/libs/libmythtv/tv_play.cpp   (working copy)
@@ -440,11 +440,20 @@
     REG_KEY("TV Playback", "JUMPPREV", "Jump to previously played recording", "");
     REG_KEY("TV Playback", "JUMPREC", "Display menu of recorded programs to jump to", "");
     REG_KEY("TV Playback", "VIEWSCHEDULED", "Display scheduled recording list", "");
-    REG_KEY("TV Playback", "SIGNALMON", "Monitor Signal Quality", "F7");
+    REG_KEY("TV Playback", "SIGNALMON", "Monitor Signal Quality", "");
     REG_KEY("TV Playback", "JUMPTODVDROOTMENU", "Jump to the DVD Root Menu", "");
     REG_KEY("TV Playback", "EXITSHOWNOPROMPTS","Exit Show without any prompts", "");
     REG_KEY("TV Playback", "SCREENSHOT","Save screenshot of current video frame", "");

+    /* Interactive Television keys */
+    REG_KEY("TV Playback", "MENURED",    "Menu Red",    "F2");
+    REG_KEY("TV Playback", "MENUGREEN",  "Menu Green",  "F3");
+    REG_KEY("TV Playback", "MENUYELLOW", "Menu Yellow", "F4");
+    REG_KEY("TV Playback", "MENUBLUE",   "Menu Blue",   "F5");
+    REG_KEY("TV Playback", "TEXTEXIT",   "Menu Exit",   "F6");
+    REG_KEY("TV Playback", "MENUTEXT",   "Menu Text",   "F7");
+    REG_KEY("TV Playback", "MENUEPG",    "Menu EPG",    "F12");
+
     /* Editing keys */
     REG_KEY("TV Editing", "CLEARMAP", "Clear editing cut points", "C,Q,Home");
     REG_KEY("TV Editing", "INVERTMAP", "Invert Begin/End cut points", "I");
@@ -472,14 +481,6 @@
     REG_KEY("Teletext Menu", "TOGGLEBACKGROUND","Toggle Background", "F7");
     REG_KEY("Teletext Menu", "REVEAL",      "Reveal hidden Text",    "F8");

-    /* Interactive Television keys */
-    REG_KEY("ITV Menu", "MENURED",    "Menu Red",    "F2");
-    REG_KEY("ITV Menu", "MENUGREEN",  "Menu Green",  "F3");
-    REG_KEY("ITV Menu", "MENUYELLOW", "Menu Yellow", "F4");
-    REG_KEY("ITV Menu", "MENUBLUE",   "Menu Blue",   "F5");
-    REG_KEY("ITV Menu", "TEXTEXIT",   "Menu Exit",   "F6");
-    REG_KEY("ITV Menu", "MENUTEXT",   "Menu Text",   "F7");
-    REG_KEY("ITV Menu", "MENUEPG",    "Menu EPG",    "F12");
 /*
   keys already used:

Index: mythtv/libs/libmythtv/dbcheck.cpp
===================================================================
--- mythtv/libs/libmythtv/dbcheck.cpp   (revision 16407)
+++ mythtv/libs/libmythtv/dbcheck.cpp   (working copy)
@@ -14,7 +14,7 @@
 #define MINIMUM_DBMS_VERSION 5

 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1212";
+const QString currentDatabaseVersion = "1213";

 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -3561,9 +3561,22 @@
 };

         if (!performActualUpdate(updates, "1212", dbver))
-           return false;
+        return false;
     }

+    if (dbver == "1212")
+    {
+        const QString updates[] = {
+"DELETE FROM keybindings WHERE action LIKE 'MENU%' AND context='TV Playback';"
+"DELETE FROM keybindings WHERE action='TEXTEXIT' AND context='TV Playback';"
+"UPDATE keybindings SET context='TV Playback' WHERE context='ITV Menu';",
+""
+};
+
+        if (!performActualUpdate(updates, "1213", dbver))
+        return false;
+    }
+
 //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22
 //"ALTER TABLE channel DROP COLUMN atscsrcid;" in 0.22
 //"ALTER TABLE recordedmarkup DROP COLUMN offset;" in 0.22