diff --git a/Package/Environment/Common/collections/Arcade/settings.conf b/Package/Environment/Common/collections/Arcade/settings.conf
index f92d150..a39ba49 100644
--- a/Package/Environment/Common/collections/Arcade/settings.conf
+++ b/Package/Environment/Common/collections/Arcade/settings.conf
@@ -6,7 +6,7 @@
 # If BASE_ITEM_PATH=D:/ROMs and the name of this collection is named "Arcade"
 # then the configuration below will search in D:/ROMs/Arcade
 ###############################################################################
-list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
+#list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%/roms
 
 ###############################################################################
 # Extensions are comma separated without spaces
@@ -16,7 +16,7 @@ list.extensions = zip
 ###############################################################################
 # The executable to run when an item in a collection item is selected
 ###############################################################################
-launcher = MAME
+launcher = mame
 
 ###############################################################################
 # On default, MAME roms are not clearly named. We need to use the MAME 
@@ -25,24 +25,17 @@ launcher = MAME
 metadata.type = MAME
 
 ###############################################################################
-# Uncomment and edit the following line to override the global Settings layout
-###############################################################################
-# layout = Default
-
-###############################################################################
-# Media paths on default scan for artwork:
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Video
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Title
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Snap
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Box
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Cart   
+# Default media paths to scan for artwork. Uncomment and edit to override
+# the default values.
 #
-# This is done to help enforce a consistent directory stucture and streamline
-# the configuration process. To individually override artwork, uncomment and 
-# edit the lines below:
+# media.screenshot    = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/screenshot
+# media.screentitle   = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/screentitle
+# media.artwork_back  = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/artwork_back
+# media.artwork_front = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/artwork_front
+# media.logo          = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/logo 
+# media.medium_back   = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/medium_back
+# media.medium_front  = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/medium_front
+# media.screenshot    = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/screenshot
+# media.screentitle   = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/screentitle
+# media.video         = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/video
 ###############################################################################
-# media.video = ../Media/%ITEM_COLLECTION_NAME%/Video
-# media.title = ../Media/%ITEM_COLLECTION_NAME%/Title
-# media.snap = ../Media/%ITEM_COLLECTION_NAME%/Snap
-# media.box = ../Media/%ITEM_COLLECTION_NAME%/Box
-# media.cart = ../Media/%ITEM_COLLECTION_NAME%/Cart
diff --git a/Package/Environment/Common/collections/Main/settings.conf b/Package/Environment/Common/collections/Main/settings.conf
index 6b50e8c..4756a24 100644
--- a/Package/Environment/Common/collections/Main/settings.conf
+++ b/Package/Environment/Common/collections/Main/settings.conf
@@ -3,4 +3,4 @@
 # collections (although this can also be configured to list and launch items). 
 # See Menu.xml to configure the menu
 ###############################################################################
-layout = Showcase 16x9
+
diff --git a/Package/Environment/Common/collections/Nintendo Entertainment System/settings.conf b/Package/Environment/Common/collections/Nintendo Entertainment System/settings.conf
index 8b19b7b..fe49884 100644
--- a/Package/Environment/Common/collections/Nintendo Entertainment System/settings.conf	
+++ b/Package/Environment/Common/collections/Nintendo Entertainment System/settings.conf	
@@ -7,7 +7,7 @@
 # Entertainment System" then the configuration below will search in 
 # "D:/ROMs/Nintendo Entertainment System"
 ###############################################################################
-list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
+# list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%/roms
 
 ###############################################################################
 # Extensions are comma separated without spaces
@@ -17,27 +17,20 @@ list.extensions = zip
 ###############################################################################
 # The executable to run when an item in a collection item is selected
 ###############################################################################
-launcher = Nestopia
+launcher = nestopia
 
 ###############################################################################
-# Uncomment and edit the following line to override the global Settings layout
-###############################################################################
-# layout = Default
-
-###############################################################################
-# Media paths on default scan for artwork:
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Video
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Title
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Snap
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Box
-# %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/Cart   
+# Default media paths to scan for artwork. Uncomment and edit to override
+# the default values.
 #
-# This is done to help enforce a consistent directory stucture and streamline
-# the configuration process. To individually override artwork, uncomment and 
-# edit the lines below:
+# media.screenshot    = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/screenshot
+# media.screentitle   = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/screentitle
+# media.artwork_back  = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/artwork_back
+# media.artwork_front = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/artwork_front
+# media.logo          = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/logo 
+# media.medium_back   = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/medium_back
+# media.medium_front  = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/medium_front
+# media.screenshot    = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/screenshot
+# media.screentitle   = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/screentitle
+# media.video         = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/medium_artwork/video
 ###############################################################################
-# media.video = ../Media/%COLLECTION_NAME%/Video
-# media.title = ../Media/%COLLECTION_NAME%/Title
-# media.snap = ../Media/%COLLECTION_NAME%/Snap
-# media.box = ../Media/%COLLECTION_NAME%/Box
-# media.cart = ../Media/%COLLECTION_NAME%/Cart