diff --git a/game/event/event.py b/game/event/event.py
index 8cc4aea7..44fc37e2 100644
--- a/game/event/event.py
+++ b/game/event/event.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import logging
 import math
-from typing import Dict, List, Optional, Type, TYPE_CHECKING
+from typing import Dict, List, Optional, TYPE_CHECKING, Type
 
 from dcs.mapping import Point
 from dcs.task import Task
@@ -12,8 +12,8 @@ from game import db, persistency
 from game.debriefing import Debriefing
 from game.infos.information import Information
 from game.operation.operation import Operation
+from game.theater import ControlPoint
 from gen.ground_forces.combat_stance import CombatStance
-from theater import ControlPoint
 
 if TYPE_CHECKING:
     from ..game import Game
diff --git a/game/game.py b/game/game.py
index e9cc42fc..44c0ef3e 100644
--- a/game/game.py
+++ b/game/game.py
@@ -202,12 +202,6 @@ class Game:
         LuaPluginManager.load_settings(self.settings)
         ObjectiveDistanceCache.set_theater(self.theater)
 
-        # Save game compatibility.
-
-        # TODO: Remove in 2.3.
-        if not hasattr(self, "conditions"):
-            self.conditions = self.generate_conditions()
-
     def pass_turn(self, no_action: bool = False) -> None:
         logging.info("Pass turn")
         self.informations.append(Information("End of turn #" + str(self.turn), "-" * 40, 0))
diff --git a/game/inventory.py b/game/inventory.py
index 89f5afa1..67c09618 100644
--- a/game/inventory.py
+++ b/game/inventory.py
@@ -1,11 +1,15 @@
 """Inventory management APIs."""
+from __future__ import annotations
+
 from collections import defaultdict
-from typing import Dict, Iterable, Iterator, Set, Tuple
+from typing import Dict, Iterable, Iterator, Set, Tuple, TYPE_CHECKING
 
 from dcs.unittype import UnitType
 
 from gen.flights.flight import Flight
-from theater import ControlPoint
+
+if TYPE_CHECKING:
+    from game.theater import ControlPoint
 
 
 class ControlPointAircraftInventory:
diff --git a/game/models/frontline_data.py b/game/models/frontline_data.py
index 94947135..586ebd58 100644
--- a/game/models/frontline_data.py
+++ b/game/models/frontline_data.py
@@ -1,4 +1,4 @@
-from theater import ControlPoint
+from game.theater import ControlPoint
 
 
 class FrontlineData:
diff --git a/game/operation/operation.py b/game/operation/operation.py
index 0ff06ebe..1e01065b 100644
--- a/game/operation/operation.py
+++ b/game/operation/operation.py
@@ -15,6 +15,7 @@ from dcs.triggers import TriggerStart
 from dcs.unittype import UnitType
 
 from game.plugins import LuaPluginManager
+from game.theater import ControlPoint
 from gen import Conflict, FlightType, VisualGenerator
 from gen.aircraft import AIRCRAFT_DATA, AircraftConflictGenerator, FlightData
 from gen.airfields import AIRFIELD_DATA
@@ -29,7 +30,6 @@ from gen.kneeboard import KneeboardGenerator
 from gen.radios import RadioFrequency, RadioRegistry
 from gen.tacan import TacanRegistry
 from gen.triggergen import TRIGGER_RADIUS_MEDIUM, TriggersGenerator
-from theater import ControlPoint
 from .. import db
 from ..debriefing import Debriefing
 
diff --git a/game/theater/frontline.py b/game/theater/frontline.py
deleted file mode 100644
index 3b57f9b6..00000000
--- a/game/theater/frontline.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Only here to keep compatibility for save games generated in version 2.2.0"""
diff --git a/game/theater/start_generator.py b/game/theater/start_generator.py
index ed30750b..c5232a32 100644
--- a/game/theater/start_generator.py
+++ b/game/theater/start_generator.py
@@ -39,10 +39,11 @@ from gen.sam.sam_group_generator import (
     generate_anti_air_group,
     generate_ewr_group, generate_shorad_group,
 )
-from theater import (
+from . import (
     ConflictTheater,
     ControlPoint,
-    ControlPointType, OffMapSpawn,
+    ControlPointType,
+    OffMapSpawn,
 )
 
 GroundObjectTemplates = Dict[str, Dict[str, Any]]
diff --git a/game/weather.py b/game/weather.py
index d6775614..e8efd6e7 100644
--- a/game/weather.py
+++ b/game/weather.py
@@ -10,7 +10,7 @@ from typing import Optional
 from dcs.weather import Weather as PydcsWeather, Wind
 
 from game.settings import Settings
-from theater import ConflictTheater
+from game.theater import ConflictTheater
 
 
 class TimeOfDay(Enum):
diff --git a/gen/aircraft.py b/gen/aircraft.py
index 13de2c05..f3690915 100644
--- a/gen/aircraft.py
+++ b/gen/aircraft.py
@@ -70,6 +70,12 @@ from dcs.unittype import FlyingType, UnitType
 from game import db
 from game.data.cap_capabilities_db import GUNFIGHTERS
 from game.settings import Settings
+from game.theater.controlpoint import (
+    ControlPoint,
+    ControlPointType,
+    OffMapSpawn,
+)
+from game.theater.theatergroundobject import TheaterGroundObject
 from game.utils import knots_to_kph, nm_to_meter
 from gen.airsupportgen import AirSupport
 from gen.ato import AirTaskingOrder, Package
@@ -83,12 +89,6 @@ from gen.flights.flight import (
 )
 from gen.radios import MHz, Radio, RadioFrequency, RadioRegistry, get_radio
 from gen.runways import RunwayData
-from theater import TheaterGroundObject
-from game.theater.controlpoint import (
-    ControlPoint,
-    ControlPointType,
-    OffMapSpawn,
-)
 from .conflictgen import Conflict
 from .flights.flightplan import (
     CasFlightPlan,
diff --git a/gen/conflictgen.py b/gen/conflictgen.py
index 6a5a8e07..35be5956 100644
--- a/gen/conflictgen.py
+++ b/gen/conflictgen.py
@@ -5,7 +5,8 @@ from typing import Tuple
 from dcs.country import Country
 from dcs.mapping import Point
 
-from theater import ConflictTheater, ControlPoint, FrontLine
+from game.theater.conflicttheater import ConflictTheater, FrontLine
+from game.theater.controlpoint import ControlPoint
 
 AIR_DISTANCE = 40000
 
diff --git a/gen/flights/ai_flight_planner.py b/gen/flights/ai_flight_planner.py
index 1cd48ed7..216972dd 100644
--- a/gen/flights/ai_flight_planner.py
+++ b/gen/flights/ai_flight_planner.py
@@ -21,6 +21,19 @@ from dcs.unittype import FlyingType, UnitType
 from game import db
 from game.data.radar_db import UNITS_WITH_RADAR
 from game.infos.information import Information
+from game.theater import (
+    ControlPoint,
+    FrontLine,
+    MissionTarget,
+    OffMapSpawn,
+    SamGroundObject,
+    TheaterGroundObject,
+)
+# Avoid importing some types that cause circular imports unless type checking.
+from game.theater.theatergroundobject import (
+    EwrGroundObject,
+    NavalGroundObject, VehicleGroupGroundObject,
+)
 from game.utils import nm_to_meter
 from gen import Conflict
 from gen.ato import Package
@@ -46,19 +59,6 @@ from gen.flights.flight import (
 )
 from gen.flights.flightplan import FlightPlanBuilder
 from gen.flights.traveltime import TotEstimator
-from theater import (
-    ControlPoint,
-    FrontLine,
-    MissionTarget,
-    OffMapSpawn, TheaterGroundObject,
-    SamGroundObject,
-)
-
-# Avoid importing some types that cause circular imports unless type checking.
-from game.theater.theatergroundobject import (
-    EwrGroundObject,
-    NavalGroundObject, VehicleGroupGroundObject,
-)
 
 if TYPE_CHECKING:
     from game import Game
diff --git a/gen/flights/closestairfields.py b/gen/flights/closestairfields.py
index a6045dde..5bba28db 100644
--- a/gen/flights/closestairfields.py
+++ b/gen/flights/closestairfields.py
@@ -1,7 +1,7 @@
 """Objective adjacency lists."""
 from typing import Dict, Iterator, List, Optional
 
-from theater import ConflictTheater, ControlPoint, MissionTarget
+from game.theater import ConflictTheater, ControlPoint, MissionTarget
 
 
 class ClosestAirfields:
diff --git a/gen/flights/flightplan.py b/gen/flights/flightplan.py
index 8df8dc5f..d8758e32 100644
--- a/gen/flights/flightplan.py
+++ b/gen/flights/flightplan.py
@@ -7,20 +7,19 @@ generating the waypoints for the mission.
 """
 from __future__ import annotations
 
-import math
-from datetime import timedelta
-from functools import cached_property
 import logging
+import math
 import random
 from dataclasses import dataclass
+from datetime import timedelta
+from functools import cached_property
 from typing import Iterator, List, Optional, Set, TYPE_CHECKING, Tuple
 
 from dcs.mapping import Point
 from dcs.unit import Unit
 
 from game.data.doctrine import Doctrine
-from game.utils import nm_to_meter
-from theater import (
+from game.theater import (
     ControlPoint,
     FrontLine,
     MissionTarget,
@@ -28,6 +27,7 @@ from theater import (
     TheaterGroundObject,
 )
 from game.theater.theatergroundobject import EwrGroundObject
+from game.utils import nm_to_meter
 from .closestairfields import ObjectiveDistanceCache
 from .flight import Flight, FlightType, FlightWaypoint, FlightWaypointType
 from .traveltime import GroundSpeed, TravelTime
@@ -393,10 +393,6 @@ class TarCapFlightPlan(PatrollingFlightPlan):
         return super().patrol_end_time
 
 
-# TODO: Remove when breaking save compat.
-FrontLineCapFlightPlan = TarCapFlightPlan
-
-
 @dataclass(frozen=True)
 class StrikeFlightPlan(FormationFlightPlan):
     takeoff: FlightWaypoint
diff --git a/gen/flights/waypointbuilder.py b/gen/flights/waypointbuilder.py
index fa992419..74731929 100644
--- a/gen/flights/waypointbuilder.py
+++ b/gen/flights/waypointbuilder.py
@@ -8,14 +8,13 @@ from dcs.unit import Unit
 from dcs.unitgroup import VehicleGroup
 
 from game.data.doctrine import Doctrine
-from game.utils import feet_to_meter
-from game.weather import Conditions
-from theater import (
+from game.theater import (
     ControlPoint,
     MissionTarget,
     OffMapSpawn,
     TheaterGroundObject,
 )
+from game.weather import Conditions
 from .flight import Flight, FlightWaypoint, FlightWaypointType
 
 
diff --git a/gen/ground_forces/ai_ground_planner.py b/gen/ground_forces/ai_ground_planner.py
index db1deb03..b0f14df4 100644
--- a/gen/ground_forces/ai_ground_planner.py
+++ b/gen/ground_forces/ai_ground_planner.py
@@ -2,12 +2,12 @@ import random
 from enum import Enum
 from typing import Dict, List
 
-from dcs.vehicles import Armor, Artillery, Infantry, Unarmed
 from dcs.unittype import VehicleType
+from dcs.vehicles import Armor, Artillery, Infantry, Unarmed
 
 import pydcs_extensions.frenchpack.frenchpack as frenchpack
+from game.theater import ControlPoint
 from gen.ground_forces.combat_stance import CombatStance
-from theater import ControlPoint
 
 TYPE_TANKS = [
     Armor.MBT_T_55,
diff --git a/gen/groundobjectsgen.py b/gen/groundobjectsgen.py
index edd58e6d..09385c78 100644
--- a/gen/groundobjectsgen.py
+++ b/gen/groundobjectsgen.py
@@ -20,14 +20,14 @@ from dcs.task import (
     EPLRS,
     OptAlarmState,
 )
-from dcs.unit import Ship, Vehicle, Unit
+from dcs.unit import Ship, Unit, Vehicle
 from dcs.unitgroup import Group, ShipGroup, StaticGroup
 from dcs.unittype import StaticType, UnitType
 
 from game import db
 from game.data.building_data import FORTIFICATION_UNITS, FORTIFICATION_UNITS_ID
 from game.db import unit_type_from_name
-from theater import ControlPoint, TheaterGroundObject
+from game.theater import ControlPoint, TheaterGroundObject
 from game.theater.theatergroundobject import (
     BuildingGroundObject, CarrierGroundObject,
     GenericCarrierGroundObject,
diff --git a/gen/runways.py b/gen/runways.py
index 5323c37b..658cc846 100644
--- a/gen/runways.py
+++ b/gen/runways.py
@@ -7,8 +7,8 @@ from typing import Iterator, Optional
 
 from dcs.terrain.terrain import Airport
 
+from game.theater import ControlPoint, ControlPointType
 from game.weather import Conditions
-from theater import ControlPoint, ControlPointType
 from .airfields import AIRFIELD_DATA
 from .radios import RadioFrequency
 from .tacan import TacanChannel
diff --git a/qt_ui/widgets/base/QAirportInformation.py b/qt_ui/widgets/base/QAirportInformation.py
index 4fc1474c..b110e59a 100644
--- a/qt_ui/widgets/base/QAirportInformation.py
+++ b/qt_ui/widgets/base/QAirportInformation.py
@@ -1,6 +1,6 @@
 from PySide2.QtWidgets import QGridLayout, QLabel, QGroupBox, QVBoxLayout, QLCDNumber
 
-from theater import ControlPoint, Airport
+from game.theater import ControlPoint, Airport
 
 
 class QAirportInformation(QGroupBox):
diff --git a/qt_ui/widgets/combos/QFlightTypeComboBox.py b/qt_ui/widgets/combos/QFlightTypeComboBox.py
index 6ba9e455..1918dd4d 100644
--- a/qt_ui/widgets/combos/QFlightTypeComboBox.py
+++ b/qt_ui/widgets/combos/QFlightTypeComboBox.py
@@ -2,7 +2,7 @@
 
 from PySide2.QtWidgets import QComboBox
 
-from theater import ConflictTheater, MissionTarget
+from game.theater import ConflictTheater, MissionTarget
 
 
 class QFlightTypeComboBox(QComboBox):
diff --git a/qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py b/qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py
index 8af3c3f4..8f40afde 100644
--- a/qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py
+++ b/qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py
@@ -1,10 +1,10 @@
 from PySide2.QtGui import QStandardItem, QStandardItemModel
 
 from game import Game
+from game.theater import ControlPointType
 from gen import BuildingGroundObject, Conflict, FlightWaypointType
 from gen.flights.flight import FlightWaypoint
 from qt_ui.widgets.combos.QFilteredComboBox import QFilteredComboBox
-from theater import ControlPointType
 
 
 class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):
diff --git a/qt_ui/widgets/map/QFrontLine.py b/qt_ui/widgets/map/QFrontLine.py
index 1849f5ff..2ca71953 100644
--- a/qt_ui/widgets/map/QFrontLine.py
+++ b/qt_ui/widgets/map/QFrontLine.py
@@ -13,11 +13,11 @@ from PySide2.QtWidgets import (
 )
 
 import qt_ui.uiconstants as const
+from game.theater import FrontLine
 from qt_ui.dialogs import Dialog
 from qt_ui.models import GameModel
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from qt_ui.windows.mission.QPackageDialog import QNewPackageDialog
-from theater import FrontLine
 
 
 class QFrontLine(QGraphicsLineItem):
diff --git a/qt_ui/widgets/map/QLiberationMap.py b/qt_ui/widgets/map/QLiberationMap.py
index d0189203..50fc5fba 100644
--- a/qt_ui/widgets/map/QLiberationMap.py
+++ b/qt_ui/widgets/map/QLiberationMap.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import datetime
 import logging
 import math
-from typing import Iterable, List, Optional, Tuple, Iterator
+from typing import Iterable, Iterator, List, Optional, Tuple
 
 from PySide2.QtCore import QPointF, Qt
 from PySide2.QtGui import (
@@ -27,6 +27,13 @@ from dcs.mapping import point_from_heading
 
 import qt_ui.uiconstants as CONST
 from game import Game, db
+from game.theater import ControlPoint
+from game.theater.conflicttheater import FrontLine
+from game.theater.theatergroundobject import (
+    EwrGroundObject,
+    MissileSiteGroundObject,
+    TheaterGroundObject,
+)
 from game.utils import meter_to_feet
 from game.weather import TimeOfDay
 from gen import Conflict
@@ -39,13 +46,7 @@ from qt_ui.widgets.map.QLiberationScene import QLiberationScene
 from qt_ui.widgets.map.QMapControlPoint import QMapControlPoint
 from qt_ui.widgets.map.QMapGroundObject import QMapGroundObject
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
-from theater import ControlPoint
-from game.theater.conflicttheater import FrontLine
-from game.theater.theatergroundobject import (
-    EwrGroundObject,
-    MissileSiteGroundObject,
-    TheaterGroundObject,
-)
+
 
 def binomial(i: int, n: int) -> float:
     """Binomial coefficient"""
diff --git a/qt_ui/widgets/map/QMapControlPoint.py b/qt_ui/widgets/map/QMapControlPoint.py
index 7ef55952..0f88bf7e 100644
--- a/qt_ui/widgets/map/QMapControlPoint.py
+++ b/qt_ui/widgets/map/QMapControlPoint.py
@@ -4,9 +4,9 @@ from PySide2.QtGui import QColor, QPainter
 from PySide2.QtWidgets import QAction, QMenu
 
 import qt_ui.uiconstants as const
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.QBaseMenu2 import QBaseMenu2
-from theater import ControlPoint
 from .QMapObject import QMapObject
 from ...displayoptions import DisplayOptions
 from ...windows.GameUpdateSignal import GameUpdateSignal
diff --git a/qt_ui/widgets/map/QMapGroundObject.py b/qt_ui/widgets/map/QMapGroundObject.py
index a7d857f3..f1d3e542 100644
--- a/qt_ui/widgets/map/QMapGroundObject.py
+++ b/qt_ui/widgets/map/QMapGroundObject.py
@@ -8,8 +8,8 @@ import qt_ui.uiconstants as const
 from game import Game
 from game.data.building_data import FORTIFICATION_BUILDINGS
 from game.db import REWARDS
+from game.theater import ControlPoint, TheaterGroundObject
 from qt_ui.windows.groundobject.QGroundObjectMenu import QGroundObjectMenu
-from theater import ControlPoint, TheaterGroundObject
 from .QMapObject import QMapObject
 from ...displayoptions import DisplayOptions
 
diff --git a/qt_ui/windows/basemenu/QBaseMenu2.py b/qt_ui/windows/basemenu/QBaseMenu2.py
index cfdb8128..f9f7c159 100644
--- a/qt_ui/windows/basemenu/QBaseMenu2.py
+++ b/qt_ui/windows/basemenu/QBaseMenu2.py
@@ -2,12 +2,12 @@ from PySide2.QtCore import Qt
 from PySide2.QtGui import QCloseEvent, QPixmap
 from PySide2.QtWidgets import QDialog, QGridLayout, QHBoxLayout, QLabel, QWidget
 
+from game.theater import ControlPoint, ControlPointType
 from qt_ui.models import GameModel
 from qt_ui.uiconstants import EVENT_ICONS
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from qt_ui.windows.basemenu.QBaseMenuTabs import QBaseMenuTabs
 from qt_ui.windows.basemenu.QRecruitBehaviour import QRecruitBehaviour
-from theater import ControlPoint, ControlPointType
 
 
 class QBaseMenu2(QDialog):
diff --git a/qt_ui/windows/basemenu/QBaseMenuTabs.py b/qt_ui/windows/basemenu/QBaseMenuTabs.py
index fd2f7ae7..1e705372 100644
--- a/qt_ui/windows/basemenu/QBaseMenuTabs.py
+++ b/qt_ui/windows/basemenu/QBaseMenuTabs.py
@@ -1,11 +1,11 @@
-from PySide2.QtWidgets import QFrame, QGridLayout, QLabel, QTabWidget
+from PySide2.QtWidgets import QTabWidget
 
+from game.theater import ControlPoint, OffMapSpawn
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.airfield.QAirfieldCommand import QAirfieldCommand
 from qt_ui.windows.basemenu.base_defenses.QBaseDefensesHQ import QBaseDefensesHQ
 from qt_ui.windows.basemenu.ground_forces.QGroundForcesHQ import QGroundForcesHQ
 from qt_ui.windows.basemenu.intel.QIntelInfo import QIntelInfo
-from theater import ControlPoint, OffMapSpawn
 
 
 class QBaseMenuTabs(QTabWidget):
diff --git a/qt_ui/windows/basemenu/QRecruitBehaviour.py b/qt_ui/windows/basemenu/QRecruitBehaviour.py
index b41ac68a..5fdd1289 100644
--- a/qt_ui/windows/basemenu/QRecruitBehaviour.py
+++ b/qt_ui/windows/basemenu/QRecruitBehaviour.py
@@ -1,3 +1,5 @@
+import logging
+
 from PySide2.QtWidgets import (
     QGroupBox,
     QHBoxLayout,
@@ -6,11 +8,9 @@ from PySide2.QtWidgets import (
     QSizePolicy,
     QSpacerItem,
 )
-import logging
 from dcs.unittype import UnitType
 
-from theater import db
-
+from game import db
 
 
 class QRecruitBehaviour:
diff --git a/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py b/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py
index a01aaaa9..2dbbd3ca 100644
--- a/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py
+++ b/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py
@@ -11,13 +11,15 @@ from PySide2.QtWidgets import (
     QVBoxLayout,
     QWidget,
 )
+from dcs.task import CAP, CAS
 from dcs.unittype import UnitType
 
+from game import db
 from game.event.event import UnitsDeliveryEvent
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.uiconstants import ICONS
 from qt_ui.windows.basemenu.QRecruitBehaviour import QRecruitBehaviour
-from theater import CAP, CAS, ControlPoint, db
 
 
 class QAircraftRecruitmentMenu(QFrame, QRecruitBehaviour):
diff --git a/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py b/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py
index 9965115a..97c804bf 100644
--- a/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py
+++ b/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py
@@ -1,10 +1,10 @@
 from PySide2.QtWidgets import QFrame, QGridLayout, QGroupBox, QVBoxLayout
 
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.airfield.QAircraftRecruitmentMenu import \
     QAircraftRecruitmentMenu
 from qt_ui.windows.mission.QPlannedFlightsView import QPlannedFlightsView
-from theater import ControlPoint
 
 
 class QAirfieldCommand(QFrame):
diff --git a/qt_ui/windows/basemenu/base_defenses/QBaseDefenseGroupInfo.py b/qt_ui/windows/basemenu/base_defenses/QBaseDefenseGroupInfo.py
index 350cf5e8..6d46b35b 100644
--- a/qt_ui/windows/basemenu/base_defenses/QBaseDefenseGroupInfo.py
+++ b/qt_ui/windows/basemenu/base_defenses/QBaseDefenseGroupInfo.py
@@ -1,10 +1,16 @@
 from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QGridLayout, QLabel, QGroupBox, QPushButton, QVBoxLayout
+from PySide2.QtWidgets import (
+    QGridLayout,
+    QGroupBox,
+    QLabel,
+    QPushButton,
+    QVBoxLayout,
+)
 
+from game.theater import ControlPoint, TheaterGroundObject
 from qt_ui.dialogs import Dialog
 from qt_ui.uiconstants import VEHICLES_ICONS
 from qt_ui.windows.groundobject.QGroundObjectMenu import QGroundObjectMenu
-from theater import ControlPoint, TheaterGroundObject
 
 
 class QBaseDefenseGroupInfo(QGroupBox):
diff --git a/qt_ui/windows/basemenu/base_defenses/QBaseDefensesHQ.py b/qt_ui/windows/basemenu/base_defenses/QBaseDefensesHQ.py
index 5ad1f6c9..75a45eb0 100644
--- a/qt_ui/windows/basemenu/base_defenses/QBaseDefensesHQ.py
+++ b/qt_ui/windows/basemenu/base_defenses/QBaseDefensesHQ.py
@@ -1,7 +1,9 @@
 from PySide2.QtWidgets import QFrame, QGridLayout
+
 from game import Game
-from qt_ui.windows.basemenu.base_defenses.QBaseInformation import QBaseInformation
-from theater import ControlPoint
+from game.theater import ControlPoint
+from qt_ui.windows.basemenu.base_defenses.QBaseInformation import \
+    QBaseInformation
 
 
 class QBaseDefensesHQ(QFrame):
diff --git a/qt_ui/windows/basemenu/base_defenses/QBaseInformation.py b/qt_ui/windows/basemenu/base_defenses/QBaseInformation.py
index f5325887..50ec2f81 100644
--- a/qt_ui/windows/basemenu/base_defenses/QBaseInformation.py
+++ b/qt_ui/windows/basemenu/base_defenses/QBaseInformation.py
@@ -1,10 +1,15 @@
 from PySide2.QtGui import Qt
-from PySide2.QtWidgets import QGridLayout, QLabel, QGroupBox, QVBoxLayout, QFrame, QWidget, QScrollArea
+from PySide2.QtWidgets import (
+    QFrame,
+    QGridLayout,
+    QScrollArea,
+    QVBoxLayout,
+    QWidget,
+)
 
-from game import db
-from qt_ui.uiconstants import AIRCRAFT_ICONS, VEHICLES_ICONS
-from qt_ui.windows.basemenu.base_defenses.QBaseDefenseGroupInfo import QBaseDefenseGroupInfo
-from theater import ControlPoint, Airport
+from game.theater import Airport, ControlPoint
+from qt_ui.windows.basemenu.base_defenses.QBaseDefenseGroupInfo import \
+    QBaseDefenseGroupInfo
 
 
 class QBaseInformation(QFrame):
diff --git a/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py b/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py
index ec1cabf6..d00c6b9d 100644
--- a/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py
+++ b/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py
@@ -6,11 +6,13 @@ from PySide2.QtWidgets import (
     QVBoxLayout,
     QWidget,
 )
+from dcs.task import PinpointStrike
 
+from game import db
 from game.event import UnitsDeliveryEvent
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.QRecruitBehaviour import QRecruitBehaviour
-from theater import ControlPoint, PinpointStrike, db
 
 
 class QArmorRecruitmentMenu(QFrame, QRecruitBehaviour):
diff --git a/qt_ui/windows/basemenu/ground_forces/QGroundForcesHQ.py b/qt_ui/windows/basemenu/ground_forces/QGroundForcesHQ.py
index bb18594f..39cba843 100644
--- a/qt_ui/windows/basemenu/ground_forces/QGroundForcesHQ.py
+++ b/qt_ui/windows/basemenu/ground_forces/QGroundForcesHQ.py
@@ -1,11 +1,11 @@
 from PySide2.QtWidgets import QFrame, QGridLayout
 
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.ground_forces.QArmorRecruitmentMenu import \
     QArmorRecruitmentMenu
 from qt_ui.windows.basemenu.ground_forces.QGroundForcesStrategy import \
     QGroundForcesStrategy
-from theater import ControlPoint
 
 
 class QGroundForcesHQ(QFrame):
diff --git a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py
index 0b7b4db6..3aee8c50 100644
--- a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py
+++ b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py
@@ -1,8 +1,9 @@
-from PySide2.QtWidgets import QLabel, QGroupBox, QVBoxLayout
+from PySide2.QtWidgets import QGroupBox, QLabel, QVBoxLayout
 
 from game import Game
-from qt_ui.windows.basemenu.ground_forces.QGroundForcesStrategySelector import QGroundForcesStrategySelector
-from theater import ControlPoint
+from game.theater import ControlPoint
+from qt_ui.windows.basemenu.ground_forces.QGroundForcesStrategySelector import \
+    QGroundForcesStrategySelector
 
 
 class QGroundForcesStrategy(QGroupBox):
diff --git a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategySelector.py b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategySelector.py
index 09c3fa5b..4acd8731 100644
--- a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategySelector.py
+++ b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategySelector.py
@@ -1,6 +1,6 @@
 from PySide2.QtWidgets import QComboBox
 
-from theater import ControlPoint, CombatStance
+from game.theater import CombatStance, ControlPoint
 
 
 class QGroundForcesStrategySelector(QComboBox):
diff --git a/qt_ui/windows/basemenu/intel/QIntelInfo.py b/qt_ui/windows/basemenu/intel/QIntelInfo.py
index bc7cb13b..e422ef3a 100644
--- a/qt_ui/windows/basemenu/intel/QIntelInfo.py
+++ b/qt_ui/windows/basemenu/intel/QIntelInfo.py
@@ -1,11 +1,14 @@
+from PySide2.QtWidgets import (
+    QFrame,
+    QGridLayout,
+    QGroupBox,
+    QLabel,
+    QVBoxLayout,
+)
+from dcs.task import CAP, CAS, Embarking, PinpointStrike
 
-
-from PySide2.QtWidgets import QLabel, QGroupBox, QVBoxLayout, QFrame, QGridLayout
-from dcs.task import Embarking, CAS, PinpointStrike, CAP
-
-from game import Game
-from qt_ui.windows.basemenu.ground_forces.QGroundForcesStrategySelector import QGroundForcesStrategySelector
-from theater import ControlPoint, db
+from game import Game, db
+from game.theater import ControlPoint
 
 
 class QIntelInfo(QFrame):
diff --git a/qt_ui/windows/groundobject/QGroundObjectMenu.py b/qt_ui/windows/groundobject/QGroundObjectMenu.py
index a1fda851..abbf5c8c 100644
--- a/qt_ui/windows/groundobject/QGroundObjectMenu.py
+++ b/qt_ui/windows/groundobject/QGroundObjectMenu.py
@@ -2,20 +2,31 @@ import logging
 
 from PySide2 import QtCore
 from PySide2.QtGui import Qt
-from PySide2.QtWidgets import QHBoxLayout, QDialog, QGridLayout, QLabel, QGroupBox, QVBoxLayout, QPushButton, \
-    QComboBox, QSpinBox, QMessageBox
+from PySide2.QtWidgets import (
+    QComboBox,
+    QDialog,
+    QGridLayout,
+    QGroupBox,
+    QHBoxLayout,
+    QLabel,
+    QMessageBox,
+    QPushButton,
+    QSpinBox,
+    QVBoxLayout,
+)
 from dcs import Point
 
 from game import Game, db
 from game.data.building_data import FORTIFICATION_BUILDINGS
-from game.db import PRICES, REWARDS, unit_type_of, PinpointStrike
-from gen.defenses.armor_group_generator import generate_armor_group_of_type_and_size
+from game.db import PRICES, PinpointStrike, REWARDS, unit_type_of
+from game.theater import ControlPoint, TheaterGroundObject
+from gen.defenses.armor_group_generator import \
+    generate_armor_group_of_type_and_size
 from gen.sam.sam_group_generator import get_faction_possible_sams_generator
 from qt_ui.uiconstants import EVENT_ICONS
 from qt_ui.widgets.QBudgetBox import QBudgetBox
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from qt_ui.windows.groundobject.QBuildingInfo import QBuildingInfo
-from theater import ControlPoint, TheaterGroundObject
 
 
 class QGroundObjectMenu(QDialog):
diff --git a/qt_ui/windows/mission/flight/QFlightCreator.py b/qt_ui/windows/mission/flight/QFlightCreator.py
index 604bcd57..0e0bf773 100644
--- a/qt_ui/windows/mission/flight/QFlightCreator.py
+++ b/qt_ui/windows/mission/flight/QFlightCreator.py
@@ -10,6 +10,7 @@ from PySide2.QtWidgets import (
 from dcs.planes import PlaneType
 
 from game import Game
+from game.theater import ControlPoint, OffMapSpawn
 from gen.ato import Package
 from gen.flights.flight import Flight
 from qt_ui.uiconstants import EVENT_ICONS
@@ -20,7 +21,6 @@ from qt_ui.widgets.combos.QArrivalAirfieldSelector import \
     QArrivalAirfieldSelector
 from qt_ui.widgets.combos.QFlightTypeComboBox import QFlightTypeComboBox
 from qt_ui.widgets.combos.QOriginAirfieldSelector import QOriginAirfieldSelector
-from theater import ControlPoint, OffMapSpawn
 
 
 class QFlightCreator(QDialog):
diff --git a/qt_ui/windows/newgame/QCampaignList.py b/qt_ui/windows/newgame/QCampaignList.py
index 09839224..86ce0461 100644
--- a/qt_ui/windows/newgame/QCampaignList.py
+++ b/qt_ui/windows/newgame/QCampaignList.py
@@ -12,7 +12,7 @@ from PySide2.QtGui import QStandardItem, QStandardItemModel
 from PySide2.QtWidgets import QAbstractItemView, QListView
 
 import qt_ui.uiconstants as CONST
-from theater import ConflictTheater
+from game.theater import ConflictTheater
 
 
 @dataclass(frozen=True)
diff --git a/theater/__init__.py b/theater/__init__.py
deleted file mode 100644
index f6b256d8..00000000
--- a/theater/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# For save game compatibility. Remove before 2.3.
-from game.theater import *
diff --git a/theater/base.py b/theater/base.py
deleted file mode 100644
index fc28c91b..00000000
--- a/theater/base.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# For save compat. Remove in 2.3.
-from game.theater.base import *
diff --git a/theater/conflicttheater.py b/theater/conflicttheater.py
deleted file mode 100644
index e1566178..00000000
--- a/theater/conflicttheater.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# For save compat. Remove in 2.3.
-from game.theater.conflicttheater import *
diff --git a/theater/controlpoint.py b/theater/controlpoint.py
deleted file mode 100644
index 90a6b164..00000000
--- a/theater/controlpoint.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# For save compat. Remove in 2.3.
-from game.theater.controlpoint import *
diff --git a/theater/frontline.py b/theater/frontline.py
deleted file mode 100644
index 5ddb5706..00000000
--- a/theater/frontline.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# For save compat. Remove in 2.3.
-from game.theater.frontline import *
-from game.theater.conflicttheater import FrontLine
\ No newline at end of file
diff --git a/theater/theatergroundobject.py b/theater/theatergroundobject.py
deleted file mode 100644
index 3c77455d..00000000
--- a/theater/theatergroundobject.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# For save compat. Remove in 2.3.
-from game.theater.theatergroundobject import *