--- /usr/share/pyshared/MythbuntuLircGenerator/core.py_back	2010-02-17 17:01:23.000000000 -0800
+++ /usr/share/pyshared/MythbuntuLircGenerator/core.py	2010-05-10 00:59:48.481218147 -0700
@@ -61,9 +61,9 @@
         "eight":"^8|^eight|^r8|^G8", \
         "nine":"^9|^nine|^r9|^G9", \
         "zero":"^0|^zero|^r0|^G0", \
-        "skip":"^skip", \
-        "replay":"^replay", \
-        "guide":"^guide|^AppLauncher", \
+        "skip":"^skip|^next", \
+        "replay":"^replay|^previous", \
+        "guide":"^guide|^AppLauncher|^directory", \
         "dvd":"^dvd|^dvd_vcd|^powerdvd|^power_dvd", \
         "red":"^red", \
         "green":"^green", \
@@ -71,8 +71,8 @@
         "blue":"^blue", \
         "aspect":"^Zoom" , \
         "fullscreen":"^FullScreen", \
-        "tuner":"^bookmarks", \
-        "delete":"^Hash", \
+        "tuner":"^tuner|^bookmarks", \
+        "delete":"^delete|^Hash", \
         "subtitle":"^subtitle"
     }