diff --git a/.gitmodules b/.gitmodules
index a46312e..31e690b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,9 @@
 [submodule "controller-setup"]
 	path = controller-setup
 	url = https://github.com/ssilverm/controller-setup
+[submodule "emulators-piplay"]
+	path = emulators-piplay
+	url = https://github.com/ssilverm/emulators-piplay
+[submodule "emulators"]
+	path = emulators
+	url = https://github.com/ssilverm/emulators-piplay
diff --git a/controller-setup b/controller-setup
index 1397150..02dc7a0 160000
--- a/controller-setup
+++ b/controller-setup
@@ -1 +1 @@
-Subproject commit 1397150a664e71ce8192ceb8b8e8f3f8a4b8bee8
+Subproject commit 02dc7a0dd7b4af0647716a909ec16bd049043f72
diff --git a/emulators b/emulators
new file mode 160000
index 0000000..f3048d2
--- /dev/null
+++ b/emulators
@@ -0,0 +1 @@
+Subproject commit f3048d2ed4f4c518c2a9aebe900fe379ee172730
diff --git a/pimame-menu b/pimame-menu
index df65e9b..f3b5dd3 160000
--- a/pimame-menu
+++ b/pimame-menu
@@ -1 +1 @@
-Subproject commit df65e9be391ad97644756a2a98093adade24cc85
+Subproject commit f3b5dd331749ad183dff3424c4a3a20cb8d64f0f