diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 2f971d7a4e..dd55373ef3 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -228,6 +228,30 @@ static void button_event(int key, bool pressed)
         return;
 #endif
 
+#if defined(IRIVER_H100_SERIES) || defined (IRIVER_H300_SERIES)
+    case SDLK_t:
+        if(pressed)
+            switch(_remote_type)
+            {
+                case REMOTETYPE_UNPLUGGED: 
+                    _remote_type=REMOTETYPE_H100_LCD;
+                    DEBUGF("Changed remote type to H100\n");
+                    break;
+                case REMOTETYPE_H100_LCD:
+                    _remote_type=REMOTETYPE_H300_LCD;
+                    DEBUGF("Changed remote type to H300\n");
+                    break;
+                case REMOTETYPE_H300_LCD:
+                    _remote_type=REMOTETYPE_H300_NONLCD;
+                    DEBUGF("Changed remote type to H300 NON-LCD\n");
+                    break;
+                case REMOTETYPE_H300_NONLCD:
+                    _remote_type=REMOTETYPE_UNPLUGGED;
+                    DEBUGF("Changed remote type to none\n");
+                    break;
+            }
+        break;
+#endif
     case SDLK_KP0:
     case SDLK_F5:
         if(pressed)
@@ -236,9 +260,17 @@ static void button_event(int key, bool pressed)
             return;
         }
         break;
+#ifdef HAVE_TOUCHSCREEN
+    case SDLK_F4:
+        if(pressed)
+        {
+            touchscreen_set_mode(touchscreen_get_mode() == TOUCHSCREEN_POINT ? TOUCHSCREEN_BUTTON : TOUCHSCREEN_POINT);
+            printf("Touchscreen mode: %s\n", touchscreen_get_mode() == TOUCHSCREEN_POINT ? "TOUCHSCREEN_POINT" : "TOUCHSCREEN_BUTTON");
+        }
+#endif
     default:
 #ifdef HAVE_TOUCHSCREEN
-        new_btn = key_to_touch(key);
+        new_btn = key_to_touch(key, mouse_coords);
         if (!new_btn)
 #endif
             new_btn = key_to_button(key);
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index 4d99093e7d..06be7450ab 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -59,7 +59,7 @@ onda-vx747.c
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
 onda-vx777.c
 #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
-samsung-yh820_yh925.c
+samsung-yh820_yh92x.c
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 pbell-vibe500.c
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
diff --git a/uisimulator/buttonmap/buttonmap.h b/uisimulator/buttonmap/buttonmap.h
index d5b951af9b..2f14cea9c4 100644
--- a/uisimulator/buttonmap/buttonmap.h
+++ b/uisimulator/buttonmap/buttonmap.h
@@ -36,7 +36,7 @@ int xy2button( int x, int y);
 
 int key_to_button(int keyboard_button);
 #ifdef HAVE_TOUCHSCREEN
-int key_to_touch(int keyboard_button);
+int key_to_touch(int keyboard_button, unsigned int mouse_coords);
 #endif
 
 #endif /* __BUTTONMAP_H__ */
diff --git a/uisimulator/buttonmap/gigabeat-s.c b/uisimulator/buttonmap/gigabeat-s.c
index 98a8489446..5c139c470f 100644
--- a/uisimulator/buttonmap/gigabeat-s.c
+++ b/uisimulator/buttonmap/gigabeat-s.c
@@ -20,6 +20,10 @@ n/***************************************************************************
  ****************************************************************************/
 
 
+#include <SDL.h>
+#include "button.h"
+#include "buttonmap.h"
+
 int key_to_button(int keyboard_button)
 {
     int new_btn = BUTTON_NONE;
diff --git a/uisimulator/buttonmap/gigabeat.c b/uisimulator/buttonmap/gigabeat.c
index 02055cf0b9..84b42a5c8a 100644
--- a/uisimulator/buttonmap/gigabeat.c
+++ b/uisimulator/buttonmap/gigabeat.c
@@ -19,7 +19,6 @@ n/***************************************************************************
  *
  ****************************************************************************/
 
-
 #include <SDL.h>
 #include "button.h"
 #include "buttonmap.h"
diff --git a/uisimulator/buttonmap/iaudo-m3.c b/uisimulator/buttonmap/iaudio-m3.c
similarity index 100%
rename from uisimulator/buttonmap/iaudo-m3.c
rename to uisimulator/buttonmap/iaudio-m3.c
diff --git a/uisimulator/buttonmap/iriver-h100_h300.c b/uisimulator/buttonmap/iriver-h100_h300.c
index 5e4ad3bafc..e6ca389fc8 100644
--- a/uisimulator/buttonmap/iriver-h100_h300.c
+++ b/uisimulator/buttonmap/iriver-h100_h300.c
@@ -29,28 +29,6 @@ int key_to_button(int keyboard_button)
     int new_btn = BUTTON_NONE;
     switch (keyboard_button)
     {
-        case SDLK_t:
-            if(pressed)
-                switch(_remote_type)
-                {
-                    case REMOTETYPE_UNPLUGGED: 
-                        _remote_type=REMOTETYPE_H100_LCD;
-                        DEBUGF("Changed remote type to H100\n");
-                        break;
-                    case REMOTETYPE_H100_LCD:
-                        _remote_type=REMOTETYPE_H300_LCD;
-                        DEBUGF("Changed remote type to H300\n");
-                        break;
-                    case REMOTETYPE_H300_LCD:
-                        _remote_type=REMOTETYPE_H300_NONLCD;
-                        DEBUGF("Changed remote type to H300 NON-LCD\n");
-                        break;
-                    case REMOTETYPE_H300_NONLCD:
-                        _remote_type=REMOTETYPE_UNPLUGGED;
-                        DEBUGF("Changed remote type to none\n");
-                        break;
-                }
-            break;
         case SDLK_KP4:
         case SDLK_LEFT:
             new_btn = BUTTON_LEFT;
diff --git a/uisimulator/buttonmap/touchscreen.c b/uisimulator/buttonmap/touchscreen.c
index 746a6d5f20..90518c7c7e 100644
--- a/uisimulator/buttonmap/touchscreen.c
+++ b/uisimulator/buttonmap/touchscreen.c
@@ -26,7 +26,7 @@
 #include "buttonmap.h"
 #include "touchscreen.h"
 
-int key_to_touch(int keyboard_button)
+int key_to_touch(int keyboard_button, unsigned int mouse_coords)
 {
     int new_btn = BUTTON_NONE;
     switch (keyboard_button)
@@ -91,13 +91,6 @@ int key_to_touch(int keyboard_button)
         case SDLK_l:
             new_btn = BUTTON_BOTTOMRIGHT;
             break;
-        case SDLK_F4:
-            if(pressed)
-            {
-                touchscreen_set_mode(touchscreen_get_mode() == TOUCHSCREEN_POINT ? TOUCHSCREEN_BUTTON : TOUCHSCREEN_POINT);
-                printf("Touchscreen mode: %s\n", touchscreen_get_mode() == TOUCHSCREEN_POINT ? "TOUCHSCREEN_POINT" : "TOUCHSCREEN_BUTTON");
-            }
-            break;
     }
     return new_btn;
 }