diff --git a/Menu/GameShell/01_OPERATION/OPERATION.sh b/Menu/GameShell/01_OPERATION/OPERATION.sh
new file mode 100755
index 0000000..e653b88
--- /dev/null
+++ b/Menu/GameShell/01_OPERATION/OPERATION.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+love OPERATION.love gameshell
diff --git a/Menu/GameShell/02_MANUAL/MANUAL.love b/Menu/GameShell/02_MANUAL/MANUAL.love
new file mode 100644
index 0000000..5d5a910
Binary files /dev/null and b/Menu/GameShell/02_MANUAL/MANUAL.love differ
diff --git a/Menu/GameShell/02_MANUAL/MANUAL.sh b/Menu/GameShell/02_MANUAL/MANUAL.sh
new file mode 100755
index 0000000..7166da5
--- /dev/null
+++ b/Menu/GameShell/02_MANUAL/MANUAL.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+love MANUAL.love gameshell
diff --git a/Menu/GameShell/03_MAIL/MAIL.sh b/Menu/GameShell/03_MAIL/MAIL.sh
new file mode 100755
index 0000000..67a47a0
--- /dev/null
+++ b/Menu/GameShell/03_MAIL/MAIL.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+
+love MAIL.love gameshell
diff --git a/Menu/GameShell/20_GAMES/01_MAME/action.config b/Menu/GameShell/40_PLAY/01_MAME/action.config
similarity index 100%
rename from Menu/GameShell/20_GAMES/01_MAME/action.config
rename to Menu/GameShell/40_PLAY/01_MAME/action.config
diff --git a/Menu/GameShell/20_GAMES/02_MGBA/action.config b/Menu/GameShell/40_PLAY/02_MGBA/action.config
similarity index 100%
rename from Menu/GameShell/20_GAMES/02_MGBA/action.config
rename to Menu/GameShell/40_PLAY/02_MGBA/action.config
diff --git a/Menu/GameShell/20_GAMES/03_NESTOPIA/action.config b/Menu/GameShell/40_PLAY/03_NESTOPIA/action.config
similarity index 100%
rename from Menu/GameShell/20_GAMES/03_NESTOPIA/action.config
rename to Menu/GameShell/40_PLAY/03_NESTOPIA/action.config
diff --git a/Menu/GameShell/20_GAMES/04_Pcsx/action.config b/Menu/GameShell/40_PLAY/04_Pcsx/action.config
similarity index 100%
rename from Menu/GameShell/20_GAMES/04_Pcsx/action.config
rename to Menu/GameShell/40_PLAY/04_Pcsx/action.config
diff --git a/Menu/GameShell/30_RetroArch.sh b/Menu/GameShell/40_PLAY/98_RetroArch.sh
similarity index 100%
rename from Menu/GameShell/30_RetroArch.sh
rename to Menu/GameShell/40_PLAY/98_RetroArch.sh
diff --git a/Menu/GameShell/20_GAMES/99_MISC/31_CaveStory.sh b/Menu/GameShell/40_PLAY/99_MISC/31_CaveStory.sh
similarity index 100%
rename from Menu/GameShell/20_GAMES/99_MISC/31_CaveStory.sh
rename to Menu/GameShell/40_PLAY/99_MISC/31_CaveStory.sh
diff --git a/Menu/GameShell/20_GAMES/99_MISC/32_freeDM.sh b/Menu/GameShell/40_PLAY/99_MISC/32_freeDM.sh
similarity index 100%
rename from Menu/GameShell/20_GAMES/99_MISC/32_freeDM.sh
rename to Menu/GameShell/40_PLAY/99_MISC/32_freeDM.sh
diff --git a/Menu/GameShell/21_MUSIC/__init__.py b/Menu/GameShell/41_MUSIC/__init__.py
similarity index 100%
rename from Menu/GameShell/21_MUSIC/__init__.py
rename to Menu/GameShell/41_MUSIC/__init__.py
diff --git a/Menu/GameShell/21_MUSIC/list_item.py b/Menu/GameShell/41_MUSIC/list_item.py
similarity index 100%
rename from Menu/GameShell/21_MUSIC/list_item.py
rename to Menu/GameShell/41_MUSIC/list_item.py
diff --git a/Menu/GameShell/21_MUSIC/mpd_spectrum_page.py b/Menu/GameShell/41_MUSIC/mpd_spectrum_page.py
similarity index 100%
rename from Menu/GameShell/21_MUSIC/mpd_spectrum_page.py
rename to Menu/GameShell/41_MUSIC/mpd_spectrum_page.py
diff --git a/Menu/GameShell/21_MUSIC/music_lib_list_page.py b/Menu/GameShell/41_MUSIC/music_lib_list_page.py
similarity index 100%
rename from Menu/GameShell/21_MUSIC/music_lib_list_page.py
rename to Menu/GameShell/41_MUSIC/music_lib_list_page.py
diff --git a/Menu/GameShell/21_MUSIC/myvars.py b/Menu/GameShell/41_MUSIC/myvars.py
similarity index 100%
rename from Menu/GameShell/21_MUSIC/myvars.py
rename to Menu/GameShell/41_MUSIC/myvars.py
diff --git a/Menu/GameShell/21_MUSIC/pages.py b/Menu/GameShell/41_MUSIC/pages.py
similarity index 100%
rename from Menu/GameShell/21_MUSIC/pages.py
rename to Menu/GameShell/41_MUSIC/pages.py
diff --git a/Menu/GameShell/21_MUSIC/play_list_page.py b/Menu/GameShell/41_MUSIC/play_list_page.py
similarity index 100%
rename from Menu/GameShell/21_MUSIC/play_list_page.py
rename to Menu/GameShell/41_MUSIC/play_list_page.py
diff --git a/Menu/GameShell/50_PICO-8/PICO-8.sh b/Menu/GameShell/50_DEV/50_PICO-8/PICO-8.sh
similarity index 100%
rename from Menu/GameShell/50_PICO-8/PICO-8.sh
rename to Menu/GameShell/50_DEV/50_PICO-8/PICO-8.sh
diff --git a/Menu/GameShell/50_PICO-8/Post-Up.sh b/Menu/GameShell/50_DEV/50_PICO-8/Post-Up.sh
similarity index 100%
rename from Menu/GameShell/50_PICO-8/Post-Up.sh
rename to Menu/GameShell/50_DEV/50_PICO-8/Post-Up.sh
diff --git a/Menu/GameShell/50_PICO-8/compkginfo.json b/Menu/GameShell/50_DEV/50_PICO-8/compkginfo.json
similarity index 100%
rename from Menu/GameShell/50_PICO-8/compkginfo.json
rename to Menu/GameShell/50_DEV/50_PICO-8/compkginfo.json
diff --git a/Menu/GameShell/50_PICO-8/pico-8/config.txt b/Menu/GameShell/50_DEV/50_PICO-8/pico-8/config.txt
similarity index 100%
rename from Menu/GameShell/50_PICO-8/pico-8/config.txt
rename to Menu/GameShell/50_DEV/50_PICO-8/pico-8/config.txt
diff --git a/Menu/GameShell/50_PICO-8/pico-8/log.txt b/Menu/GameShell/50_DEV/50_PICO-8/pico-8/log.txt
similarity index 100%
rename from Menu/GameShell/50_PICO-8/pico-8/log.txt
rename to Menu/GameShell/50_DEV/50_PICO-8/pico-8/log.txt
diff --git a/Menu/GameShell/50_PICO-8/pico-8/sdl_controllers.txt b/Menu/GameShell/50_DEV/50_PICO-8/pico-8/sdl_controllers.txt
similarity index 100%
rename from Menu/GameShell/50_PICO-8/pico-8/sdl_controllers.txt
rename to Menu/GameShell/50_DEV/50_PICO-8/pico-8/sdl_controllers.txt
diff --git a/Menu/GameShell/22_CONNECT/__init__.py b/Menu/GameShell/60_CONNECT/__init__.py
similarity index 100%
rename from Menu/GameShell/22_CONNECT/__init__.py
rename to Menu/GameShell/60_CONNECT/__init__.py
diff --git a/Menu/GameShell/90_RELOAD.sh b/Menu/GameShell/70_RELOAD.sh
similarity index 100%
rename from Menu/GameShell/90_RELOAD.sh
rename to Menu/GameShell/70_RELOAD.sh
diff --git a/Menu/GameShell/10_Settings/About/__init__.py b/Menu/GameShell/80_SETTINGS/About/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/About/__init__.py
rename to Menu/GameShell/80_SETTINGS/About/__init__.py
diff --git a/Menu/GameShell/10_Settings/Airplane/__init__.py b/Menu/GameShell/80_SETTINGS/Airplane/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Airplane/__init__.py
rename to Menu/GameShell/80_SETTINGS/Airplane/__init__.py
diff --git a/Menu/GameShell/10_Settings/Bluetooth/__init__.py b/Menu/GameShell/80_SETTINGS/Bluetooth/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Bluetooth/__init__.py
rename to Menu/GameShell/80_SETTINGS/Bluetooth/__init__.py
diff --git a/Menu/GameShell/10_Settings/Bluetooth/agent.py b/Menu/GameShell/80_SETTINGS/Bluetooth/agent.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Bluetooth/agent.py
rename to Menu/GameShell/80_SETTINGS/Bluetooth/agent.py
diff --git a/Menu/GameShell/10_Settings/Bluetooth/net_item.py b/Menu/GameShell/80_SETTINGS/Bluetooth/net_item.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Bluetooth/net_item.py
rename to Menu/GameShell/80_SETTINGS/Bluetooth/net_item.py
diff --git a/Menu/GameShell/10_Settings/Brightness/__init__.py b/Menu/GameShell/80_SETTINGS/Brightness/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Brightness/__init__.py
rename to Menu/GameShell/80_SETTINGS/Brightness/__init__.py
diff --git a/Menu/GameShell/10_Settings/Brightness/brightness_page.py b/Menu/GameShell/80_SETTINGS/Brightness/brightness_page.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Brightness/brightness_page.py
rename to Menu/GameShell/80_SETTINGS/Brightness/brightness_page.py
diff --git a/Menu/GameShell/10_Settings/Brightness/myvars.py b/Menu/GameShell/80_SETTINGS/Brightness/myvars.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Brightness/myvars.py
rename to Menu/GameShell/80_SETTINGS/Brightness/myvars.py
diff --git a/Menu/GameShell/10_Settings/Brightness/pages.py b/Menu/GameShell/80_SETTINGS/Brightness/pages.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Brightness/pages.py
rename to Menu/GameShell/80_SETTINGS/Brightness/pages.py
diff --git a/Menu/GameShell/10_Settings/ButtonsLayout/__init__.py b/Menu/GameShell/80_SETTINGS/ButtonsLayout/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/ButtonsLayout/__init__.py
rename to Menu/GameShell/80_SETTINGS/ButtonsLayout/__init__.py
diff --git a/Menu/GameShell/10_Settings/GateWay/__init__.py b/Menu/GameShell/80_SETTINGS/GateWay/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/GateWay/__init__.py
rename to Menu/GameShell/80_SETTINGS/GateWay/__init__.py
diff --git a/Menu/GameShell/10_Settings/Languages/__init__.py b/Menu/GameShell/80_SETTINGS/Languages/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Languages/__init__.py
rename to Menu/GameShell/80_SETTINGS/Languages/__init__.py
diff --git a/Menu/GameShell/10_Settings/LauncherGo/__init__.py b/Menu/GameShell/80_SETTINGS/LauncherGo/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/LauncherGo/__init__.py
rename to Menu/GameShell/80_SETTINGS/LauncherGo/__init__.py
diff --git a/Menu/GameShell/10_Settings/Lima/__init__.py b/Menu/GameShell/80_SETTINGS/Lima/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Lima/__init__.py
rename to Menu/GameShell/80_SETTINGS/Lima/__init__.py
diff --git a/Menu/GameShell/10_Settings/Notification/__init__.py b/Menu/GameShell/80_SETTINGS/Notification/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Notification/__init__.py
rename to Menu/GameShell/80_SETTINGS/Notification/__init__.py
diff --git a/Menu/GameShell/10_Settings/PowerOFF/__init__.py b/Menu/GameShell/80_SETTINGS/PowerOFF/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/PowerOFF/__init__.py
rename to Menu/GameShell/80_SETTINGS/PowerOFF/__init__.py
diff --git a/Menu/GameShell/10_Settings/PowerOptions/__init__.py b/Menu/GameShell/80_SETTINGS/PowerOptions/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/PowerOptions/__init__.py
rename to Menu/GameShell/80_SETTINGS/PowerOptions/__init__.py
diff --git a/Menu/GameShell/10_Settings/Sound/__init__.py b/Menu/GameShell/80_SETTINGS/Sound/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Sound/__init__.py
rename to Menu/GameShell/80_SETTINGS/Sound/__init__.py
diff --git a/Menu/GameShell/10_Settings/Sound/myvars.py b/Menu/GameShell/80_SETTINGS/Sound/myvars.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Sound/myvars.py
rename to Menu/GameShell/80_SETTINGS/Sound/myvars.py
diff --git a/Menu/GameShell/10_Settings/Sound/pages.py b/Menu/GameShell/80_SETTINGS/Sound/pages.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Sound/pages.py
rename to Menu/GameShell/80_SETTINGS/Sound/pages.py
diff --git a/Menu/GameShell/10_Settings/Sound/sound_page.py b/Menu/GameShell/80_SETTINGS/Sound/sound_page.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Sound/sound_page.py
rename to Menu/GameShell/80_SETTINGS/Sound/sound_page.py
diff --git a/Menu/GameShell/10_Settings/Storage/__init__.py b/Menu/GameShell/80_SETTINGS/Storage/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Storage/__init__.py
rename to Menu/GameShell/80_SETTINGS/Storage/__init__.py
diff --git a/Menu/GameShell/10_Settings/Time/__init__.py b/Menu/GameShell/80_SETTINGS/Time/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Time/__init__.py
rename to Menu/GameShell/80_SETTINGS/Time/__init__.py
diff --git a/Menu/GameShell/10_Settings/Time/list_item.py b/Menu/GameShell/80_SETTINGS/Time/list_item.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Time/list_item.py
rename to Menu/GameShell/80_SETTINGS/Time/list_item.py
diff --git a/Menu/GameShell/10_Settings/Time/logger.py b/Menu/GameShell/80_SETTINGS/Time/logger.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Time/logger.py
rename to Menu/GameShell/80_SETTINGS/Time/logger.py
diff --git a/Menu/GameShell/10_Settings/Time/myvars.py b/Menu/GameShell/80_SETTINGS/Time/myvars.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Time/myvars.py
rename to Menu/GameShell/80_SETTINGS/Time/myvars.py
diff --git a/Menu/GameShell/10_Settings/Time/pages.py b/Menu/GameShell/80_SETTINGS/Time/pages.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Time/pages.py
rename to Menu/GameShell/80_SETTINGS/Time/pages.py
diff --git a/Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py b/Menu/GameShell/80_SETTINGS/Time/timezone_lib_list_page.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Time/timezone_lib_list_page.py
rename to Menu/GameShell/80_SETTINGS/Time/timezone_lib_list_page.py
diff --git a/Menu/GameShell/10_Settings/Update/__init__.py b/Menu/GameShell/80_SETTINGS/Update/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Update/__init__.py
rename to Menu/GameShell/80_SETTINGS/Update/__init__.py
diff --git a/Menu/GameShell/10_Settings/Wifi/__init__.py b/Menu/GameShell/80_SETTINGS/Wifi/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Wifi/__init__.py
rename to Menu/GameShell/80_SETTINGS/Wifi/__init__.py
diff --git a/Menu/GameShell/10_Settings/Wifi/myvars.py b/Menu/GameShell/80_SETTINGS/Wifi/myvars.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Wifi/myvars.py
rename to Menu/GameShell/80_SETTINGS/Wifi/myvars.py
diff --git a/Menu/GameShell/10_Settings/Wifi/net_item.py b/Menu/GameShell/80_SETTINGS/Wifi/net_item.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Wifi/net_item.py
rename to Menu/GameShell/80_SETTINGS/Wifi/net_item.py
diff --git a/Menu/GameShell/10_Settings/Wifi/pages.py b/Menu/GameShell/80_SETTINGS/Wifi/pages.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Wifi/pages.py
rename to Menu/GameShell/80_SETTINGS/Wifi/pages.py
diff --git a/Menu/GameShell/10_Settings/Wifi/wifi_list.py b/Menu/GameShell/80_SETTINGS/Wifi/wifi_list.py
similarity index 100%
rename from Menu/GameShell/10_Settings/Wifi/wifi_list.py
rename to Menu/GameShell/80_SETTINGS/Wifi/wifi_list.py
diff --git a/Menu/GameShell/10_Settings/__init__.py b/Menu/GameShell/80_SETTINGS/__init__.py
similarity index 100%
rename from Menu/GameShell/10_Settings/__init__.py
rename to Menu/GameShell/80_SETTINGS/__init__.py
diff --git a/Menu/GameShell/10_Settings/list_item.py b/Menu/GameShell/80_SETTINGS/list_item.py
similarity index 100%
rename from Menu/GameShell/10_Settings/list_item.py
rename to Menu/GameShell/80_SETTINGS/list_item.py
diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/80_SETTINGS/list_page.py
similarity index 100%
rename from Menu/GameShell/10_Settings/list_page.py
rename to Menu/GameShell/80_SETTINGS/list_page.py
diff --git a/Menu/GameShell/10_Settings/myvars.py b/Menu/GameShell/80_SETTINGS/myvars.py
similarity index 100%
rename from Menu/GameShell/10_Settings/myvars.py
rename to Menu/GameShell/80_SETTINGS/myvars.py
diff --git a/Menu/GameShell/10_Settings/pages.py b/Menu/GameShell/80_SETTINGS/pages.py
similarity index 100%
rename from Menu/GameShell/10_Settings/pages.py
rename to Menu/GameShell/80_SETTINGS/pages.py
diff --git a/skin/default/Menu/GameShell/20_GAMES/99_MISC/CaveStory.png b/skin/default/Menu/GameShell/40_PLAY/99_MISC/CaveStory.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_GAMES/99_MISC/CaveStory.png
rename to skin/default/Menu/GameShell/40_PLAY/99_MISC/CaveStory.png
diff --git a/skin/default/Menu/GameShell/20_GAMES/99_MISC/freeDM.png b/skin/default/Menu/GameShell/40_PLAY/99_MISC/freeDM.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_GAMES/99_MISC/freeDM.png
rename to skin/default/Menu/GameShell/40_PLAY/99_MISC/freeDM.png
diff --git a/skin/default/Menu/GameShell/20_GAMES/MAME.png b/skin/default/Menu/GameShell/40_PLAY/MAME.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_GAMES/MAME.png
rename to skin/default/Menu/GameShell/40_PLAY/MAME.png
diff --git a/skin/default/Menu/GameShell/20_GAMES/MGBA.png b/skin/default/Menu/GameShell/40_PLAY/MGBA.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_GAMES/MGBA.png
rename to skin/default/Menu/GameShell/40_PLAY/MGBA.png
diff --git a/skin/default/Menu/GameShell/20_GAMES/NESTOPIA.png b/skin/default/Menu/GameShell/40_PLAY/NESTOPIA.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_GAMES/NESTOPIA.png
rename to skin/default/Menu/GameShell/40_PLAY/NESTOPIA.png
diff --git a/skin/default/Menu/GameShell/RetroArch.png b/skin/default/Menu/GameShell/40_PLAY/RetroArch.png
similarity index 100%
rename from skin/default/Menu/GameShell/RetroArch.png
rename to skin/default/Menu/GameShell/40_PLAY/RetroArch.png
diff --git a/skin/default/Menu/GameShell/PICO-8.png b/skin/default/Menu/GameShell/50_DEV/PICO-8.png
similarity index 100%
rename from skin/default/Menu/GameShell/PICO-8.png
rename to skin/default/Menu/GameShell/50_DEV/PICO-8.png
diff --git a/skin/default/Menu/GameShell/GAMES.png b/skin/default/Menu/GameShell/PLAY.png
similarity index 100%
rename from skin/default/Menu/GameShell/GAMES.png
rename to skin/default/Menu/GameShell/PLAY.png
diff --git a/skin/default/Menu/GameShell/Settings.png b/skin/default/Menu/GameShell/SETTINGS.png
similarity index 100%
rename from skin/default/Menu/GameShell/Settings.png
rename to skin/default/Menu/GameShell/SETTINGS.png