diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/exclude.txt b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/exclude.txt
new file mode 100644
index 0000000..e69de29
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/include.txt b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/include.txt
new file mode 100644
index 0000000..6215cea
--- /dev/null
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/include.txt	
@@ -0,0 +1,3 @@
+# Add a list of files to show on the menu (one filename per line, without the extension).
+# If no items are in this list then all files in the folder specified
+# by settings.conf will be used
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/menu.txt b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/menu.txt
new file mode 100644
index 0000000..e69de29
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/settings.conf
new file mode 100644
index 0000000..8ffc665
--- /dev/null
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/settings.conf	
@@ -0,0 +1,21 @@
+# Uncomment and edit the following line to use a different ROM path.
+list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
+list.includeMissingItems = false
+list.extensions = gbc
+list.menuSort = yes
+
+launcher = gameboy
+#metadata.type = MAME
+
+
+#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_ITEM_PATH%/%ITEM_COLLECTION_NAME%
+#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.system_artwork  = %BASE_MEDIA_PATH%/%ITEM_COLLECTION_NAME%/system_artwork
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/device.png b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/device.png
new file mode 100755
index 0000000..dfb728e
Binary files /dev/null and b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/device.png differ
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/device_original.png b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/device_original.png
new file mode 100755
index 0000000..c9cee87
Binary files /dev/null and b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/device_original.png differ
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/fallback.png b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/fallback.png
new file mode 100755
index 0000000..a55b0b3
Binary files /dev/null and b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/fallback.png differ
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/logo.png b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/logo.png
new file mode 100755
index 0000000..0513975
Binary files /dev/null and b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/system_artwork/logo.png differ
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy/settings.conf
index 54db9a1..2237286 100644
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy/settings.conf	
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy/settings.conf	
@@ -1,7 +1,7 @@
 # Uncomment and edit the following line to use a different ROM path.
 list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
 list.includeMissingItems = false
-list.extensions = gb,gbc
+list.extensions = gb
 list.menuSort = yes
 
 launcher = gameboy
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Main/menu.txt b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Main/menu.txt
index 17fc0c8..32d89c3 100644
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Main/menu.txt
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Main/menu.txt
@@ -1,4 +1,5 @@
 Game Boy
+Game Boy Color
 Game Boy Advance
 NES
 SNES
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/SNES/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/SNES/settings.conf
index af2b0d2..0ea277e 100644
--- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/SNES/settings.conf
+++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/SNES/settings.conf
@@ -1,7 +1,7 @@
 # Uncomment and edit the following line to use a different ROM path.
 list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
 list.includeMissingItems = false
-list.extensions = sfc
+list.extensions = sfc,smc
 list.menuSort = yes
 
 launcher = snes
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
index 7e2df58..b7ddbd3 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
@@ -48,7 +48,7 @@ mount_share () {
     fi
 
     # Create the directory structure if required
-    (cd /mnt; mkdir -p "Atari lynx" "Game Boy" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan")
+    (cd /mnt; mkdir -p "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan")
     return 0
 }
 
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/signal_usr1_to_emulators b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/signal_usr1_to_emulators
index 0a8cd09..ef82ca7 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/signal_usr1_to_emulators
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/signal_usr1_to_emulators
@@ -11,7 +11,10 @@ if [[ -f /mnt/.assembly_tests ]]; then
 	killall -s USR1 funkey_prod_screens > /dev/null 2>&1
 fi
 
-# Send signal to all emulators
-killall -s USR1 pcsx mednafen gpsp psnes sdlgnuboy PicoDriveBin > /dev/null 2>&1
+# Send signal to all PCSX first (time critical)
+killall -s USR1 pcsx > /dev/null 2>&1
+
+# Send signal to all other emulators
+killall -s USR1 gpsp psnes sdlgnuboy PicoDriveBin mednafen > /dev/null 2>&1
 
 exit 0