diff --git a/Package/Environment/Common/collections/Sega Genesis/system_artwork/device.png b/Package/Environment/Common/collections/Sega Genesis/system_artwork/device.png
index fa5ef45..ebae84e 100644
Binary files a/Package/Environment/Common/collections/Sega Genesis/system_artwork/device.png and b/Package/Environment/Common/collections/Sega Genesis/system_artwork/device.png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/credits.txt b/Package/Environment/Common/layouts/Aeon Nox 4x3/credits.txt
deleted file mode 100644
index c2eac4c..0000000
--- a/Package/Environment/Common/layouts/Aeon Nox 4x3/credits.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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 4x3/fonts/BebasNeue.ttf b/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/BebasNeue.ttf
deleted file mode 100644
index 202ccd3..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/BebasNeue.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/MC360.ttf b/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/MC360.ttf
deleted file mode 100644
index e2b7a58..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/MC360.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/OpenSans.ttf b/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/OpenSans.ttf
deleted file mode 100644
index 9872769..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/OpenSans.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/Oswald-Bold.ttf b/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/Oswald-Bold.ttf
deleted file mode 100644
index a77a3d0..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/Oswald-Bold.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/Oswald-Regular.ttf b/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/Oswald-Regular.ttf
deleted file mode 100644
index 0798e24..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/Oswald-Regular.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/RobotoCondensed-Regular.ttf b/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/RobotoCondensed-Regular.ttf
deleted file mode 100644
index c2304c1..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/fonts/RobotoCondensed-Regular.ttf and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/bar.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/bar.png
deleted file mode 100644
index d8d3950..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/bar.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/black.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/black.png
deleted file mode 100644
index ad75f78..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/black.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/floor.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/floor.png
deleted file mode 100644
index f9c4ad6..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/floor.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/infobar1.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/infobar1.png
deleted file mode 100644
index f166bb8..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/infobar1.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/infobar2.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/infobar2.png
deleted file mode 100644
index 0fd4dee..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/infobar2.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/system_info_bg.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/system_info_bg.png
deleted file mode 100644
index 85931fc..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/system_info_bg.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/system_info_overlay.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/system_info_overlay.png
deleted file mode 100644
index 1e24ee1..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/system_info_overlay.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/topbar.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/topbar.png
deleted file mode 100644
index 9e3ce6c..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/topbar.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/video_overlay.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/video_overlay.png
deleted file mode 100644
index 69b831f..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/video_overlay.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/wall.png b/Package/Environment/Common/layouts/Aeon Nox 4x3/images/wall.png
deleted file mode 100644
index 41eff30..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/images/wall.png and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/readme.txt b/Package/Environment/Common/layouts/Aeon Nox 4x3/readme.txt
deleted file mode 100644
index d8de349..0000000
--- a/Package/Environment/Common/layouts/Aeon Nox 4x3/readme.txt
+++ /dev/null
@@ -1,41 +0,0 @@
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- Aeon Nox v1.0
- to be used with retrofe 0.7.2 and above
- http://www.retrofe.com/
- Aeon Nox Theme (C) 2016 David C. Horowitz
- e-mail njdave71@gmail.com
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-| credits.txt Contains public acknowledgment of a person or person's responsibility for this layout.
-| readme.txt This Document contains the directory structure
-| layout.xml Defines the look and feel for your frontend. optimized for 16X9 layout
-| splash.xml Used to display message when the theme is loading the meta.db / plays a intro video
-|
-+---fonts
-| BebasNeue.ttf This is a sans serif font family based on the original Bebas Neue free font by Ryoichi Tsunekawa
-| MC360.ttf This is a Chinese supported font.
-| OpenSans.ttf This is a humanist sans serif typeface designed by Steve Matteson
-| Oswald-Bold.ttf A reworking of the classic style historically represented by the 'Alternate Gothic' sans serif typefaces comes in Bold and Regular
-| Oswald-Regular.ttf Same as above
-| RobotoCondensed-Regular.ttf Roboto has a dual nature. It has a mechanical skeleton and the forms are largely geometric. At the same time, the font features friendly and open curves
-|
-+---images This is a collection of images used to make up the Aeon Nox Theme
-| bar.png
-| black.png
-| floor.png
-| infobar1.png
-| infobar2.png
-| system_info_bg.png
-| system_info_overlay.png
-| topbar.png
-| video_overlay.png
-| wall.png
-|
-+---sounds Sounds that are trigged by action in theme
-| highlight.wav
-| load.wav
-| select.wav
-| unload.wav
-|
-\---video Video that plays at the startup of RetroFE
- intro.mp4
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/highlight.wav b/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/highlight.wav
deleted file mode 100644
index 105a57e..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/highlight.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/load.wav b/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/load.wav
deleted file mode 100644
index 077480e..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/load.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/select.wav b/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/select.wav
deleted file mode 100644
index 3151dee..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/select.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/unload.wav b/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/unload.wav
deleted file mode 100644
index af089a7..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/sounds/unload.wav and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/splash.xml b/Package/Environment/Common/layouts/Aeon Nox 4x3/splash.xml
deleted file mode 100644
index d9a2edb..0000000
--- a/Package/Environment/Common/layouts/Aeon Nox 4x3/splash.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/video/intro.mp4 b/Package/Environment/Common/layouts/Aeon Nox 4x3/video/intro.mp4
deleted file mode 100644
index 03ac6f5..0000000
Binary files a/Package/Environment/Common/layouts/Aeon Nox 4x3/video/intro.mp4 and /dev/null differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/credits.txt b/Package/Environment/Common/layouts/Aeon Nox/credits.txt
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/credits.txt
rename to Package/Environment/Common/layouts/Aeon Nox/credits.txt
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/BebasNeue.ttf b/Package/Environment/Common/layouts/Aeon Nox/fonts/BebasNeue.ttf
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/BebasNeue.ttf
rename to Package/Environment/Common/layouts/Aeon Nox/fonts/BebasNeue.ttf
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/MC360.ttf b/Package/Environment/Common/layouts/Aeon Nox/fonts/MC360.ttf
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/MC360.ttf
rename to Package/Environment/Common/layouts/Aeon Nox/fonts/MC360.ttf
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/OpenSans.ttf b/Package/Environment/Common/layouts/Aeon Nox/fonts/OpenSans.ttf
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/OpenSans.ttf
rename to Package/Environment/Common/layouts/Aeon Nox/fonts/OpenSans.ttf
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/Oswald-Bold.ttf b/Package/Environment/Common/layouts/Aeon Nox/fonts/Oswald-Bold.ttf
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/Oswald-Bold.ttf
rename to Package/Environment/Common/layouts/Aeon Nox/fonts/Oswald-Bold.ttf
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/Oswald-Regular.ttf b/Package/Environment/Common/layouts/Aeon Nox/fonts/Oswald-Regular.ttf
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/Oswald-Regular.ttf
rename to Package/Environment/Common/layouts/Aeon Nox/fonts/Oswald-Regular.ttf
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/RobotoCondensed-Regular.ttf b/Package/Environment/Common/layouts/Aeon Nox/fonts/RobotoCondensed-Regular.ttf
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/fonts/RobotoCondensed-Regular.ttf
rename to Package/Environment/Common/layouts/Aeon Nox/fonts/RobotoCondensed-Regular.ttf
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/bar.png b/Package/Environment/Common/layouts/Aeon Nox/images/bar.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/bar.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/bar.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/black.png b/Package/Environment/Common/layouts/Aeon Nox/images/black.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/black.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/black.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/floor.png b/Package/Environment/Common/layouts/Aeon Nox/images/floor.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/floor.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/floor.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar1.png b/Package/Environment/Common/layouts/Aeon Nox/images/infobar1.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar1.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/infobar1.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar2.png b/Package/Environment/Common/layouts/Aeon Nox/images/infobar2.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/infobar2.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/infobar2.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/system_info_bg.png b/Package/Environment/Common/layouts/Aeon Nox/images/system_info_bg.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/system_info_bg.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/system_info_bg.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/system_info_overlay.png b/Package/Environment/Common/layouts/Aeon Nox/images/system_info_overlay.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/system_info_overlay.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/system_info_overlay.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/topbar.png b/Package/Environment/Common/layouts/Aeon Nox/images/topbar.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/topbar.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/topbar.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/video_overlay.png b/Package/Environment/Common/layouts/Aeon Nox/images/video_overlay.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/video_overlay.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/video_overlay.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/images/wall.png b/Package/Environment/Common/layouts/Aeon Nox/images/wall.png
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/images/wall.png
rename to Package/Environment/Common/layouts/Aeon Nox/images/wall.png
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/layout.xml b/Package/Environment/Common/layouts/Aeon Nox/layout 16x9.xml
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/layout.xml
rename to Package/Environment/Common/layouts/Aeon Nox/layout 16x9.xml
diff --git a/Package/Environment/Common/layouts/Aeon Nox 4x3/layout.xml b/Package/Environment/Common/layouts/Aeon Nox/layout 4x3.xml
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 4x3/layout.xml
rename to Package/Environment/Common/layouts/Aeon Nox/layout 4x3.xml
diff --git a/Package/Environment/Common/layouts/Aeon Nox/layout.xml b/Package/Environment/Common/layouts/Aeon Nox/layout.xml
new file mode 100644
index 0000000..8c58b82
--- /dev/null
+++ b/Package/Environment/Common/layouts/Aeon Nox/layout.xml
@@ -0,0 +1,1973 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/readme.txt b/Package/Environment/Common/layouts/Aeon Nox/readme.txt
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/readme.txt
rename to Package/Environment/Common/layouts/Aeon Nox/readme.txt
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/highlight.wav b/Package/Environment/Common/layouts/Aeon Nox/sounds/highlight.wav
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/highlight.wav
rename to Package/Environment/Common/layouts/Aeon Nox/sounds/highlight.wav
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/load.wav b/Package/Environment/Common/layouts/Aeon Nox/sounds/load.wav
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/load.wav
rename to Package/Environment/Common/layouts/Aeon Nox/sounds/load.wav
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/select.wav b/Package/Environment/Common/layouts/Aeon Nox/sounds/select.wav
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/select.wav
rename to Package/Environment/Common/layouts/Aeon Nox/sounds/select.wav
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/unload.wav b/Package/Environment/Common/layouts/Aeon Nox/sounds/unload.wav
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/sounds/unload.wav
rename to Package/Environment/Common/layouts/Aeon Nox/sounds/unload.wav
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/splash.xml b/Package/Environment/Common/layouts/Aeon Nox/splash.xml
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/splash.xml
rename to Package/Environment/Common/layouts/Aeon Nox/splash.xml
diff --git a/Package/Environment/Common/layouts/Aeon Nox 16x9/video/intro.mp4 b/Package/Environment/Common/layouts/Aeon Nox/video/intro.mp4
similarity index 100%
rename from Package/Environment/Common/layouts/Aeon Nox 16x9/video/intro.mp4
rename to Package/Environment/Common/layouts/Aeon Nox/video/intro.mp4
diff --git a/Package/Environment/Common/settings.conf b/Package/Environment/Common/settings.conf
index adff97f..c4e30a9 100644
--- a/Package/Environment/Common/settings.conf
+++ b/Package/Environment/Common/settings.conf
@@ -14,7 +14,7 @@
fullscreen = no
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
+layout = Aeon Nox
hideMouse = yes
showParenthesis = yes
showSquareBrackets = yes