diff --git a/360/media/hd/rarch_filebrowser.xui b/360/media/hd/rarch_filebrowser.xui
index 1968fb0723..6033bd1022 100644
--- a/360/media/hd/rarch_filebrowser.xui
+++ b/360/media/hd/rarch_filebrowser.xui
@@ -9,7 +9,7 @@
 <Width>1000.000061</Width>
 <Height>552.000000</Height>
 <Position>118.000031,88.000015,0.000000</Position>
-<ClassOverride>SSNESFileBrowser</ClassOverride>
+<ClassOverride>RetroArchFileBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
@@ -119,6 +119,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
diff --git a/360/media/hd/rarch_libretrocore_browser.xui b/360/media/hd/rarch_libretrocore_browser.xui
index 4310ab4e3a..9bd26204f9 100644
--- a/360/media/hd/rarch_libretrocore_browser.xui
+++ b/360/media/hd/rarch_libretrocore_browser.xui
@@ -9,7 +9,7 @@
 <Width>920.000122</Width>
 <Height>552.000000</Height>
 <Position>176.000015,88.000015,0.000000</Position>
-<ClassOverride>SSNESCoreBrowser</ClassOverride>
+<ClassOverride>RetroArchCoreBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
@@ -143,6 +143,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
diff --git a/360/media/hd/rarch_main.xui b/360/media/hd/rarch_main.xui
index 1eb881201d..9b3950aef3 100644
--- a/360/media/hd/rarch_main.xui
+++ b/360/media/hd/rarch_main.xui
@@ -9,7 +9,7 @@
 <Width>752.000061</Width>
 <Height>512.000122</Height>
 <Position>264.000031,88.000008,0.000000</Position>
-<ClassOverride>SSNESMain</ClassOverride>
+<ClassOverride>RetroArchMain</ClassOverride>
 </Properties>
 <XuiButton>
 <Properties>
diff --git a/360/media/hd/rarch_quickmenu.xui b/360/media/hd/rarch_quickmenu.xui
index 290a58f602..166e577d75 100644
--- a/360/media/hd/rarch_quickmenu.xui
+++ b/360/media/hd/rarch_quickmenu.xui
@@ -9,7 +9,7 @@
 <Width>824.000061</Width>
 <Height>496.000061</Height>
 <Position>182.000031,120.000023,0.000000</Position>
-<ClassOverride>SSNESQuickMenu</ClassOverride>
+<ClassOverride>RetroArchQuickMenu</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
@@ -98,6 +98,18 @@ Return to Dashboard
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 </XuiScene>
 </XuiCanvas>
diff --git a/360/media/hd/rarch_settings.xui b/360/media/hd/rarch_settings.xui
index f5b7e13f2e..9ae30fa48c 100644
--- a/360/media/hd/rarch_settings.xui
+++ b/360/media/hd/rarch_settings.xui
@@ -9,7 +9,7 @@
 <Width>776.000061</Width>
 <Height>512.000061</Height>
 <Position>198.000031,112.000023,0.000000</Position>
-<ClassOverride>SSNESSettings</ClassOverride>
+<ClassOverride>RetroArchSettings</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
@@ -113,6 +113,18 @@ Hardware filtering:
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 </XuiScene>
 </XuiCanvas>
diff --git a/360/media/sd/rarch_filebrowser.xui b/360/media/sd/rarch_filebrowser.xui
index ad4f01f1f9..72a65d4735 100644
--- a/360/media/sd/rarch_filebrowser.xui
+++ b/360/media/sd/rarch_filebrowser.xui
@@ -9,7 +9,7 @@
 <Width>575.888062</Width>
 <Height>336.017609</Height>
 <Position>333.995880,209.035965,0.000000</Position>
-<ClassOverride>SSNESFileBrowser</ClassOverride>
+<ClassOverride>RetroArchFileBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
@@ -107,6 +107,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
diff --git a/360/media/sd/rarch_main.xui b/360/media/sd/rarch_main.xui
index 632acc70ee..42328264c9 100644
--- a/360/media/sd/rarch_main.xui
+++ b/360/media/sd/rarch_main.xui
@@ -9,7 +9,7 @@
 <Width>584.528076</Width>
 <Height>363.320007</Height>
 <Position>347.429474,184.843964,0.000000</Position>
-<ClassOverride>SSNESMain</ClassOverride>
+<ClassOverride>RetroArchMain</ClassOverride>
 </Properties>
 <XuiButton>
 <Properties>
diff --git a/360/media/sd/rarch_quickmenu.xui b/360/media/sd/rarch_quickmenu.xui
index 9223aa52a7..03adcf1d12 100644
--- a/360/media/sd/rarch_quickmenu.xui
+++ b/360/media/sd/rarch_quickmenu.xui
@@ -9,7 +9,7 @@
 <Width>584.528076</Width>
 <Height>363.320007</Height>
 <Position>302.429474,184.843964,0.000000</Position>
-<ClassOverride>SSNESQuickMenu</ClassOverride>
+<ClassOverride>RetroArchQuickMenu</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
@@ -86,6 +86,18 @@ Return to Dashboard
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 </XuiScene>
 </XuiCanvas>
diff --git a/360/media/sd/rarch_settings.xui b/360/media/sd/rarch_settings.xui
index 6c8e1d6825..1d9725e149 100644
--- a/360/media/sd/rarch_settings.xui
+++ b/360/media/sd/rarch_settings.xui
@@ -9,7 +9,7 @@
 <Width>584.528076</Width>
 <Height>363.320007</Height>
 <Position>344.000031,184.000015,0.000000</Position>
-<ClassOverride>SSNESSettings</ClassOverride>
+<ClassOverride>RetroArchSettings</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
@@ -89,6 +89,18 @@ Hardware filtering:
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 </XuiScene>
 </XuiCanvas>
diff --git a/360/media/sd/ssnes_libretrocore_browser.xui b/360/media/sd/ssnes_libretrocore_browser.xui
index 7a1665b687..14cb9f422d 100644
--- a/360/media/sd/ssnes_libretrocore_browser.xui
+++ b/360/media/sd/ssnes_libretrocore_browser.xui
@@ -9,7 +9,7 @@
 <Width>575.888062</Width>
 <Height>336.017609</Height>
 <Position>353.995880,209.035965,0.000000</Position>
-<ClassOverride>SSNESCoreBrowser</ClassOverride>
+<ClassOverride>RetroArchCoreBrowser</ClassOverride>
 </Properties>
 <XuiText>
 <Properties>
@@ -119,6 +119,18 @@
 <InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
 </Properties>
 </XuiListItem>
+<XuiListItem>
+<Properties>
+<Id>control_ListItem</Id>
+<Width>226.000000</Width>
+<Height>45.000000</Height>
+<Position>7.000000,22.000000,0.000000</Position>
+<Anchor>5</Anchor>
+<Show>false</Show>
+<Visual>XuiButton</Visual>
+<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
+</Properties>
+</XuiListItem>
 </XuiCommonList>
 <XuiBackButton>
 <Properties>
diff --git a/360/menu.cpp b/360/menu.cpp
index eaf852d7ab..0b54ab6d2d 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -48,11 +48,11 @@ static void return_to_dashboard (void)
 /* Register custom classes */
 HRESULT CRetroArch::RegisterXuiClasses (void)
 {
-   CSSNESMain::Register();
-   CSSNESFileBrowser::Register();
-   CSSNESCoreBrowser::Register();
-   CSSNESQuickMenu::Register();
-   CSSNESSettings::Register();
+   CRetroArchMain::Register();
+   CRetroArchFileBrowser::Register();
+   CRetroArchCoreBrowser::Register();
+   CRetroArchQuickMenu::Register();
+   CRetroArchSettings::Register();
 
    return S_OK;
 }
@@ -60,11 +60,11 @@ HRESULT CRetroArch::RegisterXuiClasses (void)
 /* Unregister custom classes */
 HRESULT CRetroArch::UnregisterXuiClasses (void)
 {
-   CSSNESMain::Unregister();
-   CSSNESCoreBrowser::Unregister();
-   CSSNESFileBrowser::Unregister();
-   CSSNESQuickMenu::Register();
-   CSSNESSettings::Unregister();
+   CRetroArchMain::Unregister();
+   CRetroArchCoreBrowser::Unregister();
+   CRetroArchFileBrowser::Unregister();
+   CRetroArchQuickMenu::Register();
+   CRetroArchSettings::Unregister();
 
    return S_OK;
 }
@@ -91,7 +91,7 @@ static void filebrowser_fetch_directory_entries(const char *path, filebrowser_t
    }
 }
 
-HRESULT CSSNESFileBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
+HRESULT CRetroArchFileBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
    GetChildById(L"XuiRomList", &m_romlist);
    GetChildById(L"XuiBackButton1", &m_back);
@@ -104,7 +104,7 @@ HRESULT CSSNESFileBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
    return S_OK;
 }
 
-HRESULT CSSNESCoreBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
+HRESULT CRetroArchCoreBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
    GetChildById(L"XuiRomList", &m_romlist);
    GetChildById(L"XuiBackButton1", &m_back);
@@ -129,7 +129,7 @@ static const wchar_t * set_filter_element(int index)
    return L"";
 }
 
-HRESULT CSSNESSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
+HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
    GetChildById(L"XuiSettingsList", &m_settingslist);
    GetChildById(L"XuiBackButton", &m_back);
@@ -141,7 +141,7 @@ HRESULT CSSNESSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
    return S_OK;
 }
 
-HRESULT CSSNESQuickMenu::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
+HRESULT CRetroArchQuickMenu::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
    GetChildById(L"XuiQuickMenuList", &m_quickmenulist);
    GetChildById(L"XuiBackButton", &m_back);
@@ -173,7 +173,7 @@ HRESULT CSSNESQuickMenu::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
    return S_OK;
 }
 
-HRESULT CSSNESQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
+HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
 {
    int current_index;
 
@@ -279,7 +279,7 @@ HRESULT CSSNESQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
    return S_OK;
 }
 
-HRESULT CSSNESMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
+HRESULT CRetroArchMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
    struct retro_system_info info;
    retro_get_system_info(&info);
@@ -312,7 +312,7 @@ HRESULT CSSNESMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
    return S_OK;
 }
 
-HRESULT CSSNESFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
+HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
 {
    char path[MAX_PATH_LENGTH];
 
@@ -366,7 +366,7 @@ HRESULT CSSNESFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
    return S_OK;
 }
 
-HRESULT CSSNESCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
+HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
 {
    char path[MAX_PATH_LENGTH];
 
@@ -397,7 +397,7 @@ HRESULT CSSNESCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
    return S_OK;
 }
 
-HRESULT CSSNESSettings::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
+HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
 {
    int current_index;
 
@@ -429,7 +429,7 @@ HRESULT CSSNESSettings::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
    return S_OK;
 }
 
-HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
+HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
 {
    xdk360_video_t *vid = (xdk360_video_t*)g_d3d;
 
@@ -469,12 +469,12 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
    }
    else if ( hObjPressed == m_settings )
    {
-      hr = XuiSceneCreate(hdmenus_allowed ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_settings.xur", NULL, &app.hSSNESSettings);
+      hr = XuiSceneCreate(hdmenus_allowed ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_settings.xur", NULL, &app.hRetroArchSettings);
 
       if (FAILED(hr))
          RARCH_ERR("Failed to load scene.\n");
 
-      NavigateForward(app.hSSNESSettings);
+      NavigateForward(app.hRetroArchSettings);
    }
    else if ( hObjPressed == m_quit )
       return_to_dashboard();