diff --git a/Toby Doom Launcher.py b/Toby Doom Launcher.py
index a770899..e5273e4 100755
--- a/Toby Doom Launcher.py	
+++ b/Toby Doom Launcher.py	
@@ -1745,6 +1745,11 @@ class DoomLauncher(QMainWindow):
                 if opMDK.exists():
                     mapFiles.append("OpMDK.wad")
 
+                # Add BBT90s-TobyEdition as special case
+                bbt90s = self.gamePath / "BBT90s-TobyEdition.wad"
+                if bbt90s.exists():
+                    mapFiles.append("BBT90s-TobyEdition.wad")
+
                 mapDialog = QDialog(self)
                 mapDialog.setWindowTitle("Select Map")
                 dialogLayout = QVBoxLayout(mapDialog)
@@ -1767,7 +1772,7 @@ class DoomLauncher(QMainWindow):
 
                 selectedMap = mapCombo.currentText()
                 if selectedMap != "None":
-                    if selectedMap == "OpMDK.wad":
+                    if selectedMap in ["OpMDK.wad", "BBT90s-TobyEdition.wad"]:
                         mapPath = str(self.gamePath / selectedMap)
                     else:
                         mapPath = str(self.gamePath / "Addons/MAPS" / selectedMap)
@@ -2297,9 +2302,9 @@ class DoomLauncher(QMainWindow):
         
         # Map internal names to user-friendly names
         provider_names = {
-            "accessible_output2": "Accessible Output2",
-            "orca_remote": "Orca Remote",
-            "cthulhu_remote": "Cthulhu Remote",
+            "accessible_output2": "Accessible Output 2",
+            "orca_remote": "Orca",
+            "cthulhu_remote": "Cthulhu",
             "speechd": "Speech Dispatcher"
         }
         
@@ -2925,6 +2930,11 @@ class DoomLauncher(QMainWindow):
                 if opMDK.exists():
                     mapFiles.append("OpMDK.wad")
 
+                # Add BBT90s-TobyEdition as special case
+                bbt90s = self.gamePath / "BBT90s-TobyEdition.wad"
+                if bbt90s.exists():
+                    mapFiles.append("BBT90s-TobyEdition.wad")
+
                 mapDialog = QDialog(self)
                 mapDialog.setWindowTitle("Select Map")
                 dialogLayout = QVBoxLayout(mapDialog)
@@ -2961,7 +2971,7 @@ class DoomLauncher(QMainWindow):
 
                 selectedMap = mapCombo.currentText()
                 if selectedMap != "None":
-                    if selectedMap == "OpMDK.wad":
+                    if selectedMap in ["OpMDK.wad", "BBT90s-TobyEdition.wad"]:
                         mapPath = str(self.gamePath / selectedMap)
                     else:
                         mapPath = str(self.gamePath / "Addons/MAPS" / selectedMap)