diff --git a/core/assets/data/games.json b/core/assets/data/games.json
index e53c63d92..30ed25d8e 100644
--- a/core/assets/data/games.json
+++ b/core/assets/data/games.json
@@ -17,6 +17,7 @@
   "fanClub",
   "fillbots",
   "frogHop",
+  "gleeClub",
   "karateMan",
   "launchParty",
   "lockstep",
@@ -31,6 +32,7 @@
   "rhythmTweezers",
   "ringside",
   "samuraiSliceDS",
+  "screwbotFactory",
   "shootEmUp",
   "shrimpShuffle",
   "sickBeats",
diff --git a/core/assets/sounds/cues/gleeClub/baton.wav b/core/assets/sounds/cues/gleeClub/baton.wav
new file mode 100644
index 000000000..bb0a7c975
Binary files /dev/null and b/core/assets/sounds/cues/gleeClub/baton.wav differ
diff --git a/core/assets/sounds/cues/gleeClub/batonStop.ogg b/core/assets/sounds/cues/gleeClub/batonStop.ogg
new file mode 100644
index 000000000..50c8262cd
Binary files /dev/null and b/core/assets/sounds/cues/gleeClub/batonStop.ogg differ
diff --git a/core/assets/sounds/cues/gleeClub/data.json b/core/assets/sounds/cues/gleeClub/data.json
index ca7f7e680..4bce15eef 100644
--- a/core/assets/sounds/cues/gleeClub/data.json
+++ b/core/assets/sounds/cues/gleeClub/data.json
@@ -52,6 +52,17 @@
       "introSound": "gleeClub/screamBegin",
       "canAlterPitch": true,
       "name": "scream"
+    },
+    {
+      "id": "gleeClub/baton",
+      "duration": 1,
+      "name": "baton - lift",
+      "fileExtension": "wav"
+    },
+    {
+      "id": "gleeClub/batonStop",
+      "duration": 1,
+      "name": "baton - stop"
     }
   ],
   "patterns": [
@@ -84,6 +95,20 @@
           "beat": 3
         }
       ]
+    },
+    {
+      "id": "gleeClub_baton",
+      "name": "baton",
+      "cues": [
+        {
+          "id": "gleeClub/baton",
+          "beat": 0
+        },
+        {
+          "id": "gleeClub/batonStop",
+          "beat": 1
+        }
+      ]
     }
   ]
 }
diff --git a/core/assets/sounds/cues/screwbotFactory/data.json b/core/assets/sounds/cues/screwbotFactory/data.json
new file mode 100644
index 000000000..e98ce2d9b
--- /dev/null
+++ b/core/assets/sounds/cues/screwbotFactory/data.json
@@ -0,0 +1,151 @@
+{
+  "gameID": "screwbotFactory",
+  "gameName": "Screwbot Factory",
+  "series": "fever",
+  "cues": [
+    {
+      "id": "screwbotFactory/clankclank1",
+      "duration": 0.5,
+      "name": "black - crane - 1"
+    },
+    {
+      "id": "screwbotFactory/clankclank2",
+      "duration": 0.5,
+      "name": "black - crane - 2"
+    },
+    {
+      "id": "screwbotFactory/ohyeahPlace",
+      "duration": 1,
+      "name": "black - drop"
+    },
+    {
+      "id": "screwbotFactory/ohyeahStart",
+      "duration": 0.000001
+    },
+    {
+      "id": "screwbotFactory/screwingOhYeah",
+      "duration": 2,
+      "name": "black - screw",
+      "introSound": "screwbotFactory/ohyeahStart",
+      "loops": true,
+      "canAlterDuration": false
+    },
+    {
+      "id": "screwbotFactory/complete",
+      "duration": 0.5,
+      "name": "complete"
+    },
+    {
+      "id": "screwbotFactory/oh",
+      "duration": 0.5,
+      "name": "black - finish - 1"
+    },
+    {
+      "id": "screwbotFactory/yeah",
+      "duration": 0.5,
+      "name": "black - finish - 2"
+    },
+    {
+      "id": "screwbotFactory/whiteCrane",
+      "duration": 0.5,
+      "name": "white - crane"
+    },
+    {
+      "id": "screwbotFactory/letsgoPlace",
+      "duration": 1,
+      "name": "white - drop"
+    },
+    {
+      "id": "screwbotFactory/letsgoStart",
+      "duration": 0.000001
+    },
+    {
+      "id": "screwbotFactory/screwingLetsGo",
+      "duration": 1,
+      "name": "white - screw",
+      "introSound": "screwbotFactory/letsgoStart",
+      "loops": true,
+      "canAlterDuration": false
+    },
+    {
+      "id": "screwbotFactory/lets",
+      "duration": 0.5,
+      "name": "white - finish - 1"
+    },
+    {
+      "id": "screwbotFactory/go",
+      "duration": 0.5,
+      "name": "white - finish - 2"
+    }
+  ],
+  "patterns": [
+    {
+      "id": "screwbotFactory_blackRobot",
+      "name": "black robot",
+      "cues": [
+        {
+          "id": "screwbotFactory/clankclank1",
+          "beat": 0
+        },
+        {
+          "id": "screwbotFactory/clankclank2",
+          "beat": 0.5
+        },
+        {
+          "id": "screwbotFactory/ohyeahPlace",
+          "beat": 2
+        },
+        {
+          "id": "screwbotFactory/screwingOhYeah",
+          "beat": 3
+        },
+        {
+          "id": "screwbotFactory/complete",
+          "beat": 5
+        },
+        {
+          "id": "screwbotFactory/oh",
+          "beat": 5.5
+        },
+        {
+          "id": "screwbotFactory/yeah",
+          "beat": 6
+        }
+      ]
+    },
+    {
+      "id": "screwbotFactory_whiteRobot",
+      "name": "white robot",
+      "cues": [
+        {
+          "id": "screwbotFactory/whiteCrane",
+          "beat": 0
+        },
+        {
+          "id": "screwbotFactory/whiteCrane",
+          "beat": 0.5
+        },
+        {
+          "id": "screwbotFactory/letsgoPlace",
+          "beat": 2
+        },
+        {
+          "id": "screwbotFactory/screwingLetsGo",
+          "beat": 3
+        },
+        {
+          "id": "screwbotFactory/complete",
+          "beat": 4
+        },
+        {
+          "id": "screwbotFactory/lets",
+          "beat": 4.5
+        },
+        {
+          "id": "screwbotFactory/go",
+          "beat": 5
+        }
+      ]
+    }
+  ]
+}
diff --git a/core/assets/sounds/cues/screwbotFactory/whiteCrane.ogg b/core/assets/sounds/cues/screwbotFactory/whiteCrane.ogg
new file mode 100644
index 000000000..7bea52f91
Binary files /dev/null and b/core/assets/sounds/cues/screwbotFactory/whiteCrane.ogg differ
diff --git a/core/assets/sounds/cues/tangotronic3000/data.json b/core/assets/sounds/cues/tangotronic3000/data.json
index a064e9cdd..2e26de654 100644
--- a/core/assets/sounds/cues/tangotronic3000/data.json
+++ b/core/assets/sounds/cues/tangotronic3000/data.json
@@ -46,12 +46,14 @@
     {
       "id": "tangotronic3000/ready1",
       "duration": 1,
-      "name": "ready - 1"
+      "name": "ready - 1",
+      "fileExtension": "wav"
     },
     {
       "id": "tangotronic3000/ready2",
       "duration": 1,
-      "name": "ready - 2"
+      "name": "ready - 2",
+      "fileExtension": "wav"
     },
     {
       "id": "tangotronic3000/twirlStart",
diff --git a/core/assets/sounds/cues/tangotronic3000/ready1.ogg b/core/assets/sounds/cues/tangotronic3000/ready1.ogg
deleted file mode 100644
index dc708dfe8..000000000
Binary files a/core/assets/sounds/cues/tangotronic3000/ready1.ogg and /dev/null differ
diff --git a/core/assets/sounds/cues/tangotronic3000/ready1.wav b/core/assets/sounds/cues/tangotronic3000/ready1.wav
new file mode 100644
index 000000000..56578856c
Binary files /dev/null and b/core/assets/sounds/cues/tangotronic3000/ready1.wav differ
diff --git a/core/assets/sounds/cues/tangotronic3000/ready2.ogg b/core/assets/sounds/cues/tangotronic3000/ready2.ogg
deleted file mode 100644
index df549af90..000000000
Binary files a/core/assets/sounds/cues/tangotronic3000/ready2.ogg and /dev/null differ
diff --git a/core/assets/sounds/cues/tangotronic3000/ready2.wav b/core/assets/sounds/cues/tangotronic3000/ready2.wav
new file mode 100644
index 000000000..31a48df54
Binary files /dev/null and b/core/assets/sounds/cues/tangotronic3000/ready2.wav differ