diff --git a/Menu/GameShell/20_Retro Games/MAME/action.config b/Menu/GameShell/20_GAMES/01_MAME/action.config
similarity index 100%
rename from Menu/GameShell/20_Retro Games/MAME/action.config
rename to Menu/GameShell/20_GAMES/01_MAME/action.config
diff --git a/Menu/GameShell/20_Retro Games/MGBA/action.config b/Menu/GameShell/20_GAMES/02_MGBA/action.config
similarity index 100%
rename from Menu/GameShell/20_Retro Games/MGBA/action.config
rename to Menu/GameShell/20_GAMES/02_MGBA/action.config
diff --git a/Menu/GameShell/20_Retro Games/NESTOPIA/action.config b/Menu/GameShell/20_GAMES/03_NESTOPIA/action.config
similarity index 100%
rename from Menu/GameShell/20_Retro Games/NESTOPIA/action.config
rename to Menu/GameShell/20_GAMES/03_NESTOPIA/action.config
diff --git a/Menu/GameShell/20_GAMES/04_Pcsx/action.config b/Menu/GameShell/20_GAMES/04_Pcsx/action.config
new file mode 100644
index 0000000..88850dc
--- /dev/null
+++ b/Menu/GameShell/20_GAMES/04_Pcsx/action.config
@@ -0,0 +1,6 @@
+ROM=/home/cpi/games/PCSX
+ROM_SO=/home/cpi/apps/emulators/pcsx -cdfile
+EXT=bin,cue,img,mdf,pbp,toc,cbn,m3u,ccd
+LAUNCHER=
+TITLE=Pcsx Roms
+SO_URL=https://github.com/cuu/Pcsx/raw/master/pcsx.zip
diff --git a/Menu/GameShell/31_CaveStory.sh b/Menu/GameShell/20_GAMES/99_MISC/31_CaveStory.sh
similarity index 100%
rename from Menu/GameShell/31_CaveStory.sh
rename to Menu/GameShell/20_GAMES/99_MISC/31_CaveStory.sh
diff --git a/Menu/GameShell/32_freeDM.sh b/Menu/GameShell/20_GAMES/99_MISC/32_freeDM.sh
similarity index 100%
rename from Menu/GameShell/32_freeDM.sh
rename to Menu/GameShell/20_GAMES/99_MISC/32_freeDM.sh
diff --git a/Menu/GameShell/20_Retro Games/Pcsx b/Menu/GameShell/20_Retro Games/Pcsx
deleted file mode 160000
index c532ced..0000000
--- a/Menu/GameShell/20_Retro Games/Pcsx	
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c532cedb5387697c633777f37a52e11f95fa3352
diff --git a/Menu/GameShell/97_Music Player/__init__.py b/Menu/GameShell/21_MUSIC/__init__.py
similarity index 100%
rename from Menu/GameShell/97_Music Player/__init__.py
rename to Menu/GameShell/21_MUSIC/__init__.py
diff --git a/Menu/GameShell/97_Music Player/list_item.py b/Menu/GameShell/21_MUSIC/list_item.py
similarity index 100%
rename from Menu/GameShell/97_Music Player/list_item.py
rename to Menu/GameShell/21_MUSIC/list_item.py
diff --git a/Menu/GameShell/97_Music Player/mpd_spectrum_page.py b/Menu/GameShell/21_MUSIC/mpd_spectrum_page.py
similarity index 100%
rename from Menu/GameShell/97_Music Player/mpd_spectrum_page.py
rename to Menu/GameShell/21_MUSIC/mpd_spectrum_page.py
diff --git a/Menu/GameShell/97_Music Player/music_lib_list_page.py b/Menu/GameShell/21_MUSIC/music_lib_list_page.py
similarity index 100%
rename from Menu/GameShell/97_Music Player/music_lib_list_page.py
rename to Menu/GameShell/21_MUSIC/music_lib_list_page.py
diff --git a/Menu/GameShell/97_Music Player/myvars.py b/Menu/GameShell/21_MUSIC/myvars.py
similarity index 100%
rename from Menu/GameShell/97_Music Player/myvars.py
rename to Menu/GameShell/21_MUSIC/myvars.py
diff --git a/Menu/GameShell/97_Music Player/pages.py b/Menu/GameShell/21_MUSIC/pages.py
similarity index 100%
rename from Menu/GameShell/97_Music Player/pages.py
rename to Menu/GameShell/21_MUSIC/pages.py
diff --git a/Menu/GameShell/97_Music Player/play_list_page.py b/Menu/GameShell/21_MUSIC/play_list_page.py
similarity index 100%
rename from Menu/GameShell/97_Music Player/play_list_page.py
rename to Menu/GameShell/21_MUSIC/play_list_page.py
diff --git a/Menu/GameShell/98_TinyCloud/__init__.py b/Menu/GameShell/22_CONNECT/__init__.py
similarity index 97%
rename from Menu/GameShell/98_TinyCloud/__init__.py
rename to Menu/GameShell/22_CONNECT/__init__.py
index d6236ac..081c455 100644
--- a/Menu/GameShell/98_TinyCloud/__init__.py
+++ b/Menu/GameShell/22_CONNECT/__init__.py
@@ -157,7 +157,7 @@ class TinyCloudPage(Page):
         self._Height = self._Screen._Height
 
         self._PngSize["bg"] = (253,114)
-        self._PngSize["online"] = (75,122)
+        #self._PngSize["online"] = (75,122)
         
         bgpng = IconItem()
         bgpng._ImgSurf = MyIconPool._Icons["needwifi_bg"]
@@ -167,6 +167,7 @@ class TinyCloudPage(Page):
 
         self._Icons["bg"] = bgpng
         
+        """
         onlinepng = IconItem()
         onlinepng._ImgSurf = MyIconPool._Icons["online"]
         onlinepng._MyType = ICON_TYPES["STAT"]
@@ -174,7 +175,7 @@ class TinyCloudPage(Page):
         onlinepng.Adjust(0,0,self._PngSize["online"][0], self._PngSize["online"][1],0)
 
         self._Icons["online"] = onlinepng
-
+        """
         self.SetLabels()
 
     def KeyDown(self,event):
@@ -189,8 +190,8 @@ class TinyCloudPage(Page):
 
             if is_wifi_connected_now():
                 
-                self._Icons["online"].NewCoord(self._Coords["online"].x, self._Coords["online"].y)
-                self._Icons["online"].Draw()
+                #self._Icons["online"].NewCoord(self._Coords["online"].x, self._Coords["online"].y)
+                #self._Icons["online"].Draw()
 
                 self.SetLabels()
                 
@@ -229,7 +230,7 @@ class APIOBJ(object):
     def Init(self,main_screen):
         self._Page = TinyCloudPage()
         self._Page._Screen = main_screen
-        self._Page._Name ="Tiny cloud"
+        self._Page._Name ="CONNECT"
         self._Page.Init()
         
     def API(self,main_screen):
diff --git a/Menu/GameShell/90_Reload UI.sh b/Menu/GameShell/90_RELOAD.sh
similarity index 100%
rename from Menu/GameShell/90_Reload UI.sh
rename to Menu/GameShell/90_RELOAD.sh
diff --git a/Menu/GameShell/99_PowerOFF/__init__.py b/Menu/GameShell/99_SHUTDOWN/__init__.py
similarity index 98%
rename from Menu/GameShell/99_PowerOFF/__init__.py
rename to Menu/GameShell/99_SHUTDOWN/__init__.py
index f5b72c6..022dfe1 100644
--- a/Menu/GameShell/99_PowerOFF/__init__.py
+++ b/Menu/GameShell/99_SHUTDOWN/__init__.py
@@ -76,7 +76,7 @@ class APIOBJ(object):
         self._Page = PowerOffConfirmPage()
 
         self._Page._Screen = main_screen
-        self._Page._Name ="Power OFF"
+        self._Page._Name ="SHUTDOWN"
         self._Page.Init()
         
         
diff --git a/skin/default/Menu/GameShell/20_Retro Games/MAME.png b/skin/default/Menu/GameShell/20_GAMES/MAME.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_Retro Games/MAME.png
rename to skin/default/Menu/GameShell/20_GAMES/MAME.png
diff --git a/skin/default/Menu/GameShell/20_Retro Games/MGBA.png b/skin/default/Menu/GameShell/20_GAMES/MGBA.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_Retro Games/MGBA.png
rename to skin/default/Menu/GameShell/20_GAMES/MGBA.png
diff --git a/skin/default/Menu/GameShell/20_Retro Games/NESTOPIA.png b/skin/default/Menu/GameShell/20_GAMES/NESTOPIA.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_Retro Games/NESTOPIA.png
rename to skin/default/Menu/GameShell/20_GAMES/NESTOPIA.png
diff --git a/skin/default/Menu/GameShell/TinyCloud.png b/skin/default/Menu/GameShell/CONNECT.png
similarity index 100%
rename from skin/default/Menu/GameShell/TinyCloud.png
rename to skin/default/Menu/GameShell/CONNECT.png
diff --git a/skin/default/Menu/GameShell/Retro Games.png b/skin/default/Menu/GameShell/GAMES.png
similarity index 100%
rename from skin/default/Menu/GameShell/Retro Games.png
rename to skin/default/Menu/GameShell/GAMES.png
diff --git a/skin/default/Menu/GameShell/Music Player.png b/skin/default/Menu/GameShell/MUSIC.png
similarity index 100%
rename from skin/default/Menu/GameShell/Music Player.png
rename to skin/default/Menu/GameShell/MUSIC.png
diff --git a/skin/default/Menu/GameShell/Reload UI.png b/skin/default/Menu/GameShell/RELOAD.png
similarity index 100%
rename from skin/default/Menu/GameShell/Reload UI.png
rename to skin/default/Menu/GameShell/RELOAD.png
diff --git a/skin/default/Menu/GameShell/PowerOFF.png b/skin/default/Menu/GameShell/SHUTDOWN.png
similarity index 100%
rename from skin/default/Menu/GameShell/PowerOFF.png
rename to skin/default/Menu/GameShell/SHUTDOWN.png