diff --git a/configure.py b/configure.py
index c9400d4c..0f688e6d 100755
--- a/configure.py
+++ b/configure.py
@@ -699,8 +699,8 @@ config.libs = [
             Object(NonMatching, "MetroidPrime/Enemies/CBabygoth.cpp"),
             Object(NonMatching, "MetroidPrime/Enemies/CEyeBall.cpp"),
             Object(NonMatching, "MetroidPrime/CIkChain.cpp"),
-            Object(MatchingFor("GM8E01_00"), "MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.cpp"),
-            Object(MatchingFor("GM8E01_00"), "MetroidPrime/RumbleFxTable.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/RumbleFxTable.cpp"),
             Object(NonMatching, "MetroidPrime/Enemies/CElitePirate.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/CRumbleManager.cpp"),
             Object(NonMatching, "MetroidPrime/Enemies/CBouncyGrenade.cpp"),
@@ -827,7 +827,7 @@ config.libs = [
             Object(NonMatching, "GuiSys/CGuiTextSupport.cpp"),
             Object(NonMatching, "GuiSys/CGuiWidget.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "GuiSys/CGuiWidgetIdDB.cpp"),
-            Object(MatchingFor("GM8E01_00"), "GuiSys/CGuiWidgetDrawParms.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "GuiSys/CGuiWidgetDrawParms.cpp"),
             Object(NonMatching, "GuiSys/CAuiEnergyBarT01.cpp"),
             Object(NonMatching, "GuiSys/CAuiImagePane.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "GuiSys/CRepeatState.cpp"),
@@ -943,10 +943,10 @@ config.libs = [
             Object(NonMatching, "Kyoto/Text/CWordInstruction.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Text/CBlockInstruction.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Text/CFont.cpp"),
-            Object(MatchingFor("GM8E01_00"), "Kyoto/Graphics/CLight.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Graphics/CLight.cpp"),
             Object(NonMatching, "Kyoto/Graphics/CCubeModel.cpp"),
-            Object(MatchingFor("GM8E01_00"), "Kyoto/Graphics/CGX.cpp"),
-            Object(MatchingFor("GM8E01_00"), "Kyoto/Graphics/CTevCombiners.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Graphics/CGX.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Graphics/CTevCombiners.cpp"),
             Object(NonMatching, "Kyoto/Graphics/DolphinCGraphics.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Graphics/DolphinCPalette.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Graphics/DolphinCTexture.cpp"),
@@ -960,7 +960,7 @@ config.libs = [
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CVector2f.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CVector2i.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CVector3d.cpp"),
-            Object(MatchingFor("GM8E01_00"), "Kyoto/Math/CVector3f.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CVector3f.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CVector3i.cpp"),
             Object(NonMatching, "Kyoto/Math/RMathUtils.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/CCrc32.cpp"),
@@ -1035,7 +1035,7 @@ config.libs = [
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/CARAMManager.cpp"),
             Object(NonMatching, "Kyoto/Math/CFrustumPlanes.cpp"),
             Object(NonMatching, "Kyoto/Graphics/CCubeMaterial.cpp"),
-            Object(MatchingFor("GM8E01_00"), "Kyoto/Graphics/CCubeSurface.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Graphics/CCubeSurface.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Animation/CCharAnimTime.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Animation/CSegIdList.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Input/CFinalInput.cpp"),