10 files changed, 57 insertions, 0 deletions
diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml
index 4d02b251f7..def24377e8 100644
--- a/system/keymaps/gamepad.xml
+++ b/system/keymaps/gamepad.xml
@@ -347,6 +347,11 @@
       <b>Close</b>
     </gamepad>
   </AddonSettings>
+  <TextViewer>
+    <gamepad>
+      <b>Close</b>
+    </gamepad>
+  </TextViewer>
   <MyPicturesSettings>
     <gamepad>
       <B>PreviousMenu</B>
diff --git a/system/keymaps/joystick.AppleRemote.xml b/system/keymaps/joystick.AppleRemote.xml
index 0218c7d828..c9d74bf2d7 100644
--- a/system/keymaps/joystick.AppleRemote.xml
+++ b/system/keymaps/joystick.AppleRemote.xml
@@ -268,4 +268,9 @@
       <button id="6">Close</button>
     </joystick>
   </AddonSettings>
+  <TextViewer>
+    <joystick name="AppleRemote">
+      <button id="6">Close</button>
+    </joystick>
+  </TextViewer>
 </keymap>
diff --git a/system/keymaps/joystick.Harmony.xml b/system/keymaps/joystick.Harmony.xml
index 3824a077c3..439036463a 100644
--- a/system/keymaps/joystick.Harmony.xml
+++ b/system/keymaps/joystick.Harmony.xml
@@ -488,4 +488,9 @@
       <!-- Prev		-->      <button id="32">Close</button>
     </joystick>
   </AddonSettings>
+  <TextViewer>
+    <joystick name="Harmony">
+      <!-- Prev		-->      <button id="32">Close</button>
+    </joystick>
+  </TextViewer>
 </keymap>
diff --git a/system/keymaps/joystick.Logitech.RumblePad.2.xml b/system/keymaps/joystick.Logitech.RumblePad.2.xml
index 1874a9fb43..32db78695d 100644
--- a/system/keymaps/joystick.Logitech.RumblePad.2.xml
+++ b/system/keymaps/joystick.Logitech.RumblePad.2.xml
@@ -250,4 +250,10 @@
     </joystick>
   </AddonSettings>
 
+  <TextViewer>
+    <joystick name="Logitech Logitech Cordless RumblePad 2">
+      <button id="3">Close</button>
+    </joystick>
+  </TextViewer>
+
 </keymap>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
index 8d3b8eab86..56a8092969 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
@@ -314,6 +314,11 @@
       <button id="2">Close</button>
     </joystick>
   </AddonSettings>
+  <TextViewer>
+    <joystick name="Xbox 360 Wireless Receiver">
+      <button id="2">Close</button>
+    </joystick>
+  </TextViewer>
   <MyPicturesSettings>
     <joystick name="Xbox 360 Wireless Receiver">
       <button id="2">PreviousMenu</button>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
index 743389a1c2..ceac23077e 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
@@ -416,6 +416,14 @@
       <button id="2">Close</button>
     </joystick>
   </AddonSettings>
+  <TextViewer>
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <altname>Microsoft X-Box pad (Japan)</altname> 
+      <button id="2">Close</button>
+    </joystick>
+  </TextViewer>
   <MyPicturesSettings>
     <joystick name="Microsoft Xbox Controller S">
       <altname>Mad Catz MicroCON</altname>
diff --git a/system/keymaps/joystick.PS3.Remote.Keyboard.xml b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
index f15a86c8ff..d3e4a2a99d 100644
--- a/system/keymaps/joystick.PS3.Remote.Keyboard.xml
+++ b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
@@ -186,6 +186,14 @@
     </joystick>
   </AddonSettings>
 
+  <TextViewer>
+    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
+      <altname>PS3 Remote Keyboard</altname>
+      <altname>MoSart PS3 Remote Keyboard</altname>
+      <button id="3">Close</button>
+    </joystick>
+  </TextViewer>
+
   <MyPicturesSettings>
     <joystick name="PLAYSTATION(R)3 Remote Keyboard">
       <altname>PS3 Remote Keyboard</altname>
diff --git a/system/keymaps/joystick.WiiRemote.xml b/system/keymaps/joystick.WiiRemote.xml
index 733dfab4df..0f08441aef 100644
--- a/system/keymaps/joystick.WiiRemote.xml
+++ b/system/keymaps/joystick.WiiRemote.xml
@@ -284,4 +284,9 @@
       <button id="6">Close</button>
     </joystick>
   </AddonSettings>
+  <TextViewer>
+    <joystick name="WiiRemote">
+      <button id="6">Close</button>
+    </joystick>
+  </TextViewer>
 </keymap>
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index 1bd9ba22c7..85af8a506e 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -499,6 +499,11 @@
       <backspace>Close</backspace>
     </keyboard>
   </AddonSettings>
+  <TextViewer>
+    <keyboard>
+      <backspace>Close</backspace>
+    </keyboard>
+  </TextViewer>
   <LockSettings>
     <keyboard>
       <escape>Close</escape>
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index d8e4ddf5ba..c3e3b75fcb 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -384,6 +384,11 @@
       <back>Close</back>
     </remote>
   </AddonSettings>
+  <TextViewer>
+    <keyboard>
+      <back>Close</back>
+    </keyboard>
+  </TextViewer>
   <MyPicturesSettings>
     <remote>
       <back>PreviousMenu</back>