diff --git a/Toby Doom Launcher.py b/Toby Doom Launcher.py
index 619b721..4ab0eb9 100755
--- a/Toby Doom Launcher.py	
+++ b/Toby Doom Launcher.py	
@@ -1460,7 +1460,7 @@ class DoomLauncher(QMainWindow):
                 mapsDir = self.gamePath / "Addons/MAPS"
                 if mapsDir.exists():
                     mapFiles.extend([p.name for p in mapsDir.glob("*.wad") 
-                                if p.name not in ["TobyDeathArena_V1-5.wad", "Toby-Demo-Level.wad"]])
+                                if p.name not in ["TobyDeathArena_V2-0.wad"]])
 
                 # Add Operation MDK as special case
                 opMDK = self.gamePath / "OpMDK.wad"
@@ -1496,7 +1496,7 @@ class DoomLauncher(QMainWindow):
                     if Path(mapPath).exists():
                         gameFiles.append(mapPath)
 
-                    if selectedMap == "TobyDoomLevels.wad":
+                    if selectedMap == "TobyDoomLevels.pk3":
                         musicRenamer = self.gamePath / "Toby-Doom-Level-Music-Renamer.pk3"
                         if musicRenamer.exists():
                             gameFiles.append(str(musicRenamer))
@@ -1911,9 +1911,6 @@ class DoomLauncher(QMainWindow):
     def populate_game_list(self):
         """Populate the game selection combo box"""
         gameList = [
-            "Toby Demo Map",
-            "Tutorial",
-            "Funny Pack - Demo Map",
             "Classic Doom",
             "Funny Pack - Classic Doom",
             "Toby Doom",
@@ -2063,12 +2060,8 @@ class DoomLauncher(QMainWindow):
                 baseFiles.append(str(self.gamePath / "Addons/MAPS/TobyHexen.pk3"))
         else:  # Doom games
             gameType = "DOOM"
-            if "Demo Map" in selectedGame:
-                baseFiles.append(str(self.gamePath / "Addons/MAPS/Toby-Demo-Level_V2_ALT.wad"))
-            elif "Tutorial" in selectedGame:
-                baseFiles.append(str(self.gamePath / "Addons/MAPS/TobyTutorial-V2.wad"))
-            elif "Toby Doom" in selectedGame:
-                baseFiles.append(str(self.gamePath / "Addons/MAPS/TobyDoomLevels.wad"))
+            if "Toby Doom" in selectedGame:
+                baseFiles.append(str(self.gamePath / "Addons/MAPS/TobyDoomLevels.pk3"))
                 musicRenamer = self.gamePath / "Toby-Doom-Level-Music-Renamer.pk3"
                 if musicRenamer.exists() and not isFunnyPack:
                     baseFiles.append(str(musicRenamer))
@@ -2330,7 +2323,7 @@ class DoomLauncher(QMainWindow):
                 mapsDir = self.gamePath / "Addons/MAPS"
                 if mapsDir.exists():
                     mapFiles.extend([p.name for p in mapsDir.glob("*.wad") 
-                                if p.name not in ["TobyDeathArena_V1-5.wad", "Toby-Demo-Level.wad"]])
+                                if p.name not in ["TobyDeathArena_V2-0.wad"]])
 
                 # Add Operation MDK as special case
                 opMDK = self.gamePath / "OpMDK.wad"
@@ -2380,7 +2373,7 @@ class DoomLauncher(QMainWindow):
                     if Path(mapPath).exists():
                         gameFiles.append(mapPath)
 
-                    if selectedMap == "TobyDoomLevels.wad":
+                    if selectedMap == "TobyDoomLevels.pk3":
                         musicRenamer = self.gamePath / "Toby-Doom-Level-Music-Renamer.pk3"
                         if musicRenamer.exists():
                             gameFiles.append(str(musicRenamer))