         if gameType > kGamePortPeril { gameType = gameType + 6 }
         player!.gamekind = gameType
 
+        // The following are 'standard' games with no special load-out
         if gameType == kGameWarlock { player!.gameName = "The Warlock of Firetop Mountain" }
         if gameType == kGameDeathtrap { player!.gameName = "Deathtrap Dungeon" }
         if gameType == kGameCityThieves { player!.gameName = "City of Thieves" }
-        if gameType == kGameForestDoom { player!.gameName = "Forest of Doom" }
 
         if gameType != kGameCitadel && gameType != kGameTempleTerror {
             // Remove the Magic tab for all but Citadel of Chaos and Temple of Terror
-            heldTabs["magictab"] = magicTab!
-            if tabs.tabViewItems.contains(magicTab) { tabs.removeTabViewItem(magicTab) }
+            heldTabs["magicTabItem"] = magicTabItem!
+            if tabs.tabViewItems.contains(magicTabItem) { tabs.removeTabViewItem(magicTabItem) }
         } else {
             // Add back the Magic tab on the end if necessary
-            if !tabs.tabViewItems.contains(magicTab) { tabs.insertTabViewItem(heldTabs["magictab"]!, at: tabs.tabViewItems.count) }
+            if !tabs.tabViewItems.contains(magicTabItem) { tabs.insertTabViewItem(heldTabs["magicTabItem"]!, at: tabs.tabViewItems.count) }
         }
 
         if statsTabImage != nil {

        icons.append(image!)
        image = NSImage.init(named: NSImage.Name("icon_chainmail"))
        icons.append(image!)
        image = NSImage.init(named: NSImage.Name("icon_scroll"))
        icons.append(image!)
        image = NSImage.init(named: NSImage.Name("icon_book"))

        image = NSImage.init(named: NSImage.Name("icon_tankard"))
        icons.append(image!)
        image = NSImage.init(named: NSImage.Name("icon_fruit"))
        icons.append(image!)
        image = NSImage.init(named: NSImage.Name("icon_fungus"))
        icons.append(image!)

        // House of Hell specific icons
