diff --git a/Package/Environment/Common/collections/Arcade/system_artwork/logo.png b/Package/Environment/Common/collections/Arcade/system_artwork/logo.png
new file mode 100644
index 0000000..94c1481
Binary files /dev/null and b/Package/Environment/Common/collections/Arcade/system_artwork/logo.png differ
diff --git a/Package/Environment/Common/collections/Arcade/system_artwork/story.txt b/Package/Environment/Common/collections/Arcade/system_artwork/story.txt
new file mode 100644
index 0000000..f1e503e
--- /dev/null
+++ b/Package/Environment/Common/collections/Arcade/system_artwork/story.txt
@@ -0,0 +1 @@
+Multiple Arcade Machine Emulator (MAME) is an emulator application designed to recreate the hardware of arcade game systems in software on modern personal computers and other platforms. The intention is to preserve gaming history by preventing vintage games from being lost or forgotten. The goal of MAME is to be a reference to the inner workings of the emulated arcade machines; the ability to actually play the games is considered "a nice side effect". Joystiq has listed MAME as an application that every gamer should have.
diff --git a/Package/Environment/Common/collections/Arcade/system_artwork/video.mp4 b/Package/Environment/Common/collections/Arcade/system_artwork/video.mp4
new file mode 100644
index 0000000..c3133de
Binary files /dev/null and b/Package/Environment/Common/collections/Arcade/system_artwork/video.mp4 differ
diff --git a/Package/Environment/Common/collections/Main/medium_artwork/fanart/Arcade.png b/Package/Environment/Common/collections/Main/medium_artwork/fanart/Arcade.png
new file mode 100644
index 0000000..e9cd644
Binary files /dev/null and b/Package/Environment/Common/collections/Main/medium_artwork/fanart/Arcade.png differ
diff --git a/Package/Environment/Common/collections/Main/medium_artwork/fanart/Sega Genesis.png b/Package/Environment/Common/collections/Main/medium_artwork/fanart/Sega Genesis.png
new file mode 100644
index 0000000..dc8be4b
Binary files /dev/null and b/Package/Environment/Common/collections/Main/medium_artwork/fanart/Sega Genesis.png differ
diff --git a/Package/Environment/Common/collections/Main/medium_artwork/fanart/default.png b/Package/Environment/Common/collections/Main/medium_artwork/fanart/default.png
new file mode 100644
index 0000000..c38c1ae
Binary files /dev/null and b/Package/Environment/Common/collections/Main/medium_artwork/fanart/default.png differ
diff --git a/Package/Environment/Common/collections/Main/medium_artwork/system_info/Arcade.png b/Package/Environment/Common/collections/Main/medium_artwork/system_info/Arcade.png
new file mode 100644
index 0000000..5f0e592
Binary files /dev/null and b/Package/Environment/Common/collections/Main/medium_artwork/system_info/Arcade.png differ
diff --git a/Package/Environment/Common/collections/Main/medium_artwork/system_info/Sega Genesis.png b/Package/Environment/Common/collections/Main/medium_artwork/system_info/Sega Genesis.png
new file mode 100644
index 0000000..b9cb4a7
Binary files /dev/null and b/Package/Environment/Common/collections/Main/medium_artwork/system_info/Sega Genesis.png differ
diff --git a/Package/Environment/Common/collections/Sega Genesis/medium_artwork/story/Zero Tolerance (USA, Europe).txt b/Package/Environment/Common/collections/Sega Genesis/medium_artwork/story/Zero Tolerance (USA, Europe).txt
new file mode 100644
index 0000000..e742124
--- /dev/null
+++ b/Package/Environment/Common/collections/Sega Genesis/medium_artwork/story/Zero Tolerance (USA, Europe).txt
@@ -0,0 +1,4 @@
+The space station Europe-1 has been overrun by aliens. During one of the fights the nuclear cooling system has been damaged, resulting in a meltdown within hours. Your mission, as a team of five of the toughest persons in the Corps, is to infiltrate and gain control of Europe-1. You must sweep the entire station clean of aliens.
+
+One of a few first-person-shooters on this console. It is required that you kill every single alien on each of the levels (hence the name). The five members of your team, who have different skills, start out with different weapons, are your five chances of seeing this through. This adds a level of strategy to the game.
+
diff --git a/Package/Environment/Common/collections/Sega Genesis/system_artwork/story.txt b/Package/Environment/Common/collections/Sega Genesis/system_artwork/story.txt
new file mode 100644
index 0000000..fc67ebc
--- /dev/null
+++ b/Package/Environment/Common/collections/Sega Genesis/system_artwork/story.txt
@@ -0,0 +1 @@
+The Sega Genesis, a.k.a the Sega Megadrive, is a 16-bit video game console developed by Sega and released in August 1989. It is the third console from Sega, and is the successor to Sega Master System. the hardware was based on Sega's system 16 arcade board. The Genesis primarily competed with the Super Nintendo during its life cycle. By the end of its life, it had sold an estimated 40 million units, and its games continued to be popular among gamers even to these days.
diff --git a/Package/Environment/Common/collections/_manufacturer/Technopop.png b/Package/Environment/Common/collections/_common/medium_artwork/manufacturer/Technopop.png
similarity index 100%
rename from Package/Environment/Common/collections/_manufacturer/Technopop.png
rename to Package/Environment/Common/collections/_common/medium_artwork/manufacturer/Technopop.png
diff --git a/Package/Environment/Common/collections/_common/medium_artwork/rating/HSRS - GA (General Audience).png b/Package/Environment/Common/collections/_common/medium_artwork/rating/HSRS - GA (General Audience).png
new file mode 100644
index 0000000..8fc3b32
Binary files /dev/null and b/Package/Environment/Common/collections/_common/medium_artwork/rating/HSRS - GA (General Audience).png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/Credits.txt b/Package/Environment/Common/layouts/Aeon Nox 16x9/Credits.txt
new file mode 100644
index 0000000..7e6d087
--- /dev/null
+++ b/Package/Environment/Common/layouts/Aeon Nox 16x9/Credits.txt
@@ -0,0 +1,11 @@
+Aeon Nox Theme by David Horowitz (c) 2016)
+Based on Aeon Nox skin from Kodi
+---------------------------------------------------------------------------------
+Intro.mp4
+Music
+Discovery Hit Kevin MacLeod (incompetech.com)
+Licensed under Creative Commons: By Attribution 3.0 License
+http://creativecommons.org/licenses/by/3.0/
+
+
+
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/BebasNeue.ttf b/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/BebasNeue.ttf
new file mode 100644
index 0000000..202ccd3
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/BebasNeue.ttf differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/MC360.ttf b/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/MC360.ttf
new file mode 100644
index 0000000..e2b7a58
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/MC360.ttf differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/OpenSans.ttf b/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/OpenSans.ttf
new file mode 100644
index 0000000..9872769
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/OpenSans.ttf differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/RobotoCondensed-Regular.ttf b/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/RobotoCondensed-Regular.ttf
new file mode 100644
index 0000000..c2304c1
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/RobotoCondensed-Regular.ttf differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/bar.png b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/bar.png
new file mode 100644
index 0000000..8a79f13
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/bar.png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/floor.png b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/floor.png
new file mode 100644
index 0000000..0dbcb84
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/floor.png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar1.png b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar1.png
new file mode 100644
index 0000000..f166bb8
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar1.png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar2.png b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar2.png
new file mode 100644
index 0000000..0fd4dee
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar2.png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/topbar.png b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/topbar.png
new file mode 100644
index 0000000..9e3ce6c
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/topbar.png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/video_overlay.png b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/video_overlay.png
new file mode 100644
index 0000000..34412d8
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/video_overlay.png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/wall.png b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/wall.png
new file mode 100644
index 0000000..437fd04
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/images/wall.png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/layout.xml b/Package/Environment/Common/layouts/Aeon Nox 16x9/layout.xml
new file mode 100644
index 0000000..2ac6636
--- /dev/null
+++ b/Package/Environment/Common/layouts/Aeon Nox 16x9/layout.xml
@@ -0,0 +1,1054 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/highlight.wav b/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/highlight.wav
new file mode 100644
index 0000000..105a57e
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/highlight.wav differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/load.wav b/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/load.wav
similarity index 100%
rename from Package/Environment/Common/layouts/Default 16x9/load.wav
rename to Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/load.wav
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/select.wav b/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/select.wav
new file mode 100644
index 0000000..3151dee
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/select.wav differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/unload.wav b/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/unload.wav
new file mode 100644
index 0000000..af089a7
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/unload.wav differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/splash.xml b/Package/Environment/Common/layouts/Aeon Nox 16x9/splash.xml
similarity index 80%
rename from Package/Environment/Common/layouts/Default 16x9/splash.xml
rename to Package/Environment/Common/layouts/Aeon Nox 16x9/splash.xml
index 5f777f0..d9a2edb 100644
--- a/Package/Environment/Common/layouts/Default 16x9/splash.xml
+++ b/Package/Environment/Common/layouts/Aeon Nox 16x9/splash.xml
@@ -1,9 +1,9 @@
-
+
-
+
+-->
+
+
+
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/video/intro.mp4 b/Package/Environment/Common/layouts/Aeon Nox 16x9/video/intro.mp4
new file mode 100644
index 0000000..03ac6f5
Binary files /dev/null and b/Package/Environment/Common/layouts/Aeon Nox 16x9/video/intro.mp4 differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/Credits.txt b/Package/Environment/Common/layouts/Default 16x9/Credits.txt
deleted file mode 100644
index f6a2307..0000000
--- a/Package/Environment/Common/layouts/Default 16x9/Credits.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Theme by TimmyB
-
-
-------------
-Highlight.wav by orginaljun - orginaljun.deviantart.com
-http://www.freesound.org/people/orginaljun/sounds/157871/
-
diff --git a/Package/Environment/Common/layouts/Default 16x9/LoveloBlack.otf b/Package/Environment/Common/layouts/Default 16x9/LoveloBlack.otf
deleted file mode 100644
index 0135811..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/LoveloBlack.otf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/Roboto-Bold.ttf b/Package/Environment/Common/layouts/Default 16x9/Roboto-Bold.ttf
deleted file mode 100644
index aaf374d..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/Roboto-Bold.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/barbkgrnd.png b/Package/Environment/Common/layouts/Default 16x9/barbkgrnd.png
deleted file mode 100644
index 55d5e26..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/barbkgrnd.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/bkgd.png b/Package/Environment/Common/layouts/Default 16x9/bkgd.png
deleted file mode 100644
index 709cd79..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/bkgd.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/bkgnd.png b/Package/Environment/Common/layouts/Default 16x9/bkgnd.png
deleted file mode 100644
index 0f16b88..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/bkgnd.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/highlight.png b/Package/Environment/Common/layouts/Default 16x9/highlight.png
deleted file mode 100644
index 15292c9..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/highlight.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/highlight.wav b/Package/Environment/Common/layouts/Default 16x9/highlight.wav
deleted file mode 100644
index 517e819..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/highlight.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/infobk.png b/Package/Environment/Common/layouts/Default 16x9/infobk.png
deleted file mode 100644
index aefd8e7..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/infobk.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/layout.xml b/Package/Environment/Common/layouts/Default 16x9/layout.xml
deleted file mode 100644
index 90732e1..0000000
--- a/Package/Environment/Common/layouts/Default 16x9/layout.xml
+++ /dev/null
@@ -1,370 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Package/Environment/Common/layouts/Default 16x9/logo.png b/Package/Environment/Common/layouts/Default 16x9/logo.png
deleted file mode 100644
index 5e7d0f4..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/logo.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/menubk.png b/Package/Environment/Common/layouts/Default 16x9/menubk.png
deleted file mode 100644
index 6170c34..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/menubk.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/select.wav b/Package/Environment/Common/layouts/Default 16x9/select.wav
deleted file mode 100644
index 6678b93..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/select.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/unload.wav b/Package/Environment/Common/layouts/Default 16x9/unload.wav
deleted file mode 100644
index 65f069a..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/unload.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Default 16x9/videobk.png b/Package/Environment/Common/layouts/Default 16x9/videobk.png
deleted file mode 100644
index 9f27435..0000000
Binary files a/Package/Environment/Common/layouts/Default 16x9/videobk.png and /dev/null differ
diff --git a/Package/Environment/Common/settings.conf b/Package/Environment/Common/settings.conf
index c001c15..adff97f 100644
--- a/Package/Environment/Common/settings.conf
+++ b/Package/Environment/Common/settings.conf
@@ -12,9 +12,9 @@
# Display
#######################################
fullscreen = no
-horizontal = 400 # or enter in the screen pixel width (i.e 1024)
-vertical = 300 # or enter in the screen pixel width (i.e 768)
-layout = Default 16x9
+horizontal = stretch # or enter in the screen pixel width (i.e 1024)
+vertical = stretch # or enter in the screen pixel width (i.e 768)
+layout = Aeon Nox 16x9
hideMouse = yes
showParenthesis = yes
showSquareBrackets = yes