diff --git a/config/routes/ares.yaml b/config/routes/ares.yaml
index 53bbeb6f2..d307cf474 100644
--- a/config/routes/ares.yaml
+++ b/config/routes/ares.yaml
@@ -37,3 +37,7 @@ loot:
 colonize:
     path: /colonize
     controller: App\Modules\Ares\Infrastructure\Controller\ViewMemorial
+
+conquer:
+    path: /colonize
+    controller: App\Modules\Ares\Infrastructure\Controller\ViewMemorial
diff --git a/config/routes/athena.yaml b/config/routes/athena.yaml
index 0f792ad96..4b5ae71b2 100644
--- a/config/routes/athena.yaml
+++ b/config/routes/athena.yaml
@@ -2,6 +2,10 @@ financial:
     resource: './athena/financial.yaml'
     prefix: /financial
 
+trade:
+    resource: './athena/trade.yaml'
+    prefix: /trade
+
 switchbase:
     path: /switchbase/{baseId}/{page}
     controller: App\Modules\Athena\Infrastructure\Controller\Base\SwitchBase
@@ -77,7 +81,7 @@ trade_market:
 
 spatioport:
     path: /spatioport
-    controller: App\Modules\Athena\Infrastructure\Controller\Base\Building\RefineryController
+    controller: App\Modules\Athena\Infrastructure\Controller\Base\Building\ViewSpatioport
 
 school:
     path: /school
diff --git a/config/routes/athena/trade.yaml b/config/routes/athena/trade.yaml
new file mode 100644
index 000000000..62d28e9d0
--- /dev/null
+++ b/config/routes/athena/trade.yaml
@@ -0,0 +1,19 @@
+propose_route:
+    path: /routes/propose
+    controller: App\Modules\Athena\Infrastructure\Controller\Trade\ProposeRoute
+
+cancel_route:
+    path: /bases/{baseId}/routes/{id}/cancel
+    controller: App\Modules\Athena\Infrastructure\Controller\Trade\CancelRoute
+
+delete_route:
+    path: /bases/{baseId}/routes/{id}/cancel
+    controller: App\Modules\Athena\Infrastructure\Controller\Trade\DeleteRoute
+
+accept_commercial_route:
+    path: /bases/{baseId}/routes/{id}/accept
+    controller: App\Modules\Athena\Infrastructure\Controller\Trade\AcceptRoute
+
+refuse_commercial_route:
+    path: /bases/{baseId}/routes/{id}/refuse
+    controller: App\Modules\Athena\Infrastructure\Controller\Trade\RefuseRoute
diff --git a/src/Modules/Athena/Infrastructure/Controller/Base/Building/ViewSpatioport.php b/src/Modules/Athena/Infrastructure/Controller/Base/Building/ViewSpatioport.php
new file mode 100644
index 000000000..6cf09e953
--- /dev/null
+++ b/src/Modules/Athena/Infrastructure/Controller/Base/Building/ViewSpatioport.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Modules\Athena\Infrastructure\Controller\Base\Building;
+
+use App\Modules\Athena\Manager\CommercialRouteManager;
+use App\Modules\Athena\Model\OrbitalBase;
+use App\Modules\Demeter\Manager\ColorManager;
+use App\Modules\Demeter\Model\Color;
+use App\Modules\Demeter\Resource\ColorResource;
+use App\Modules\Zeus\Model\Player;
+use App\Modules\Zeus\Model\PlayerBonus;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class ViewSpatioport extends AbstractController
+{
+	public function __invoke(
+		Request $request,
+		Player $currentPlayer,
+		OrbitalBase $currentBase,
+		CommercialRouteManager $commercialRouteManager,
+		ColorManager $colorManager,
+	): Response {
+		$session = $request->getSession();
+		$mode = $request->query->get('mode', 'list');
+
+		$inGameFactions = $colorManager->getInGameFactions();
+
+		return $this->render('pages/athena/spatioport.html.twig', [
+			'routes' => array_merge(
+				$commercialRouteManager->getByBase($currentBase->getId()),
+				$commercialRouteManager->getByDistantBase($currentBase->getId())
+			),
+			'routes_data' => $commercialRouteManager->getBaseCommercialData($currentBase),
+			'player_commercial_income_bonus' => $session->get('playerBonus')->get(PlayerBonus::COMMERCIAL_INCOME),
+			'negora_commercial_bonus' => ColorResource::BONUS_NEGORA_ROUTE,
+			'is_player_from_negora' => $currentPlayer->getRColor() === ColorResource::NEGORA,
+			'in_game_factions' => $inGameFactions,
+			'mode' => $mode,
+			'search_results' => ($mode === 'search' && $request->getMethod() === 'POST')
+				? $commercialRouteManager->searchCandidates(
+					$currentPlayer->getId(),
+					$currentBase,
+					array_reduce($inGameFactions, function (array $carry, Color $faction) use ($request) {
+						if ($request->request->has('faction-' . $faction->getId())) {
+							$carry[] = $faction->getId();
+						}
+						return $carry;
+					}, []),
+					abs(intval($request->request->get('min-dist', 75))),
+					abs(intval($request->request->get('max-dist', 125))),
+				) : null,
+		]);
+	}
+}
diff --git a/src/Modules/Athena/Infrastructure/Controller/Trade/AcceptRoute.php b/src/Modules/Athena/Infrastructure/Controller/Trade/AcceptRoute.php
new file mode 100644
index 000000000..14ddb92b5
--- /dev/null
+++ b/src/Modules/Athena/Infrastructure/Controller/Trade/AcceptRoute.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Modules\Athena\Infrastructure\Controller\Trade;
+
+use App\Classes\Entity\EntityManager;
+use App\Classes\Exception\ErrorException;
+use App\Classes\Exception\FormException;
+use App\Classes\Library\Format;
+use App\Classes\Library\Utils;
+use App\Modules\Athena\Helper\OrbitalBaseHelper;
+use App\Modules\Athena\Manager\CommercialRouteManager;
+use App\Modules\Athena\Manager\OrbitalBaseManager;
+use App\Modules\Athena\Model\CommercialRoute;
+use App\Modules\Athena\Resource\OrbitalBaseResource;
+use App\Modules\Demeter\Manager\ColorManager;
+use App\Modules\Demeter\Model\Color;
+use App\Modules\Demeter\Resource\ColorResource;
+use App\Modules\Hermes\Manager\NotificationManager;
+use App\Modules\Hermes\Model\Notification;
+use App\Modules\Zeus\Manager\PlayerManager;
+use App\Modules\Zeus\Model\Player;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class AcceptRoute extends AbstractController
+{
+	public function __invoke(
+		Request $request,
+		Player $currentPlayer,
+		CommercialRouteManager $commercialRouteManager,
+		ColorManager $colorManager,
+		OrbitalBaseManager $orbitalBaseManager,
+		OrbitalBaseHelper $orbitalBaseHelper,
+		PlayerManager $playerManager,
+		NotificationManager $notificationManager,
+		EntityManager $entityManager,
+		int $baseId,
+		int $id,
+	): Response {
+		$session = $request->getSession();
+		for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) {
+			$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
+		}
+		$routeExperienceCoeff = $this->getParameter('athena.trade.experience_coeff');
+
+		if (in_array($baseId, $verif)) {
+			$cr = $commercialRouteManager->getByIdAndDistantBase($id, $baseId);
+
+			if ($cr !== null && $cr->getStatement() == CommercialRoute::PROPOSED) {
+				$proposerFaction = $colorManager->get($cr->playerColor1);
+				$acceptorFaction = $colorManager->get($cr->playerColor2);
+
+				if ($proposerFaction->colorLink[$cr->playerColor2] != Color::ENEMY && $acceptorFaction->colorLink[$cr->playerColor1] != Color::ENEMY) {
+					$proposerBase = $orbitalBaseManager->get($cr->getROrbitalBase());
+					$acceptorBase = $orbitalBaseManager->get($cr->getROrbitalBaseLinked());
+
+					$nbrMaxCommercialRoute = $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::SPATIOPORT, 'level', $acceptorBase->getLevelSpatioport(), 'nbRoutesMax');
+
+					if ($commercialRouteManager->countBaseActiveAndStandbyRoutes($acceptorBase->getId()) <= $nbrMaxCommercialRoute) {
+						# compute bonus if the player is from Negore
+						if ($session->get('playerInfo')->get('color') == ColorResource::NEGORA) {
+							$price = round($cr->getPrice() - ($cr->getPrice() * ColorResource::BONUS_NEGORA_ROUTE / 100));
+						} else {
+							$price = $cr->getPrice();
+						}
+
+						if ($session->get('playerInfo')->get('credit') >= $price) {
+							# débit des crédits au joueur
+							$playerManager->decreaseCredit($currentPlayer, $price);
+
+							# augmentation de l'expérience des deux joueurs
+							$exp = round($cr->getIncome() * $routeExperienceCoeff);
+							$playerManager->increaseExperience($currentPlayer, $exp);
+							$playerManager->increaseExperience($playerManager->get($proposerBase->getRPlayer()), $exp);
+
+							# activation de la route
+							$cr->setStatement(CommercialRoute::ACTIVE);
+							$cr->setDCreation(Utils::now());
+
+							$n = new Notification();
+							$n->setRPlayer($proposerBase->getRPlayer());
+							$n->setTitle('Route commerciale acceptée');
+							$n->addBeg();
+							$n->addLnk('embassy/player-' . $currentPlayer->getId(), $currentPlayer->getName())->addTxt(' a accepté la route commerciale proposée entre ');
+							$n->addLnk('map/place-' . $acceptorBase->getRPlace(), $acceptorBase->getName())->addTxt(' et ');
+							$n->addLnk('map/place-' . $proposerBase->getRPlace(), $proposerBase->getName());
+							$n->addSep()->addTxt('Cette route vous rapporte ' . Format::numberFormat($cr->getIncome()) . ' crédits par relève.');
+							$n->addBrk()->addBoxResource('xp', $exp, 'expérience gagnée', $this->getParameter('media'));
+							$n->addSep()->addLnk('action/a-switchbase/base-' . $proposerBase->getRPlace() . '/page-spatioport', 'En savoir plus ?');
+							$n->addEnd();
+							$notificationManager->add($n);
+
+							$entityManager->flush();
+//							if (true === $this->getContainer()->getParameter('data_analysis')) {
+//								$qr = $database->prepare('INSERT INTO
+//							DA_CommercialRelation(`from`, `to`, type, weight, dAction)
+//							VALUES(?, ?, ?, ?, ?)'
+//								);
+//								$qr->execute([$cr->playerId1, $cr->playerId2, 6, DataAnalysis::creditToStdUnit($cr->price), Utils::now()]);
+//							}
+
+							$this->addFlash('success', 'Route commerciale acceptée, vous gagnez ' . $exp . ' points d\'expérience');
+
+							return $this->redirect($request->headers->get('referer'));
+						} else {
+							throw new ErrorException('impossible d\'accepter une route commerciale');
+						}
+					} else {
+						throw new ErrorException('impossible d\'accepter une route commerciale');
+					}
+				} else {
+					throw new ErrorException('Vous ne pouvez pas accepter les routes de ce joueur, vos deux factions sont en guerre');
+				}
+			} else {
+				throw new ErrorException('impossible d\'accepter une route commerciale');
+			}
+		} else {
+			throw new FormException('pas assez d\'informations pour accepter une route commerciale');
+		}
+	}
+}
diff --git a/src/Modules/Athena/Infrastructure/Controller/Trade/CancelRoute.php b/src/Modules/Athena/Infrastructure/Controller/Trade/CancelRoute.php
new file mode 100644
index 000000000..95f0f9d80
--- /dev/null
+++ b/src/Modules/Athena/Infrastructure/Controller/Trade/CancelRoute.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Modules\Athena\Infrastructure\Controller\Trade;
+
+use App\Classes\Entity\EntityManager;
+use App\Modules\Athena\Manager\CommercialRouteManager;
+use App\Modules\Athena\Manager\OrbitalBaseManager;
+use App\Modules\Athena\Model\CommercialRoute;
+use App\Modules\Hermes\Manager\NotificationManager;
+use App\Modules\Hermes\Model\Notification;
+use App\Modules\Zeus\Manager\PlayerManager;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+
+class CancelRoute extends AbstractController
+{
+	public function __invoke(
+		Request $request,
+		CommercialRouteManager $commercialRouteManager,
+		PlayerManager $playerManager,
+		NotificationManager $notificationManager,
+		OrbitalBaseManager $orbitalBaseManager,
+		EntityManager $entityManager,
+		int $baseId,
+		int $id,
+	): Response {
+		$session = $request->getSession();
+		for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) {
+			$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
+		}
+
+		if (in_array($baseId, $verif)) {
+			$cr = $commercialRouteManager->getByIdAndBase($id, $baseId);
+			if ($cr !== null && $cr->getStatement() == CommercialRoute::PROPOSED) {
+				$routeCancelRefund = $this->getParameter('athena.trade.route.cancellation_refund');
+				$proposerBase = $orbitalBaseManager->get($cr->getROrbitalBase());
+				$linkedBase = $orbitalBaseManager->get($cr->getROrbitalBaseLinked());
+
+				//rend 80% des crédits investis
+				$playerManager->increaseCredit($playerManager->get($session->get('playerId')), round($cr->getPrice() * $routeCancelRefund));
+
+				//notification
+				$n = new Notification();
+				$n->setRPlayer($linkedBase->getRPlayer());
+				$n->setTitle('Route commerciale annulée');
+
+				$n->addBeg()->addLnk('embassy/player-' . $session->get('playerId'), $session->get('playerInfo')->get('name'))->addTxt(' a finalement retiré la proposition de route commerciale qu\'il avait faite entre ');
+				$n->addLnk('map/place-' . $linkedBase->getRPlace(), $linkedBase->getName())->addTxt(' et ');
+				$n->addLnk('map/place-' . $proposerBase->getRPlace(), $proposerBase->getName());
+				$n->addEnd();
+				$notificationManager->add($n);
+
+				//destruction de la route
+				$commercialRouteManager->remove($cr);
+				$this->addFlash('success', 'Route commerciale annulée. Vous récupérez les ' . $routeCancelRefund * 100 . '% du montant investi.');
+
+				$entityManager->flush();
+
+				return $this->redirect($request->headers->get('referer'));
+			} else {
+				throw new ConflictHttpException('impossible d\'annuler une route commerciale');
+			}
+		} else {
+			throw new BadRequestHttpException('pas assez d\'informations pour annuler une route commerciale');
+		}
+	}
+}
diff --git a/src/Modules/Athena/Infrastructure/Controller/Trade/DeleteRoute.php b/src/Modules/Athena/Infrastructure/Controller/Trade/DeleteRoute.php
new file mode 100644
index 000000000..671e241d1
--- /dev/null
+++ b/src/Modules/Athena/Infrastructure/Controller/Trade/DeleteRoute.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Modules\Athena\Infrastructure\Controller\Trade;
+
+use App\Classes\Exception\ErrorException;
+use App\Classes\Exception\FormException;
+use App\Modules\Athena\Manager\CommercialRouteManager;
+use App\Modules\Athena\Manager\OrbitalBaseManager;
+use App\Modules\Athena\Model\CommercialRoute;
+use App\Modules\Hermes\Manager\NotificationManager;
+use App\Modules\Hermes\Model\Notification;
+use App\Modules\Zeus\Model\Player;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class DeleteRoute extends AbstractController
+{
+	public function __invoke(
+		Request $request,
+		Player $currentPlayer,
+		CommercialRouteManager $commercialRouteManager,
+		OrbitalBaseManager $orbitalBaseManager,
+		NotificationManager $notificationManager,
+		int $baseId,
+		int $id,
+	): Response {
+		$session = $request->getSession();
+
+		for ($i = 0; $i < $session->get('playerBase')->get('ob')->size(); $i++) {
+			$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
+		}
+
+		if (in_array($baseId, $verif)) {
+			$cr = $commercialRouteManager->get($id);
+			if ($cr !== null && in_array($cr->statement, [CommercialRoute::ACTIVE, CommercialRoute::STANDBY])) {
+				if ($cr->playerId1 === $currentPlayer->getid() || $cr->playerId2 === $currentPlayer->getId()) {
+					if ($cr->getROrbitalBase() == $baseId OR $cr->getROrbitalBaseLinked() == $baseId) {
+						$proposerBase = $orbitalBaseManager->get($cr->getROrbitalBase());
+						$linkedBase = $orbitalBaseManager->get($cr->getROrbitalBaseLinked());
+						if ($cr->getROrbitalBase() == $baseId) {
+							$notifReceiver = $linkedBase->getRPlayer();
+							$myBaseName = $proposerBase->getName();
+							$otherBaseName = $linkedBase->getName();
+							$myBaseId = $proposerBase->getRPlace();
+							$otherBaseId = $linkedBase->getRPlace();
+						} else { //if ($cr->getROrbitalBaseLinked == $base) {
+							$notifReceiver = $proposerBase->getRPlayer();
+							$myBaseName = $linkedBase->getName();
+							$otherBaseName = $proposerBase->getName();
+							$myBaseId = $linkedBase->getRPlace();
+							$otherBaseId = $proposerBase->getRPlace();
+						}
+
+						# perte du prestige pour les joueurs Négoriens
+						# @TODO check if this code is used somewhere or not
+//				$S_PAM1 = $playerManager->getCurrentSession();
+//				$playerManager->newSession();
+//				$playerManager->load(array('id' => array($cr->playerId1, $cr->playerId2)));
+//				$exp = round($cr->getIncome() * $routeExperienceCoeff);
+//
+//				$playerManager->changeSession($S_PAM1);
+						//notification
+						$n = new Notification();
+						$n->setRPlayer($notifReceiver);
+						$n->setTitle('Route commerciale détruite');
+						$n->addBeg()->addLnk('embassy/player-' . $currentPlayer->getId(), $currentPlayer->getName())->addTxt(' annule les accords commerciaux entre ');
+						$n->addLnk('map/place-' . $myBaseId, $myBaseName)->addTxt(' et ');
+						$n->addLnk('map/place-' . $otherBaseId, $otherBaseName)->addTxt('.');
+						$n->addSep()->addTxt('La route commerciale qui liait les deux bases orbitales est détruite, elle ne vous rapporte donc plus rien !');
+						$n->addEnd();
+						$notificationManager->add($n);
+
+						//destruction de la route
+						$commercialRouteManager->remove($cr);
+
+						$this->addFlash('success', 'Route commerciale détruite');
+
+						return $this->redirect($request->headers->get('referer'));
+					} else {
+						throw new ErrorException('impossible de supprimer une route commerciale');
+					}
+				} else {
+					throw new ErrorException('cette route ne vous appartient pas');
+				}
+			} else {
+				throw new ErrorException('impossible de supprimer une route commerciale');
+			}
+		} else {
+			throw new FormException('pas assez d\'informations pour supprimer une route commerciale');
+		}
+	}
+}
diff --git a/src/Modules/Athena/Infrastructure/Controller/Trade/ProposeRoute.php b/src/Modules/Athena/Infrastructure/Controller/Trade/ProposeRoute.php
new file mode 100644
index 000000000..1ca12debf
--- /dev/null
+++ b/src/Modules/Athena/Infrastructure/Controller/Trade/ProposeRoute.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Modules\Athena\Infrastructure\Controller\Trade;
+
+use App\Classes\Exception\ErrorException;
+use App\Classes\Exception\FormException;
+use App\Classes\Library\Format;
+use App\Classes\Library\Game;
+use App\Classes\Library\Utils;
+use App\Modules\Athena\Helper\OrbitalBaseHelper;
+use App\Modules\Athena\Manager\CommercialRouteManager;
+use App\Modules\Athena\Manager\OrbitalBaseManager;
+use App\Modules\Athena\Model\CommercialRoute;
+use App\Modules\Athena\Resource\OrbitalBaseResource;
+use App\Modules\Demeter\Manager\ColorManager;
+use App\Modules\Demeter\Model\Color;
+use App\Modules\Demeter\Resource\ColorResource;
+use App\Modules\Hermes\Manager\NotificationManager;
+use App\Modules\Hermes\Model\Notification;
+use App\Modules\Zeus\Manager\PlayerManager;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class ProposeRoute extends AbstractController
+{
+	public function __invoke(
+		Request $request,
+		ColorManager $colorManager,
+		OrbitalBaseManager $orbitalBaseManager,
+		OrbitalBaseHelper $orbitalBaseHelper,
+		CommercialRouteManager $commercialRouteManager,
+		NotificationManager $notificationManager,
+		PlayerManager $playerManager,
+	): Response {
+		$session = $request->getSession();
+
+		for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) {
+			$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
+		}
+		$baseFrom 	= $request->query->get('sourceBase');
+		$baseTo 	= $request->query->get('destinationBase');
+
+		if ($baseFrom !== FALSE AND $baseTo !== FALSE AND in_array($baseFrom, $verif)) {
+			$proposerBase = $orbitalBaseManager->get($baseFrom);
+			$otherBase = $orbitalBaseManager->get($baseTo);
+
+			$nbrMaxCommercialRoute = $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::SPATIOPORT, 'level', $proposerBase->getLevelSpatioport(), 'nbRoutesMax');
+
+			// Check if a route already exists between these two bases
+			$alreadyARoute = $commercialRouteManager->isAlreadyARoute($proposerBase->getId(), $otherBase->getId());
+
+			if (($commercialRouteManager->countBaseRoutes($proposerBase->getId()) < $nbrMaxCommercialRoute) && (!$alreadyARoute) && ($proposerBase->getLevelSpatioport() > 0) && ($otherBase->getLevelSpatioport() > 0)) {
+				$player = $playerManager->get($otherBase->getRPlayer());
+
+				$playerFaction = $colorManager->get($session->get('playerInfo')->get('color'));
+				$otherFaction = $colorManager->get($player->rColor);
+
+				if ($playerFaction->colorLink[$player->rColor] != Color::ENEMY && $otherFaction->colorLink[$session->get('playerInfo')->get('color')] != Color::ENEMY) {
+
+					if ($proposerBase !== null && $otherBase !== null && ($proposerBase->getRPlayer() != $otherBase->getRPlayer()) && $player !== null) {
+						$distance = Game::getDistance($proposerBase->getXSystem(), $otherBase->getXSystem(), $proposerBase->getYSystem(), $otherBase->getYSystem());
+						$bonusA = ($proposerBase->getSector() != $otherBase->getSector()) ? $this->getParameter('athena.trade.route.sector_bonus') : 1;
+						$bonusB = ($session->get('playerInfo')->get('color')) != $player->getRColor() ? $this->getParameter('athena.trade.route.color_bonus') : 1;
+						$price = Game::getRCPrice($distance);
+						$income = Game::getRCIncome($distance, $bonusA, $bonusB);
+
+						if ($distance == 1) {
+							$imageLink = '1-' . rand(1, 3);
+						} elseif ($distance < 26) {
+							$imageLink = '2-' . rand(1, 3);
+						} elseif ($distance < 126) {
+							$imageLink = '3-' . rand(1, 3);
+						} else {
+							$imageLink = '4-' . rand(1, 3);
+						}
+
+						# compute bonus
+						if (in_array(ColorResource::COMMERCIALROUTEPRICEBONUS, $playerFaction->bonus)) {
+							$priceWithBonus = round($price - ($price * ColorResource::BONUS_NEGORA_ROUTE / 100));
+						} else {
+							$priceWithBonus = $price;
+						}
+
+						if ($session->get('playerInfo')->get('credit') >= $priceWithBonus) {
+							# création de la route
+							$cr = new CommercialRoute();
+							$cr->setROrbitalBase($proposerBase->getId());
+							$cr->setROrbitalBaseLinked($otherBase->getId());
+							$cr->setImageLink($imageLink);
+							$cr->setDistance($distance);
+							$cr->setPrice($price);
+							$cr->setIncome($income);
+							$cr->setDProposition(Utils::now());
+							$cr->setDCreation(NULL);
+							$cr->setStatement(0);
+							$commercialRouteManager->add($cr);
+
+							# débit des crédits au joueur
+							$playerManager->decreaseCredit($playerManager->get($session->get('playerId')), $priceWithBonus);
+
+							$n = new Notification();
+							$n->setRPlayer($otherBase->getRPlayer());
+							$n->setTitle('Proposition de route commerciale');
+							$n->addBeg()->addLnk('embassy/player-' . $session->get('playerId'), $session->get('playerInfo')->get('name'));
+							$n->addTxt(' vous propose une route commerciale liant ');
+							$n->addLnk('map/place-' . $proposerBase->getRPlace(), $proposerBase->getName())->addTxt(' et ');
+							$n->addLnk('map/place-' . $otherBase->getRPlace(), $otherBase->getName())->addTxt('.');
+							$n->addSep()->addTxt('Les frais de l\'opération vous coûteraient ' . Format::numberFormat($priceWithBonus) . ' crédits; Les gains estimés pour cette route sont de ' . Format::numberFormat($income) . ' crédits par relève.');
+							$n->addSep()->addLnk('action/a-switchbase/base-' . $otherBase->getRPlace() . '/page-spatioport', 'En savoir plus ?');
+							$n->addEnd();
+							$notificationManager->add($n);
+
+							$this->addFlash('success', 'Route commerciale proposée');
+
+							return $this->redirect($request->headers->get('referer'));
+						} else {
+							throw new ErrorException('impossible de proposer une route commerciale - vous n\'avez pas assez de crédits');
+						}
+					} else {
+						throw new ErrorException('impossible de proposer une route commerciale (2)');
+					}
+				} else {
+					throw new ErrorException('impossible de proposer une route commerciale à ce joueur, vos factions sont en guerre.');
+				}
+			} else {
+				throw new ErrorException('impossible de proposer une route commerciale (3)');
+			}
+		} else {
+			throw new FormException('pas assez d\'informations pour proposer une route commerciale');
+		}
+	}
+}
diff --git a/src/Modules/Athena/Infrastructure/Controller/Trade/RefuseRoute.php b/src/Modules/Athena/Infrastructure/Controller/Trade/RefuseRoute.php
new file mode 100644
index 000000000..4c1c69e69
--- /dev/null
+++ b/src/Modules/Athena/Infrastructure/Controller/Trade/RefuseRoute.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Modules\Athena\Infrastructure\Controller\Trade;
+
+use App\Classes\Exception\ErrorException;
+use App\Classes\Library\Format;
+use App\Modules\Athena\Manager\CommercialRouteManager;
+use App\Modules\Athena\Manager\OrbitalBaseManager;
+use App\Modules\Athena\Model\CommercialRoute;
+use App\Modules\Hermes\Manager\NotificationManager;
+use App\Modules\Hermes\Model\Notification;
+use App\Modules\Zeus\Manager\PlayerManager;
+use App\Modules\Zeus\Model\Player;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+
+class RefuseRoute extends AbstractController
+{
+	public function __invoke(
+		Request $request,
+		Player $currentPlayer,
+		CommercialRouteManager $commercialRouteManager,
+		OrbitalBaseManager $orbitalBaseManager,
+		PlayerManager $playerManager,
+		NotificationManager $notificationManager,
+		int $baseId,
+		int $id,
+	): Response {
+		$session = $request->getSession();
+
+		for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) {
+			$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
+		}
+
+		if (in_array($baseId, $verif)) {
+			$cr = $commercialRouteManager->getByIdAndDistantBase($id, $baseId);
+			if ($cr !== null && $cr->getStatement() === CommercialRoute::PROPOSED) {
+				$proposerBase = $orbitalBaseManager->get($cr->getROrbitalBase());
+				$refusingBase = $orbitalBaseManager->get($cr->getROrbitalBaseLinked());
+
+				//rend les crédits au proposant
+				$playerManager->increaseCredit($playerManager->get($proposerBase->getRPlayer()), intval($cr->getPrice()));
+
+				//notification
+				$n = new Notification();
+				$n->setRPlayer($proposerBase->getRPlayer());
+				$n->setTitle('Route commerciale refusée');
+				$n->addBeg()->addLnk('embassy/player-' . $currentPlayer->getId(), $currentPlayer->getName())->addTxt(' a refusé la route commerciale proposée entre ');
+				$n->addLnk('map/place-' . $refusingBase->getRPlace(), $refusingBase->getName())->addTxt(' et ');
+				$n->addLnk('map/place-' . $proposerBase->getRPlace(), $proposerBase->getName())->addTxt('.');
+				$n->addSep()->addTxt('Les ' . Format::numberFormat($cr->getPrice()) . ' crédits bloqués sont à nouveau disponibles.');
+				$n->addEnd();
+				$notificationManager->add($n);
+
+				//destruction de la route
+				$commercialRouteManager->remove($cr);
+				$this->addFlash('success', 'Route commerciale refusée');
+
+				return $this->redirect($request->headers->get('referer'));
+			} else {
+				throw new ConflictHttpException('impossible de refuser une route commerciale');
+			}
+		} else {
+			throw new BadRequestHttpException('pas assez d\'informations pour refuser une route commerciale');
+		}
+	}
+}
diff --git a/src/Modules/Athena/Manager/CommercialRouteManager.php b/src/Modules/Athena/Manager/CommercialRouteManager.php
index fccbf4130..25a03a951 100644
--- a/src/Modules/Athena/Manager/CommercialRouteManager.php
+++ b/src/Modules/Athena/Manager/CommercialRouteManager.php
@@ -37,6 +37,7 @@ public function __construct(
 	 *  operational: int,
 	 *  stand_by: int,
 	 *  total: int,
+	 *  total_income: int,
 	 *  max: int
 	 * }
 	 **/
@@ -55,13 +56,16 @@ public function getBaseCommercialData(OrbitalBase $orbitalBase): array
 		$nCRWaitingForMe = 0;
 		$nCROperational = 0;
 		$nCRInStandBy = 0;
+		$totalIncome = 0;
 
+		/** @var CommercialRoute $route */
 		foreach ($routes as $route) {
 			if ($route->getStatement() == CommercialRoute::PROPOSED AND $route->getPlayerId1() == $session->get('playerId')) {
 				$nCRWaitingForOther++;
 			} elseif ($route->getStatement() == CommercialRoute::PROPOSED AND $route->getPlayerId1() != $session->get('playerId')) {
 				$nCRWaitingForMe++;
 			} elseif ($route->getStatement() == CommercialRoute::ACTIVE) {
+				$totalIncome += $route->getIncome();
 				$nCROperational++;
 			} elseif ($route->getStatement() == CommercialRoute::STANDBY) {
 				$nCRInStandBy++;
@@ -73,7 +77,8 @@ public function getBaseCommercialData(OrbitalBase $orbitalBase): array
 			'waiting_for_other' => $nCRWaitingForOther,
 			'operational' => $nCROperational,
 			'stand_by' => $nCRInStandBy,
-			'total' => $nCROperational + $nCRInStandBy + $nCRWaitingForOther,
+			'total' => $nCROperational + $nCRInStandBy + $nCRWaitingForOther + $nCRWaitingForMe,
+			'total_income' => $totalIncome,
 			'max' => $this->orbitalBaseHelper->getBuildingInfo(
 				OrbitalBaseResource::SPATIOPORT,
 				'level',
@@ -83,6 +88,11 @@ public function getBaseCommercialData(OrbitalBase $orbitalBase): array
 		];
 	}
 
+	public function searchCandidates(int $playerId, OrbitalBase $orbitalBase, array $factions, int $minDistance, int $maxDistance): array
+	{
+		return $this->entityManager->getRepository(CommercialRoute::class)->searchCandidates($playerId, $orbitalBase, $factions, $minDistance, $maxDistance);
+	}
+
 	// @TODO use an appropriate DTO for this
 	public function getAllPlayerRoutes(Player $player): array
 	{
diff --git a/src/Modules/Athena/Model/CommercialRoute.php b/src/Modules/Athena/Model/CommercialRoute.php
index 341786c28..c25394891 100644
--- a/src/Modules/Athena/Model/CommercialRoute.php
+++ b/src/Modules/Athena/Model/CommercialRoute.php
@@ -158,4 +158,19 @@ public function setPopulation2($var) {
 		$this->population2 = $var;
 		return $this;
 	 }
+
+	 public function isProposed(): bool
+	 {
+		 return self::PROPOSED === $this->statement;
+	 }
+
+	 public function isActive(): bool
+	 {
+		 return self::ACTIVE === $this->statement;
+	 }
+
+	 public function isInStandBy(): bool
+	 {
+		 return self::STANDBY === $this->statement;
+	 }
 }
diff --git a/src/Modules/Athena/Repository/CommercialRouteRepository.php b/src/Modules/Athena/Repository/CommercialRouteRepository.php
index d006fd9e3..8b2a41443 100644
--- a/src/Modules/Athena/Repository/CommercialRouteRepository.php
+++ b/src/Modules/Athena/Repository/CommercialRouteRepository.php
@@ -5,6 +5,7 @@
 use App\Classes\Entity\AbstractRepository;
 
 use App\Modules\Athena\Model\CommercialRoute;
+use App\Modules\Athena\Model\OrbitalBase;
 use App\Modules\Demeter\Model\Color;
 use App\Modules\Zeus\Model\Player;
 
@@ -74,6 +75,42 @@ public function get($id)
 		return $commercialRoute;
 	}
 
+	public function searchCandidates(int $playerId, OrbitalBase $orbitalBase, array $factions, int $minDistance, int $maxDistance): array
+	{
+		$qr = $this->connection->prepare('SELECT
+			pa.rColor AS playerColor,
+			pa.avatar AS playerAvatar,
+			pa.name AS playerName,
+			ob.name AS baseName,
+			ob.rPlace AS rPlace,
+			(FLOOR(SQRT(POW(? - s.xPosition, 2) + POW(? - s.yPosition, 2)))) AS distance
+			FROM orbitalBase AS ob
+			LEFT JOIN player AS pa
+			ON ob.rPlayer = pa.id
+			LEFT JOIN place AS p
+			ON ob.rPlace = p.id
+			LEFT JOIN system AS s
+			ON p.rSystem = s.id
+			LEFT JOIN sector AS se
+			ON s.rSector = se.id
+			WHERE
+			pa.id != ?
+			AND ob.levelSpatioport > 0
+			AND (FLOOR(SQRT(POW(? - s.xPosition, 2) + POW(? - s.yPosition, 2)))) >= ?
+			AND (FLOOR(SQRT(POW(? - s.xPosition, 2) + POW(? - s.yPosition, 2)))) <= ?
+			AND pa.rColor in (' . implode(',', $factions) . ')
+			ORDER BY distance DESC
+			LIMIT 0, 40'
+		);
+		$qr->execute([
+			$orbitalBase->xSystem, $orbitalBase->ySystem,
+			$playerId,
+			$orbitalBase->xSystem, $orbitalBase->ySystem, $minDistance,
+			$orbitalBase->xSystem, $orbitalBase->ySystem, $maxDistance
+		]);
+		return $qr->fetchAll();
+	}
+
 	public function getAllPlayerRoutes(Player $player): array
 	{
 		$query = $this->connection->prepare('SELECT
diff --git a/src/Modules/Atlas/Infrastructure/Controller/MapController.php b/src/Modules/Atlas/Infrastructure/Controller/MapController.php
index d18413062..6c66ab675 100644
--- a/src/Modules/Atlas/Infrastructure/Controller/MapController.php
+++ b/src/Modules/Atlas/Infrastructure/Controller/MapController.php
@@ -67,6 +67,8 @@ public function __invoke(
 				'combat_reports' => $liveReportManager->getAttackReportsByPlaces($currentPlayer->getId(), $placesIds),
 				'colonization_cost' => $conquestManager->getColonizationCost($currentPlayer, $basesCount),
 				'conquest_cost' => $conquestManager->getConquestCost($currentPlayer, $basesCount),
+				'route_sector_bonus' => $this->getParameter('athena.trade.route.sector_bonus'),
+				'route_color_bonus' => $this->getParameter('athena.trade.route.color_bonus'),
 			];
 		}
 
diff --git a/src/action/std/athena/route/accept.php b/src/action/std/athena/route/accept.php
deleted file mode 100755
index 8e4c549e2..000000000
--- a/src/action/std/athena/route/accept.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-# accept a commercial route action
-
-# int base 			id (rPlace) de la base orbitale qui accepte la route
-# int route 		id de la route commerciale
-
-use App\Classes\Library\Utils;
-use App\Classes\Library\DataAnalysis;
-use App\Classes\Library\Format;
-use App\Modules\Athena\Resource\OrbitalBaseResource;
-use App\Modules\Demeter\Resource\ColorResource;
-use App\Modules\Hermes\Model\Notification;
-use App\Modules\Demeter\Model\Color;
-use App\Classes\Library\Flashbag;
-use App\Classes\Exception\ErrorException;
-use App\Classes\Exception\FormException;
-use App\Modules\Athena\Model\CommercialRoute;
-
-$session = $this->getContainer()->get(\App\Classes\Library\Session\SessionWrapper::class);
-$request = $this->getContainer()->get('app.request');
-$database = $this->getContainer()->get(\App\Classes\Database\Database::class);
-$orbitalBaseManager = $this->getContainer()->get(\App\Modules\Athena\Manager\OrbitalBaseManager::class);
-$orbitalBaseHelper = $this->getContainer()->get(\App\Modules\Athena\Helper\OrbitalBaseHelper::class);
-$commercialRouteManager = $this->getContainer()->get(\App\Modules\Athena\Manager\CommercialRouteManager::class);
-$colorManager = $this->getContainer()->get(\App\Modules\Demeter\Manager\ColorManager::class);
-$playerManager = $this->getContainer()->get(\App\Modules\Zeus\Manager\PlayerManager::class);
-$notificationManager = $this->getContainer()->get(\App\Modules\Hermes\Manager\NotificationManager::class);
-$routeExperienceCoeff = $this->getContainer()->getParameter('athena.trade.experience_coeff');
-$entityManager = $this->getContainer()->get(\App\Classes\Entity\EntityManager::class);
-$mediaPath = $this->getContainer()->getParameter('media');
-
-for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) { 
-	$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
-}
-
-$base 	= $request->query->get('base');
-$route 	= $request->query->get('route');
-
-
-if ($base !== FALSE AND $route !== FALSE AND in_array($base, $verif)) {
-	$cr = $commercialRouteManager->getByIdAndDistantBase($route, $base);
-
-	if ($cr !== null && $cr->getStatement() == CommercialRoute::PROPOSED) {
-		$proposerFaction = $colorManager->get($cr->playerColor1);
-		$acceptorFaction = $colorManager->get($cr->playerColor2);
-		
-		if ($proposerFaction->colorLink[$cr->playerColor2] != Color::ENEMY && $acceptorFaction->colorLink[$cr->playerColor1] != Color::ENEMY) {
-			$proposerBase = $orbitalBaseManager->get($cr->getROrbitalBase());
-			$acceptorBase = $orbitalBaseManager->get($cr->getROrbitalBaseLinked());
-			
-			$nbrMaxCommercialRoute = $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::SPATIOPORT, 'level', $acceptorBase->getLevelSpatioport(), 'nbRoutesMax'); 
-			
-			if ($commercialRouteManager->countBaseActiveAndStandbyRoutes($acceptorBase->getId()) <= $nbrMaxCommercialRoute) {
-				# compute bonus if the player is from Negore
-				if ($session->get('playerInfo')->get('color') == ColorResource::NEGORA) {
-					$price = round($cr->getPrice() - ($cr->getPrice() * ColorResource::BONUS_NEGORA_ROUTE / 100));
-				} else {
-					$price = $cr->getPrice();
-				}
-
-				if ($session->get('playerInfo')->get('credit') >= $price) {
-					# débit des crédits au joueur
-					$acceptor = $playerManager->get($session->get('playerId'));
-					$playerManager->decreaseCredit($acceptor, $price);
-
-					# augmentation de l'expérience des deux joueurs
-					$exp = round($cr->getIncome() * $routeExperienceCoeff);
-					$playerManager->increaseExperience($acceptor, $exp);
-					$playerManager->increaseExperience($playerManager->get($proposerBase->getRPlayer()), $exp);
-					
-					# activation de la route
-					$cr->setStatement(CommercialRoute::ACTIVE);
-					$cr->setDCreation(Utils::now());
-
-					$n = new Notification();
-					$n->setRPlayer($proposerBase->getRPlayer());
-					$n->setTitle('Route commerciale acceptée');
-					$n->addBeg();
-					$n->addLnk('embassy/player-' . $session->get('playerId'), $session->get('playerInfo')->get('name'))->addTxt(' a accepté la route commerciale proposée entre ');
-					$n->addLnk('map/place-' . $acceptorBase->getRPlace(), $acceptorBase->getName())->addTxt(' et ');
-					$n->addLnk('map/place-' . $proposerBase->getRPlace(), $proposerBase->getName());
-					$n->addSep()->addTxt('Cette route vous rapporte ' . Format::numberFormat($cr->getIncome()) . ' crédits par relève.');
-					$n->addBrk()->addBoxResource('xp', $exp, 'expérience gagnée', $mediaPath);
-					$n->addSep()->addLnk('action/a-switchbase/base-' . $proposerBase->getRPlace() . '/page-spatioport', 'En savoir plus ?');
-					$n->addEnd();
-					$notificationManager->add($n);
-
-					$entityManager->flush();
-					$entityManager->clear(CommercialRoute::class);
-					if (true === $this->getContainer()->getParameter('data_analysis')) {
-						$qr = $database->prepare('INSERT INTO 
-							DA_CommercialRelation(`from`, `to`, type, weight, dAction)
-							VALUES(?, ?, ?, ?, ?)'
-						);
-						$qr->execute([$cr->playerId1, $cr->playerId2, 6, DataAnalysis::creditToStdUnit($cr->price), Utils::now()]);
-					}
-
-					$session->addFlashbag('Route commerciale acceptée, vous gagnez ' . $exp . ' points d\'expérience', Flashbag::TYPE_SUCCESS);
-				} else {
-					throw new ErrorException('impossible d\'accepter une route commerciale');
-				}
-			} else {
-				throw new ErrorException('impossible d\'accepter une route commerciale');
-			}
-		} else {
-			throw new ErrorException('Vous ne pouvez pas accepter les routes de ce joueur, vos deux factions sont en guerre');
-		}
-	} else {
-		throw new ErrorException('impossible d\'accepter une route commerciale');
-	}
-} else {
-	throw new FormException('pas assez d\'informations pour accepter une route commerciale');
-}
diff --git a/src/action/std/athena/route/cancel.php b/src/action/std/athena/route/cancel.php
deleted file mode 100755
index c43983d00..000000000
--- a/src/action/std/athena/route/cancel.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-# cancel a commercial route action
-
-# int base 			id (rPlace) de la base orbitale qui a proposé la route mais qui l'annule
-# int route 		id de la route commerciale
-
-use App\Modules\Hermes\Model\Notification;
-use App\Classes\Library\Flashbag;
-use App\Classes\Exception\ErrorException;
-use App\Classes\Exception\FormException;
-use App\Modules\Athena\Model\CommercialRoute;
-
-$session = $this->getContainer()->get(\App\Classes\Library\Session\SessionWrapper::class);
-$request = $this->getContainer()->get('app.request');
-$orbitalBaseManager = $this->getContainer()->get(\App\Modules\Athena\Manager\OrbitalBaseManager::class);
-$commercialRouteManager = $this->getContainer()->get(\App\Modules\Athena\Manager\CommercialRouteManager::class);
-$playerManager = $this->getContainer()->get(\App\Modules\Zeus\Manager\PlayerManager::class);
-$notificationManager = $this->getContainer()->get(\App\Modules\Hermes\Manager\NotificationManager::class);
-$routeCancelRefund = $this->getContainer()->getParameter('athena.trade.route.cancellation_refund');
-$entityManager = $this->getContainer()->get(\App\Classes\Entity\EntityManager::class);
-
-for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) { 
-	$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
-}
-
-$base = $request->query->get('base');
-$route = $request->query->get('route');
-
-if ($base !== FALSE AND $route !== FALSE AND in_array($base, $verif)) {
-	$cr = $commercialRouteManager->getByIdAndBase($route, $base);
-	if ($cr !== null && $cr->getStatement() == CommercialRoute::PROPOSED) {
-		$proposerBase = $orbitalBaseManager->get($cr->getROrbitalBase());
-		$linkedBase = $orbitalBaseManager->get($cr->getROrbitalBaseLinked());
-
-		//rend 80% des crédits investis
-		$playerManager->increaseCredit($playerManager->get($session->get('playerId')), round($cr->getPrice() * $routeCancelRefund));
-
-		//notification
-		$n = new Notification();
-		$n->setRPlayer($linkedBase->getRPlayer());
-		$n->setTitle('Route commerciale annulée');
-
-		$n->addBeg()->addLnk('embassy/player-' . $session->get('playerId'), $session->get('playerInfo')->get('name'))->addTxt(' a finalement retiré la proposition de route commerciale qu\'il avait faite entre ');
-		$n->addLnk('map/place-' . $linkedBase->getRPlace(), $linkedBase->getName())->addTxt(' et ');
-		$n->addLnk('map/place-' . $proposerBase->getRPlace(), $proposerBase->getName());
-		$n->addEnd();
-		$notificationManager->add($n);
-
-		//destruction de la route
-		$commercialRouteManager->remove($cr);
-		$session->addFlashbag('Route commerciale annulée. Vous récupérez les ' . $routeCancelRefund * 100 . '% du montant investi.', Flashbag::TYPE_SUCCESS);
-	} else {
-		throw new ErrorException('impossible d\'annuler une route commerciale');
-	}
-} else {
-	throw new FormException('pas assez d\'informations pour annuler une route commerciale');
-}
-$entityManager->flush();
diff --git a/src/action/std/athena/route/delete.php b/src/action/std/athena/route/delete.php
deleted file mode 100755
index ff7d20725..000000000
--- a/src/action/std/athena/route/delete.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-# delete a commercial route action
-
-# int base 			id (rPlace) de la base orbitale qui veut supprimer la route
-# int route 		id de la route commerciale
-
-use App\Classes\Library\Flashbag;
-use App\Classes\Exception\ErrorException;
-use App\Classes\Exception\FormException;
-use App\Modules\Hermes\Model\Notification;
-use App\Modules\Athena\Model\CommercialRoute;
-
-$request = $this->getContainer()->get('app.request');
-$session = $this->getContainer()->get(\App\Classes\Library\Session\SessionWrapper::class);
-$commercialRouteManager = $this->getContainer()->get(\App\Modules\Athena\Manager\CommercialRouteManager::class);
-$orbitalBaseManager = $this->getContainer()->get(\App\Modules\Athena\Manager\OrbitalBaseManager::class);
-$playerManager = $this->getContainer()->get(\App\Modules\Zeus\Manager\PlayerManager::class);
-$notificationManager = $this->getContainer()->get(\App\Modules\Hermes\Manager\NotificationManager::class);
-$routeExperienceCoeff = $this->getContainer()->getParameter('athena.trade.experience_coeff');
-
-for ($i = 0; $i < $session->get('playerBase')->get('ob')->size(); $i++) { 
-	$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
-}
-
-$base = $request->query->get('base');
-$route = $request->query->get('route');
-
-if ($base !== FALSE AND $route !== FALSE AND in_array($base, $verif)) {
-	$cr = $commercialRouteManager->get($route);
-	if ($cr !== null && in_array($cr->statement, [CommercialRoute::ACTIVE, CommercialRoute::STANDBY])) {
-		if ($cr->playerId1 == $session->get('playerId') || $cr->playerId2 == $session->get('playerId')) {
-			if ($cr->getROrbitalBase() == $base OR $cr->getROrbitalBaseLinked() == $base) {
-				$proposerBase = $orbitalBaseManager->get($cr->getROrbitalBase());
-				$linkedBase = $orbitalBaseManager->get($cr->getROrbitalBaseLinked());
-				if ($cr->getROrbitalBase() == $base) {
-					$notifReceiver = $linkedBase->getRPlayer();
-					$myBaseName = $proposerBase->getName();
-					$otherBaseName = $linkedBase->getName();
-					$myBaseId = $proposerBase->getRPlace();
-					$otherBaseId = $linkedBase->getRPlace();
-				} else { //if ($cr->getROrbitalBaseLinked == $base) {
-					$notifReceiver = $proposerBase->getRPlayer();
-					$myBaseName = $linkedBase->getName();
-					$otherBaseName = $proposerBase->getName();
-					$myBaseId = $linkedBase->getRPlace();
-					$otherBaseId = $proposerBase->getRPlace();
-				}
-
-				# perte du prestige pour les joueurs Négoriens
-				# @TODO check if this code is used somewhere or not
-//				$S_PAM1 = $playerManager->getCurrentSession();
-//				$playerManager->newSession();
-//				$playerManager->load(array('id' => array($cr->playerId1, $cr->playerId2)));
-//				$exp = round($cr->getIncome() * $routeExperienceCoeff);
-//				
-//				$playerManager->changeSession($S_PAM1);
-				//notification
-				$n = new Notification();
-				$n->setRPlayer($notifReceiver);
-				$n->setTitle('Route commerciale détruite');
-				$n->addBeg()->addLnk('embassy/player-' . $session->get('playerId'), $session->get('playerInfo')->get('name'))->addTxt(' annule les accords commerciaux entre ');
-				$n->addLnk('map/place-' . $myBaseId, $myBaseName)->addTxt(' et ');
-				$n->addLnk('map/place-' . $otherBaseId, $otherBaseName)->addTxt('.');
-				$n->addSep()->addTxt('La route commerciale qui liait les deux bases orbitales est détruite, elle ne vous rapporte donc plus rien !');
-				$n->addEnd();
-				$notificationManager->add($n);
-
-				//destruction de la route
-				$commercialRouteManager->remove($cr);
-
-				$session->addFlashbag('Route commerciale détruite', Flashbag::TYPE_SUCCESS);
-			} else {
-				throw new ErrorException('impossible de supprimer une route commerciale');
-			}
-		} else {
-				throw new ErrorException('cette route ne vous appartient pas');
-			}
-	} else {
-		throw new ErrorException('impossible de supprimer une route commerciale');
-	}
-} else {
-	throw new FormException('pas assez d\'informations pour supprimer une route commerciale');
-}
diff --git a/src/action/std/athena/route/propose.php b/src/action/std/athena/route/propose.php
deleted file mode 100755
index 90ebcec9c..000000000
--- a/src/action/std/athena/route/propose.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-# propose a commercial route action
-
-# int basefrom 		id (rPlace) de la base orbitale qui propose la route
-# int baseto 		id (rPlace) de la base orbitale à qui la route est proposée
-
-use App\Classes\Library\Game;
-use App\Classes\Library\Utils;
-use App\Classes\Library\Format;
-use App\Modules\Athena\Resource\OrbitalBaseResource;
-use App\Modules\Athena\Model\CommercialRoute;
-use App\Modules\Hermes\Model\Notification;
-use App\Modules\Demeter\Model\Color;
-use App\Modules\Demeter\Resource\ColorResource;
-use App\Classes\Library\Flashbag;
-use App\Classes\Exception\ErrorException;
-use App\Classes\Exception\FormException;
-
-$request = $this->getContainer()->get('app.request');
-$session = $this->getContainer()->get(\App\Classes\Library\Session\SessionWrapper::class);
-$commercialRouteManager = $this->getContainer()->get(\App\Modules\Athena\Manager\CommercialRouteManager::class);
-$orbitalBaseManager = $this->getContainer()->get(\App\Modules\Athena\Manager\OrbitalBaseManager::class);
-$orbitalBaseHelper = $this->getContainer()->get(\App\Modules\Athena\Helper\OrbitalBaseHelper::class);
-$playerManager = $this->getContainer()->get(\App\Modules\Zeus\Manager\PlayerManager::class);
-$notificationManager = $this->getContainer()->get(\App\Modules\Hermes\Manager\NotificationManager::class);
-$colorManager = $this->getContainer()->get(\App\Modules\Demeter\Manager\ColorManager::class);
-$routeColorBonus = $this->getContainer()->getParameter('athena.trade.route.color_bonus');
-$routeSectorBonus = $this->getContainer()->getParameter('athena.trade.route.sector_bonus');
-$entityManager = $this->getContainer()->get(\App\Classes\Entity\EntityManager::class);
-
-for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) { 
-	$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
-}
-$baseFrom 	= $request->query->get('basefrom');
-$baseTo 	= $request->query->get('baseto');
-
-if ($baseFrom !== FALSE AND $baseTo !== FALSE AND in_array($baseFrom, $verif)) {
-	$proposerBase = $orbitalBaseManager->get($baseFrom);
-	$otherBase = $orbitalBaseManager->get($baseTo);
-
-	$nbrMaxCommercialRoute = $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::SPATIOPORT, 'level', $proposerBase->getLevelSpatioport(), 'nbRoutesMax');
-	
-	// Check if a route already exists between these two bases
-	$alreadyARoute = $commercialRouteManager->isAlreadyARoute($proposerBase->getId(), $otherBase->getId());
-
-	if (($commercialRouteManager->countBaseRoutes($proposerBase->getId()) < $nbrMaxCommercialRoute) && (!$alreadyARoute) && ($proposerBase->getLevelSpatioport() > 0) && ($otherBase->getLevelSpatioport() > 0)) {
-		$player = $playerManager->get($otherBase->getRPlayer());
-
-		$playerFaction = $colorManager->get($session->get('playerInfo')->get('color'));
-		$otherFaction = $colorManager->get($player->rColor);
-		
-		if ($playerFaction->colorLink[$player->rColor] != Color::ENEMY && $otherFaction->colorLink[$session->get('playerInfo')->get('color')] != Color::ENEMY) {
-
-			if ($proposerBase !== null && $otherBase !== null && ($proposerBase->getRPlayer() != $otherBase->getRPlayer()) && $player !== null) {
-				$distance = Game::getDistance($proposerBase->getXSystem(), $otherBase->getXSystem(), $proposerBase->getYSystem(), $otherBase->getYSystem());
-				$bonusA = ($proposerBase->getSector() != $otherBase->getSector()) ? $routeSectorBonus : 1;
-				$bonusB = ($session->get('playerInfo')->get('color')) != $player->getRColor() ? $routeColorBonus : 1;
-				$price = Game::getRCPrice($distance);
-				$income = Game::getRCIncome($distance, $bonusA, $bonusB);
-				
-				if ($distance == 1) {
-					$imageLink = '1-' . rand(1, 3);
-				} elseif ($distance < 26) {
-					$imageLink = '2-' . rand(1, 3);
-				} elseif ($distance < 126) {
-					$imageLink = '3-' . rand(1, 3);
-				} else {
-					$imageLink = '4-' . rand(1, 3);
-				}
-
-				# compute bonus
-				if (in_array(ColorResource::COMMERCIALROUTEPRICEBONUS, $playerFaction->bonus)) {
-					$priceWithBonus = round($price - ($price * ColorResource::BONUS_NEGORA_ROUTE / 100));
-				} else {
-					$priceWithBonus = $price;
-				}
-
-				if ($session->get('playerInfo')->get('credit') >= $priceWithBonus) {
-					# création de la route
-					$cr = new CommercialRoute();
-					$cr->setROrbitalBase($proposerBase->getId());
-					$cr->setROrbitalBaseLinked($otherBase->getId());
-					$cr->setImageLink($imageLink);
-					$cr->setDistance($distance);
-					$cr->setPrice($price);
-					$cr->setIncome($income);
-					$cr->setDProposition(Utils::now());
-					$cr->setDCreation(NULL);
-					$cr->setStatement(0);
-					$commercialRouteManager->add($cr);
-					
-					# débit des crédits au joueur
-					$playerManager->decreaseCredit($playerManager->get($session->get('playerId')), $priceWithBonus);
-
-					$n = new Notification();
-					$n->setRPlayer($otherBase->getRPlayer());
-					$n->setTitle('Proposition de route commerciale');
-					$n->addBeg()->addLnk('embassy/player-' . $session->get('playerId'), $session->get('playerInfo')->get('name'));
-					$n->addTxt(' vous propose une route commerciale liant ');
-					$n->addLnk('map/place-' . $proposerBase->getRPlace(), $proposerBase->getName())->addTxt(' et ');
-					$n->addLnk('map/place-' . $otherBase->getRPlace(), $otherBase->getName())->addTxt('.');
-					$n->addSep()->addTxt('Les frais de l\'opération vous coûteraient ' . Format::numberFormat($priceWithBonus) . ' crédits; Les gains estimés pour cette route sont de ' . Format::numberFormat($income) . ' crédits par relève.');
-					$n->addSep()->addLnk('action/a-switchbase/base-' . $otherBase->getRPlace() . '/page-spatioport', 'En savoir plus ?');
-					$n->addEnd();
-					$notificationManager->add($n);
-
-					$session->addFlashbag('Route commerciale proposée', Flashbag::TYPE_SUCCESS);
-				} else {
-					throw new ErrorException('impossible de proposer une route commerciale - vous n\'avez pas assez de crédits');
-				}
-			} else {
-				throw new ErrorException('impossible de proposer une route commerciale (2)');
-			}
-		} else {
-			throw new ErrorException('impossible de proposer une route commerciale à ce joueur, vos factions sont en guerre.');
-		}
-	} else {
-		throw new ErrorException('impossible de proposer une route commerciale (3)');
-	}
-} else {
-	throw new FormException('pas assez d\'informations pour proposer une route commerciale');
-}
diff --git a/src/action/std/athena/route/refuse.php b/src/action/std/athena/route/refuse.php
deleted file mode 100755
index 3882faff1..000000000
--- a/src/action/std/athena/route/refuse.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-# refuse a commercial route action
-
-# int base 			id (rPlace) de la base orbitale qui refuse la route
-# int route 		id de la route commerciale
-
-use App\Classes\Library\Flashbag;
-use App\Classes\Exception\ErrorException;
-use App\Classes\Exception\FormException;
-use App\Classes\Library\Format;
-use App\Modules\Hermes\Model\Notification;
-use App\Modules\Athena\Model\CommercialRoute;
-
-$request = $this->getContainer()->get('app.request');
-$session = $this->getContainer()->get(\App\Classes\Library\Session\SessionWrapper::class);
-$commercialRouteManager = $this->getContainer()->get(\App\Modules\Athena\Manager\CommercialRouteManager::class);
-$orbitalBaseManager = $this->getContainer()->get(\App\Modules\Athena\Manager\OrbitalBaseManager::class);
-$orbitalBaseHelper = $this->getContainer()->get(\App\Modules\Athena\Helper\OrbitalBaseHelper::class);
-$playerManager = $this->getContainer()->get(\App\Modules\Zeus\Manager\PlayerManager::class);
-$notificationManager = $this->getContainer()->get(\App\Modules\Hermes\Manager\NotificationManager::class);
-$colorManager = $this->getContainer()->get(\App\Modules\Demeter\Manager\ColorManager::class);
-
-for ($i=0; $i < $session->get('playerBase')->get('ob')->size(); $i++) { 
-	$verif[] = $session->get('playerBase')->get('ob')->get($i)->get('id');
-}
-
-$base = $request->query->get('base');
-$route = $request->query->get('route');
-
-if ($base !== FALSE AND $route !== FALSE AND in_array($base, $verif)) {
-	$cr = $commercialRouteManager->getByIdAndDistantBase($route, $base);
-	if ($cr !== null && $cr->getStatement() === CommercialRoute::PROPOSED) {
-		$proposerBase = $orbitalBaseManager->get($cr->getROrbitalBase());
-		$refusingBase = $orbitalBaseManager->get($cr->getROrbitalBaseLinked());
-
-		//rend les crédits au proposant
-		$playerManager->increaseCredit($playerManager->get($proposerBase->getRPlayer()), intval($cr->getPrice()));
-
-		//notification
-		$n = new Notification();
-		$n->setRPlayer($proposerBase->getRPlayer());
-		$n->setTitle('Route commerciale refusée');
-		$n->addBeg()->addLnk('embassy/player-' . $session->get('playerId'), $session->get('playerInfo')->get('name'))->addTxt(' a refusé la route commerciale proposée entre ');
-		$n->addLnk('map/place-' . $refusingBase->getRPlace(), $refusingBase->getName())->addTxt(' et ');
-		$n->addLnk('map/place-' . $proposerBase->getRPlace(), $proposerBase->getName())->addTxt('.');
-		$n->addSep()->addTxt('Les ' . Format::numberFormat($cr->getPrice()) . ' crédits bloqués sont à nouveau disponibles.');
-		$n->addEnd();
-		$notificationManager->add($n);
-
-		//destruction de la route
-		$commercialRouteManager->remove($cr);
-		$session->addFlashbag('Route commerciale refusée', Flashbag::TYPE_SUCCESS);
-	} else {
-		throw new ErrorException('impossible de refuser une route commerciale');
-	}
-} else {
-	throw new FormException('pas assez d\'informations pour refuser une route commerciale');
-}
diff --git a/src/views/components/bases/ob/spatioport.php b/src/views/components/bases/ob/spatioport.php
deleted file mode 100755
index a3c4ab19a..000000000
--- a/src/views/components/bases/ob/spatioport.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-# spatioport component
-# in athena.bases package
-
-# affichage du spatioport
-
-# require
-	# {orbitalBase}		ob_spatioport
-
-use App\Modules\Athena\Resource\OrbitalBaseResource;
-use App\Classes\Library\Format;
-use App\Classes\Library\Chronos;
-use App\Modules\Zeus\Model\PlayerBonus;
-use App\Modules\Demeter\Resource\ColorResource;
-use App\Modules\Gaia\Resource\PlaceResource;
-use App\Classes\Library\Game;
-use App\Modules\Athena\Model\CommercialRoute;
-
-$container = $this->getContainer();
-$appRoot = $container->getParameter('app_root');
-$mediaPath = $container->getParameter('media');
-$componentPath = $container->getParameter('component');
-$orbitalBaseHelper = $this->getContainer()->get(\App\Modules\Athena\Helper\OrbitalBaseHelper::class);
-$request = $this->getContainer()->get('app.request');
-$commercialRouteManager = $this->getContainer()->get(\App\Modules\Athena\Manager\CommercialRouteManager::class);
-$database = $this->getContainer()->get(\App\Classes\Database\Database::class);
-$session = $this->getContainer()->get(\App\Classes\Library\Session\SessionWrapper::class);
-$sessionToken = $session->get('token');
-$entityManager = $this->getContainer()->get(\App\Classes\Entity\EntityManager::class);
-
-$nMaxCR = $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::SPATIOPORT, 'level', $ob_spatioport->getLevelSpatioport(), 'nbRoutesMax');
-$nCRWaitingForOther = 0; $nCRWaitingForMe = 0;
-$nCROperational = 0; $nCRInStandBy = 0;
-$nCRInDock = 0;
-$totalIncome = 0;
-
-$routes = array_merge(
-	$commercialRouteManager->getByBase($ob_spatioport->getId()),
-	$commercialRouteManager->getByDistantBase($ob_spatioport->getId())
-);
-
-if (count($routes) > 0) {
-	foreach ($routes as $route) {
-		if ($route->getStatement() == CommercialRoute::PROPOSED AND $route->getPlayerId1() == $session->get('playerId')) {
-			$nCRWaitingForOther++;
-		} elseif ($route->getStatement() == CommercialRoute::PROPOSED AND $route->getPlayerId1() != $session->get('playerId')) {
-			$nCRWaitingForMe++;
-		} elseif ($route->getStatement() == CommercialRoute::ACTIVE) {
-			$nCROperational++;
-			$totalIncome += $route->getIncome();
-		} elseif ($route->getStatement() == CommercialRoute::STANDBY) {
-			$nCRInStandBy++;
-		}
-	}
-	$nCRInDock = $nCROperational + $nCRInStandBy + $nCRWaitingForOther;
-}
-$inGameFactions = $this->getContainer()->get(\App\Modules\Demeter\Manager\ColorManager::class)->getInGameFactions();
-
-$factions = [];
-foreach ($inGameFactions as $inGameFaction) { 
-	$factions[] = $inGameFaction->id;
-}
-
-# view
-echo '<div class="component building rc">';
-	echo '<div class="head skin-1">';
-		echo '<img src="' . $mediaPath . 'orbitalbase/spatioport.png" alt="" />';
-		echo '<h2>' . $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::SPATIOPORT, 'frenchName') . '</h2>';
-		echo '<em>Niveau ' . $ob_spatioport->getLevelSpatioport() . '</em>';
-	echo '</div>';
-	echo '<div class="fix-body">';
-		echo '<div class="body">';
-			$active = (!$request->query->has('mode') || $request->query->get('mode') == 'list') ? 'active' : '';
-			echo '<a href="' . $appRoot . 'bases/view-spatioport/mode-list" class="nav-element ' . $active . '">';
-				echo '<img src="' . $mediaPath . 'map/option/market.png" alt="" />';
-				echo '<strong>Routes commerciales</strong>';
-				echo '<em>Gérez vos routes commerciales</em>';
-			echo '</a>';
-
-			$active = ($request->query->get('mode') == 'search') ? 'active' : '';
-			echo '<a href="' . $appRoot . 'bases/view-spatioport/mode-search" class="nav-element ' . $active . '">';
-				echo '<img src="' . $mediaPath . 'map/option/radio.png" alt="" />';
-				echo '<strong>Recherche</strong>';
-				echo '<em>Trouvez des partenaires commerciaux</em>';
-			echo '</a>';
-
-			echo '<hr />';
-
-			echo '<div class="number-box">';
-				echo '<span class="label">routes commerciales</span>';
-				echo '<span class="value">' . $nCRInDock . ' / ' . $nMaxCR . '</span>';
-
-				echo '<span class="progress-bar">';
-				echo '<span style="width:' . Format::percent($nCRInDock, $nMaxCR) . '%;" class="content"></span>';
-			echo '</div>';
-
-			echo '<div class="number-box ' . (($nCROperational == 0) ? 'grey' : '') . '">';
-				echo '<span class="label">routes commerciales actives</span>';
-				echo '<span class="value">' . $nCROperational . '</span>';
-			echo '</div>';
-
-			echo '<div class="number-box ' . (($nCRWaitingForOther == 0) ? 'grey' : '') . '">';
-				echo '<span class="label">routes commerciales en attente</span>';
-				echo '<span class="value">' . $nCRWaitingForOther . '</span>';
-			echo '</div>';
-
-			echo '<div class="number-box ' . (($nCRWaitingForMe == 0) ? 'grey' : '') . '">';
-				echo '<span class="label">propositions commerciales</span>';
-				echo '<span class="value">' . $nCRWaitingForMe . '</span>';
-			echo '</div>';
-
-			if ($nCRInStandBy > 0) {
-				echo '<div class="number-box">';
-					echo '<span class="label">routes commerciales bloquées</span>';
-					echo '<span class="value">' . $nCRInStandBy . '</span>';
-				echo '</div>';
-			}
-
-			echo '<hr />';
-
-			echo '<div class="number-box">';
-				echo '<span class="label">revenu total de cette base</span>';
-				echo '<span class="value">';
-					echo Format::numberFormat($totalIncome);
-					if ($session->get('playerBonus')->get(PlayerBonus::COMMERCIAL_INCOME) != 0) {
-						echo '<span class="bonus">+ ' .  Format::numberFormat($session->get('playerBonus')->get(PlayerBonus::COMMERCIAL_INCOME) * $totalIncome / 100)  . '</span>';
-					}
-					echo ' <img src="' . $mediaPath . 'resources/credit.png" class="icon-color" />';
-				echo '</span>';
-			echo '</div>';
-		echo '</div>';
-	echo '</div>';
-echo '</div>';
-
-if ($request->query->get('mode') === 'search') {
-	echo '<div class="component new-message">';
-		echo '<div class="head skin-2">';
-			echo '<h2>Recherche</h2>';
-		echo '</div>';
-		echo '<div class="fix-body">';
-			echo '<div class="body">';
-				echo '<form action="' . $appRoot . 'bases/view-spatioport/mode-search/show-result" method="POST" />';
-					echo '<h4>Chercher des partenaires commerciaux...</h4>';
-					foreach ($factions as $i) {
-						echo '<p><label for="ckb-faction-' . $i . '">';
-							echo '<input type="checkbox" name="faction-' . $i . '" id="ckb-faction-' . $i . '" ' . (!$request->query->has('show') || $request->request->has('faction-' . $i) ? 'checked' : NULL) . ' /> ';
-							echo ColorResource::getInfo($i, 'demonym');
-						echo '</label></p>';
-					}
-
-					echo '<h4>A une distance...</h4>';
-
-					echo '<p><label for="search-rc-min-dist">Minimum</label></p>';
-					echo '<p class="input input-text"><input type="number" id="search-rc-min-dist" name="min-dist" value="' . ($request->request->has('min-dist') ? $request->request->get('min-dist') : 75) . '" /></p>';
-
-					echo '<p><label for="search-rc-max-dist">Maximum</label></p>';
-					echo '<p class="input input-text"><input type="number" id="search-rc-max-dist" name="max-dist" value="' . ($request->request->has('max-dist') ? $request->request->get('max-dist') : 125) . '" /></p>';
-
-					echo '<p><button>Rechercher</button></p>';
-				echo '</form>';
-			echo '</div>';
-		echo '</div>';
-	echo '</div>';
-
-	if ($request->query->get('show') === 'result') {
-		$min = $request->request->has('min-dist') ? abs(intval($request->request->get('min-dist'))) : 75;
-		$max = $request->request->has('max-dist') ? abs(intval($request->request->get('max-dist'))) : 75;
-
-		$checkedFactions = [0];
-		foreach ($factions as $i) {
-			if ($request->request->has('faction-' . $i)) {
-				$checkedFactions[] = $i;
-			}
-		}
-
-		$qr = $database->prepare('SELECT 
-				pa.rColor AS playerColor,
-				pa.avatar AS playerAvatar,
-				pa.name AS playerName,
-				ob.name AS baseName,
-				ob.rPlace AS rPlace,
-				(FLOOR(SQRT(POW(? - s.xPosition, 2) + POW(? - s.yPosition, 2)))) AS distance
-			FROM orbitalBase AS ob
-			LEFT JOIN player AS pa
-				ON ob.rPlayer = pa.id
-			LEFT JOIN place AS p
-				ON ob.rPlace = p.id
-			LEFT JOIN system AS s
-				ON p.rSystem = s.id
-			LEFT JOIN sector AS se
-				ON s.rSector = se.id
-			WHERE
-				pa.id != ?
-				AND ob.levelSpatioport > 0
-				AND (FLOOR(SQRT(POW(? - s.xPosition, 2) + POW(? - s.yPosition, 2)))) >= ?
-				AND (FLOOR(SQRT(POW(? - s.xPosition, 2) + POW(? - s.yPosition, 2)))) <= ?
-				AND pa.rColor in (' . implode(',', $checkedFactions) . ')
-			ORDER BY distance DESC
-			LIMIT 0, 40'
-		);
-		$qr->execute([
-			$ob_spatioport->xSystem, $ob_spatioport->ySystem,
-			$session->get('playerId'),
-			$ob_spatioport->xSystem, $ob_spatioport->ySystem, $min,
-			$ob_spatioport->xSystem, $ob_spatioport->ySystem, $max
-		]);
-		$aw = $qr->fetchAll();
-
-		echo '<div class="component player rank">';
-			echo '<div class="head skin-2">';
-				echo '<h2>Résultats</h2>';
-			echo '</div>';
-			echo '<div class="fix-body">';
-				echo '<div class="body">';
-					foreach ($aw as $base) {
-						echo '<a href="' . $appRoot . 'map/place-' . $base['rPlace'] . '" class="player color' . $base['playerColor'] . '">';
-							echo '<img src="' . $mediaPath . 'avatar/small/' . $base['playerAvatar'] . '.png" alt="" class="picto">';
-							echo '<span class="title">' . $base['playerName'] . '</span>';
-							echo '<strong class="name">' . $base['baseName'] . '</strong>';
-							echo '<span class="experience">' . $base['distance'] . ' al.</span>';
-						echo '</a>';
-					}
-
-					if (count($aw) == 0) {
-						echo '<p><em>Aucun partenaire commercial trouvé selon les critères de recherche fournis.</em></p>';
-					}
-				echo '</div>';
-			echo '</div>';
-		echo '</div>';
-	}
-} else {
-	$j = 0;
-	foreach ($routes as $rc) {
-		if ($rc->getStatement() == CommercialRoute::PROPOSED && $rc->getPlayerId2() == $session->get('playerId')) {
-			$base1  = '<div class="base">';
-				$base1 .= '<img src="' . $mediaPath . 'map/place/place1-' . Game::getSizeOfPlanet($rc->getPopulation1()) . '.png" alt="' . $ob_spatioport->getName() . '" class="place" />';
-				$base1 .= '' . PlaceResource::get($rc->baseType1, 'name') . ' <a href="' . $appRoot . 'map/place-' . $rc->getROrbitalBase() . '">' . $rc->getBaseName1() . '</a><br />';
-				$base1 .= 'de <a href="' . $appRoot . 'embassy/player-' . $rc->getPlayerId1() . '">' . $rc->getPlayerName1() . '</a><br />';
-				$base1 .= Format::numberFormat($rc->getPopulation1()) . ' millions de population';
-			$base1 .= '</div>';
-
-			$base2  = '<div class="base">';
-				$base2 .= '<img src="' . $mediaPath . 'map/place/place1-' . Game::getSizeOfPlanet($rc->getPopulation2()) . '.png" alt="' . $ob_spatioport->getName() . '" class="place" />';
-				$base2 .= '' . PlaceResource::get($rc->baseType2, 'name') . ' <a href="' . $appRoot . 'map/place-' . $rc->getROrbitalBaseLinked() . '">' . $rc->getBaseName2() . '</a><br />';
-				$base2 .= 'de <a href="' . $appRoot . 'embassy/player-' . $rc->getPlayerId2() . '">' . $rc->getPlayerName2() . '</a><br />';
-				$base2 .= Format::numberFormat($rc->getPopulation2()) . ' millions de population';
-			$base2 .= '</div>';
-
-			echo '<div class="component rc">';
-				echo '<div class="head skin-5">';
-					echo ($j == 0) ? '<h2>Propositions</h2>' : '';
-				echo '</div>';
-				echo '<div class="fix-body">';
-					echo '<div class="body">';
-						echo '<div class="tool">';
-							if ($rc->getPrice() > $session->get('playerInfo')->get('credit')) {
-								echo '<span><a href="#">pas assez de crédits pour accepter</a></span>';
-							} elseif ($nCRInDock >= $nMaxCR) {
-								echo '<span><a href="#">pas d\'emplacement libre pour accepter</a></span>';
-							} else {
-								$price = $rc->getPrice();
-								if ($session->get('playerInfo')->get('color') == ColorResource::NEGORA) {
-									# bonus if the player is from Negore
-									$price -= round($price * ColorResource::BONUS_NEGORA_ROUTE / 100);
-								}
-								echo '<span><a href="' . Format::actionBuilder('acceptroute', $sessionToken, ['base' => $rc->getROrbitalBaseLinked(), 'route' => $rc->getId()]) . '">accepter pour ' . Format::numberFormat($price) . ' crédits</a></span>';
-							}
-							echo '<span><a href="' . Format::actionBuilder('refuseroute', $sessionToken, ['base' => $rc->getROrbitalBaseLinked(), 'route' => $rc->getId()]) . '" class="hb lt" title="refuser l\'offre">x</a></span>';
-						echo '</div>';
-
-						echo '<div class="number-box grey">';
-							echo '<span class="label">Etat de la route commerciale</span>';
-							echo '<span class="value">';
-								echo 'En attente';
-							echo '</span>';
-						echo '</div>';
-
-						echo '<div class="rc ' . (($rc->getStatement() != CommercialRoute::ACTIVE) ? 'no-tax' : '') . '" style="height: ' . (370 + $rc->getDistance()) . 'px;">';
-							echo ($rc->getPlayerId1() == $session->get('playerId')) ? $base2 : $base1;
-
-							echo '<ul class="general">';
-								echo '<li>Distance <strong>' . $rc->getDistance() . ' al.</strong></li>';
-								echo '<li>Prix <strong>';
-									echo Format::numberFormat($rc->getPrice());
-									if ($session->get('playerInfo')->get('color') == ColorResource::NEGORA) {
-										# bonus if the player is from Negore
-										echo '<span class="bonus">- ' .  Format::numberFormat(round(ColorResource::BONUS_NEGORA_ROUTE * $rc->getPrice() / 100))  . '</span>';
-									}
-									echo ' <img src="' . $mediaPath . 'resources/credit.png" class="icon-color" />';
-								echo '</strong></li>';
-								echo '<li>Estimation du revenu par relève<strong>';
-									echo Format::numberFormat($rc->getIncome());
-									if ($session->get('playerBonus')->get(PlayerBonus::COMMERCIAL_INCOME) != 0) {
-										echo '<span class="bonus">+ ' .  Format::numberFormat($session->get('playerBonus')->get(PlayerBonus::COMMERCIAL_INCOME) * $rc->getIncome() / 100)  . '</span>';
-									}
-									echo ' <img src="' . $mediaPath . 'resources/credit.png" class="icon-color" />';		
-								echo '</strong></li>';
-								echo '<li>Population touchée <strong>' . Format::numberFormat($rc->getPopulation1() + $rc->getPopulation2()) . ' millions</strong></li>';
-
-								if (in_array($rc->getStatement(), array(CommercialRoute::ACTIVE, CommercialRoute::STANDBY))) {
-									echo '<li>En service depuis <br />' . Chronos::transform($rc->dCreation) . '</li>';
-								}
-							echo '</ul>';
-
-							echo ($rc->getPlayerId1() == $session->get('playerId')) ? $base1 : $base2;
-						echo '</div>';
-					echo '</div>';
-				echo '</div>';
-			echo '</div>';
-			$j++;
-		}
-	}
-
-	$j = 0;
-	foreach ($routes as $rc) {
-		if ($rc->getStatement() != CommercialRoute::PROPOSED || $rc->getPlayerId2() != $session->get('playerId')) {
-			$base1  = '<div class="base">';
-				$base1 .= '<img src="' . $mediaPath . 'map/place/place1-' . Game::getSizeOfPlanet($rc->getPopulation1()) . '.png" class="place" />';
-				$base1 .= '' . PlaceResource::get($rc->baseType1, 'name') . ' <a href="' . $appRoot . 'map/place-' . $rc->getROrbitalBase() . '">' . $rc->getBaseName1() . '</a><br />';
-				$base1 .= 'de <a href="' . $appRoot . 'embassy/player-' . $rc->getPlayerId1() . '">' . $rc->getPlayerName1() . '</a><br />';
-				$base1 .= Format::numberFormat($rc->getPopulation1()) . ' millions de population';
-			$base1 .= '</div>';
-
-			$base2  = '<div class="base">';
-				$base2 .= '<img src="' . $mediaPath . 'map/place/place1-' . Game::getSizeOfPlanet($rc->getPopulation2()) . '.png" class="place" />';
-				$base2 .= '' . PlaceResource::get($rc->baseType2, 'name') . ' <a href="' . $appRoot . 'map/place-' . $rc->getROrbitalBaseLinked() . '">' . $rc->getBaseName2() . '</a><br />';
-				$base2 .= 'de <a href="' . $appRoot . 'embassy/player-' . $rc->getPlayerId2() . '">' . $rc->getPlayerName2() . '</a><br />';
-				$base2 .= Format::numberFormat($rc->getPopulation2()) . ' millions de population';
-			$base2 .= '</div>';
-
-			echo '<div class="component rc">';
-				echo '<div class="head skin-5">';
-					echo ($j == 0) ? '<h2>Routes commerciales</h2>' : '';
-				echo '</div>';
-				echo '<div class="fix-body">';
-					echo '<div class="body">';
-						echo '<div class="tool">';
-						if ($rc->getStatement() == CommercialRoute::PROPOSED) {
-							echo '<span><a href="' . Format::actionBuilder('cancelroute', $sessionToken, ['base' => $ob_spatioport->getId(), 'route' => $rc->getId()]) . '">annuler la proposition commerciale</a></span>';
-						} else {
-							echo '<span><a href="' . Format::actionBuilder('deleteroute', $sessionToken, ['base' => $ob_spatioport->getId(), 'route' => $rc->getId()]) . '">démanteler la route commerciale</a></span>';
-						}
-						echo '</div>';
-
-						echo '<div class="number-box ' . (($rc->getStatement() != CommercialRoute::ACTIVE) ? 'grey' : '') . '">';
-							echo '<span class="label">Etat de la route commerciale</span>';
-							echo '<span class="value">';
-								switch ($rc->getStatement()) {
-									case CommercialRoute::PROPOSED:	echo 'En attente'; break;		
-									case CommercialRoute::ACTIVE:	echo 'En activité'; break;		
-									case CommercialRoute::STANDBY:	echo 'Gelée'; break;		
-									default: break;
-								}
-							echo '</span>';
-						echo '</div>';
-
-						echo '<div class="rc ' . (($rc->getStatement() != CommercialRoute::ACTIVE) ? 'no-tax' : '') . '" style="height: ' . (370 + $rc->getDistance()) . 'px;">';
-							echo ($rc->getPlayerId1() == $session->get('playerId')) ? $base2 : $base1;
-
-							echo '<ul class="general">';
-								echo '<li>Distance <strong>' . $rc->getDistance() . ' al.</strong></li>';
-								echo '<li>Revenu par relève ' . (($rc->getStatement() != CommercialRoute::ACTIVE) ? '[non effectif]' : '') . '<strong>';
-									echo Format::numberFormat($rc->getIncome());
-									if ($session->get('playerBonus')->get(PlayerBonus::COMMERCIAL_INCOME) != 0) {
-										echo '<span class="bonus">+ ' .  Format::numberFormat($session->get('playerBonus')->get(PlayerBonus::COMMERCIAL_INCOME) * $rc->getIncome() / 100)  . '</span>';
-									}
-									echo ' <img src="' . $mediaPath . 'resources/credit.png" class="icon-color" />';		
-								echo '</strong></li>';
-								echo '<li>Population touchée <strong>' . Format::numberFormat($rc->getPopulation1() + $rc->getPopulation2()) . ' millions</strong></li>';
-
-								if (in_array($rc->getStatement(), array(CommercialRoute::ACTIVE, CommercialRoute::STANDBY))) {
-									echo '<li>En service depuis <br />' . Chronos::transform($rc->dCreation) . '</li>';
-								}
-							echo '</ul>';
-
-							echo ($rc->getPlayerId1() == $session->get('playerId')) ? $base1 : $base2;
-						echo '</div>';
-					echo '</div>';
-				echo '</div>';
-			echo '</div>';
-			$j++;
-		}
-	}
-}
-
-echo '<div class="component">';
-	echo '<div class="head skin-2">';
-		echo '<h2>À propos</h2>';
-	echo '</div>';
-	echo '<div class="fix-body">';
-		echo '<div class="body">';
-			echo '<p class="long-info">' . $orbitalBaseHelper->getBuildingInfo(OrbitalBaseResource::SPATIOPORT, 'description') . '</p>';
-		echo '</div>';
-	echo '</div>';
-echo '</div>';
-
-if (count($routes) == 0) {
-	include $componentPath . 'default.php';
-}
-
-$entityManager->clear(CommercialRoute::class);
diff --git a/templates/components/base/fast_view.html.twig b/templates/components/base/fast_view.html.twig
index 646f3287c..01b76048e 100644
--- a/templates/components/base/fast_view.html.twig
+++ b/templates/components/base/fast_view.html.twig
@@ -212,10 +212,10 @@
 				<div class="number-box">
 					<span class="label">Routes commerciales</span>
 					<span class="value">
-						{{ orbital_base.commercialRoutesData.operational }} / {{ orbital_base.commercialRoutesData.max }}
+						{{ orbital_base.commercialRoutesData.total }} / {{ orbital_base.commercialRoutesData.max }}
 					</span>
 
-					{% set percent = ((orbital_base.commercialRoutesData.operational / orbital_base.commercialRoutesData.max) * 100)|number %}
+					{% set percent = ((orbital_base.commercialRoutesData.total / orbital_base.commercialRoutesData.max) * 100)|number %}
 					<span class="progress-bar hb bl" title="remplissage : {{ percent }}%">
 						<span style="width:{{ percent }}%;" class="content"></span>
 					</span>
diff --git a/templates/components/common/navbar.html.twig b/templates/components/common/navbar.html.twig
index e8463c724..6c4b6aac7 100644
--- a/templates/components/common/navbar.html.twig
+++ b/templates/components/common/navbar.html.twig
@@ -114,11 +114,11 @@
 					{% for notification in current_player_notifications %}
 					<div class="notif unreaded" data-notif-id="{{ notification.id }}">
 						<h4 class="read-notif switch-class-parent" data-class="open">{{ notification.title }}</h4>
-						<div class="content">{{ notification.content }}</div>
+						<div class="content">{{ notification.content|raw }}</div>
 						<div class="footer">
 							<a class="ajax-action" data-ajax-target="{{ path('archive_notification', {'id': notification.id }) }}">archiver</a> ou
 							<a class="ajax-action" data-ajax-target="{{ path('delete_notification', {'id': notification.id }) }}">supprimer</a><br />
-							— {{ notification.dSending|date }}
+							— {{ notification.dSending|date|raw }}
 							</div>
 						</div>
 					{% endfor %}
diff --git a/templates/components/fleet/combat_reports.html.twig b/templates/components/fleet/combat_reports.html.twig
index c35cc84c6..4fd322966 100644
--- a/templates/components/fleet/combat_reports.html.twig
+++ b/templates/components/fleet/combat_reports.html.twig
@@ -39,7 +39,7 @@
 
 							<div class="center">
 								<strong>{{ report_data.title }}</strong>
-								{{- report.dFight|date -}}
+								{{- report.dFight|date|raw -}}
 							</div>
 
 							<div class="right">
diff --git a/templates/components/map/system_details.html.twig b/templates/components/map/system_details.html.twig
index 4422b57b8..8bd050792 100644
--- a/templates/components/map/system_details.html.twig
+++ b/templates/components/map/system_details.html.twig
@@ -172,7 +172,7 @@
 								<hr />
 								<p>
 									<em>
-										Dernier pillage {{ report.dFight|date }}.
+										Dernier pillage {{ report.dFight|date|raw }}.
 									</em>
 								</p>
 							{% endif %}
diff --git a/templates/molecules/base/trade/commercial_route_base.html.twig b/templates/molecules/base/trade/commercial_route_base.html.twig
new file mode 100644
index 000000000..b0cd4b306
--- /dev/null
+++ b/templates/molecules/base/trade/commercial_route_base.html.twig
@@ -0,0 +1,7 @@
+<div class="base">
+	<img src="{{ asset('media/map/place/place1-' ~ get_planet_size(population) ~ '.png') }}" alt="{{ base_name }}" class="place" />
+	{{ base_type|scalar_base_type }}
+	<a href="{{ path('map', {'place': base_id }) }}">{{ base_name }}</a><br />
+	de <a href="{{ path('embassy', {'player': player_id }) }}">{{ player_name }}</a><br />
+	{{ population|number }} millions de population
+</div>
diff --git a/templates/molecules/map/place_actions.html.twig b/templates/molecules/map/place_actions.html.twig
index 9e5ad924b..b5cefe45e 100644
--- a/templates/molecules/map/place_actions.html.twig
+++ b/templates/molecules/map/place_actions.html.twig
@@ -152,16 +152,16 @@
 					{% elseif default_base.levelSpatioport == 0 %}
 						Il vous faut un spatioport pour proposer une route commerciale.
 					{% elseif place.levelSpatioport == 0 %}
-						Le joueur ne dispose pas d\'un spatioport.
+						Le joueur ne dispose pas d'un spatioport.
 					{% else %}
 						{% set commercial_route_data = get_commercial_route_data(default_base, place) %}
 						{% set distance = get_place_distance(default_base, place) %}
 
 						{% set price = get_route_price(distance) %}
-						{% set price = get_route_income(default_base, place, distance, route_sector_bonus, route_color_bonus) %}
+						{% set income = get_route_income(default_base, place, distance, route_sector_bonus, route_color_bonus) %}
 
 						<div class="rc">
-							<img src="{{ asset('media/map/place/place' ~ place.typeOfBase ~ '-' ~ get_place_demography(place) ~ '.png') }}" alt="" class="planet" />
+							<img src="{{ asset('media/map/place/place' ~ place.typeOfPlace ~ '-' ~ get_place_demography(place) ~ '.png') }}" alt="" class="planet" />
 
 							<span class="label-box">
 								<span class="key">Revenu par relève</span>
@@ -184,10 +184,9 @@
 							{% elseif commercial_route_data.not_accepted == true %}
 								<a href="{{ path('spatioport') }}" class="button">Accepter la proposition</a>
 							{% elseif commercial_route_data.stand_by == true %}
-								<span class="button">C\'est la guerre.</span>
+								<span class="button">C'est la guerre.</span>
 							{% else %}
-
-								{% if price > current_place.credit %}
+								{% if price > current_player.credit %}
 									<span class="button">Vous n\'avez pas assez de crédits.</span>
 								{% elseif commercial_route_data.slots < get_building_info(constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::SPATIOPORT'), 'level', current_base.levelSpatioport, 'nbRoutesMax') %}
 									<a href="{{ path('propose_route', {'sourceBase': default_base.id, 'destinationBase': place.id }) }}" class="button">
@@ -241,7 +240,7 @@
 					{% if place.sectorColor != current_player.rColor or place.sectorColor == 0 %}
 						Vous ne pouvez envoyer des recycleurs que dans des secteurs non-revendiqués ou contrôlés par votre faction.
 					{% elseif place.typeOfPlace == constant('App\\Modules\\Gaia\\Model\\Place::EMPTYZONE') %}
-						Cette endroit regorgait autrefois de ressources ou de gaz mais de nombreux recycleurs sont déjà passés par là et n\'ont laissé que le vide de l'espace.
+						Cet endroit regorgait autrefois de ressources ou de gaz mais de nombreux recycleurs sont déjà passés par là et n\'ont laissé que le vide de l'espace.
 					{% elseif current_base.levelRecycling == 0 %}
 						Vous devez disposer d'un centre de recyclage.
 					{% else %}
diff --git a/templates/pages/athena/spatioport.html.twig b/templates/pages/athena/spatioport.html.twig
new file mode 100644
index 000000000..527e6ce0d
--- /dev/null
+++ b/templates/pages/athena/spatioport.html.twig
@@ -0,0 +1,346 @@
+{% extends 'layouts/athena/current_base.html.twig' %}
+
+{% block content %}
+	<div class="component building rc">
+		<div class="head skin-1">
+			<img src="{{ asset('media/orbitalbase/spatioport.png') }}" alt="" />
+			<h2>
+				{{- get_building_info(constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::COMMERCIAL_PLATEFORME'), 'frenchName') -}}
+			</h2>
+			<em>Niveau {{ current_base.levelSpatioport }}</em>
+		</div>
+		<div class="fix-body">
+			<div class="body">
+				<a href="{{ path('spatioport') }}" class="nav-element {% if mode == 'list' %}active{% endif %}">
+					<img src="{{ asset('media/map/option/market.png') }}" alt="" />
+					<strong>Routes commerciales</strong>
+					<em>Gérez vos routes commerciales</em>
+				</a>
+
+				<a href="{{ path('spatioport', {'mode': 'search'}) }}" class="nav-element {% if mode == 'search' %}active{% endif %}">
+					<img src="{{ asset('media/map/option/radio.png') }}" alt="" />
+					<strong>Recherche</strong>
+					<em>Trouvez des partenaires commerciaux</em>
+				</a>
+
+				<hr />
+
+				<div class="number-box">
+					<span class="label">routes commerciales</span>
+					<span class="value">{{ routes_data.total }} / {{ routes_data.max }}</span>
+
+					<span class="progress-bar">
+						<span style="width: {{ routes_data.total|percent(routes_data.max) }}%;" class="content"></span>
+					</span>
+				</div>
+
+				<div class="number-box {% if routes_data.operational == 0 %}grey{% endif %}">
+					<span class="label">routes commerciales actives</span>
+					<span class="value">{{ routes_data.operational }}</span>
+				</div>
+
+				<div class="number-box {% if routes_data.waiting_for_other == 0 %}grey{% endif %}">
+					<span class="label">routes commerciales en attente</span>
+					<span class="value">{{ routes_data.waiting_for_other }}</span>
+				</div>
+
+				<div class="number-box {% if routes_data.waiting_for_me == 0 %}grey{% endif %}">
+					<span class="label">propositions commerciales</span>
+					<span class="value">{{ routes_data.waiting_for_me }}</span>
+				</div>
+
+				{% if routes_data.stand_by > 0 %}
+					<div class="number-box">
+						<span class="label">routes commerciales bloquées</span>
+						<span class="value">{{ routes_data.stand_by }}</span>
+					</div>
+				{% endif %}
+
+				<hr />
+
+				<div class="number-box">
+					<span class="label">revenu total de cette base</span>
+					<span class="value">
+						{{ routes_data.total_income|number }}
+						{% if player_commercial_income_bonus > 0 %}
+							<span class="bonus">+ {{ (player_commercial_income_bonus * routes_data.total_income / 100)|number }}</span>
+						{% endif %}
+						<img src="{{ asset('media/resources/credit.png') }}" class="icon-color" />
+					</span>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	{% if mode == 'search' %}
+		<div class="component new-message">
+			<div class="head skin-2">
+				<h2>Recherche</h2>
+				</div>
+			<div class="fix-body">
+				<div class="body">
+					<form action="{{ path('spatioport', {'mode': 'search'}) }}" method="POST">
+						<h4>Chercher des partenaires commerciaux...</h4>
+						{% for faction in in_game_factions %}
+							<p>
+								<label for="ckb-faction-{{ faction.id }}">
+									<input type="checkbox"
+										   name="faction-{{ faction.id }}"
+										   id="ckb-faction-{{ faction.id }}"
+										   {% if app.request.method == 'GET' or app.request.request.has('faction-' ~ faction.id) %}checked{% endif %} />
+									{{ get_faction_info(faction.id, 'demonym') }}
+								</label>
+							</p>
+						{% endfor %}
+						<h4>A une distance...</h4>
+
+						<p><label for="search-rc-min-dist">Minimum</label></p>
+						<p class="input input-text"><input type="number" id="search-rc-min-dist" name="min-dist" value="{{ app.request.request.get('min-dist', 75) }}" /></p>
+
+						<p><label for="search-rc-max-dist">Maximum</label></p>
+						<p class="input input-text"><input type="number" id="search-rc-max-dist" name="max-dist" value="{{ app.request.request.get('max-dist', 125) }}" /></p>
+
+						<p><button>Rechercher</button></p>
+					</form>
+				</div>
+			</div>
+		</div>
+
+		{% if search_results is not null %}
+			<div class="component player rank">
+			<div class="head skin-2">
+				<h2>Résultats</h2>
+				</div>
+			<div class="fix-body">
+				<div class="body">
+					{% for base in search_results %}
+						<a href="{{ path('map', {'place': base.rPlace}) }}" class="player color{{ base.playerColor }}">
+							<img src="{{ asset('media/avatar/small/' ~ base.playerAvatar ~ '.png') }}" alt="" class="picto">
+							<span class="title">{{ base.playerName }}</span>
+							<strong class="name">{{ base.baseName }}</strong>
+							<span class="experience">{{ base.distance}} al.</span>
+						</a>
+					{% endfor %}
+
+					{% if search_results|length == 0 %}
+						<p><em>Aucun partenaire commercial trouvé selon les critères de recherche fournis.</em></p>
+					{% endif %}
+					</div>
+				</div>
+			</div>
+		{% endif %}
+	{% else %}
+		{% dump routes %}
+		{% for route in routes %}
+			{% if route.isProposed and route.playerId2 == current_player.id %}
+				{% set origin_base = include('molecules/base/trade/commercial_route_base.html.twig', {
+					'base_id': route.rOrbitalBase,
+					'base_name': route.baseName1,
+					'base_type': route.baseType1,
+					'player_id': route.playerId1,
+					'player_name': route.playerName1,
+					'population': route.population1,
+				}) %}
+				{% set destination_base = include('molecules/base/trade/commercial_route_base.html.twig', {
+					'base_id': route.rOrbitalBaseLinked,
+					'base_name': route.baseName2,
+					'base_type': route.baseType2,
+					'player_id': route.playerId2,
+					'player_name': route.playerName2,
+					'population': route.population2,
+				}) %}
+				<div class="component rc">
+					<div class="head skin-5">
+						{% if loop.index == 1 %}
+							<h2>Propositions</h2>
+						{% endif %}
+					</div>
+					<div class="fix-body">
+						<div class="body">
+							<div class="tool">
+								{% if route.price > current_player.credit %}
+									<span><a href="#">pas assez de crédits pour accepter</a></span>
+								{% elseif routes_data.total >= routes_data.max %}
+									<span><a href="#">pas d'emplacement libre pour accepter</a></span>
+								{% else %}
+									{% set price = route.price %}
+									{# @TODO move this calculation in a dedicated service #}
+									{% if is_player_from_negora %}
+										{% set price = price - (price * negora_commercial_bonus / 100)|round %}
+									{% endif %}
+									<span><a href="{{ path('accept_commercial_route', {'baseId': route.rOrbitalBaseLinked, 'id': route.id}) }}">accepter pour {{ price|number }} crédits</a></span>
+								{% endif %}
+								<span><a href="{{ path('t', {'baseId': route.rOrbitalBaseLinked, 'id': route.id }) }}" class="hb lt" title="refuser l'offre">x</a></span>
+							</div>
+
+							<div class="number-box grey">
+								<span class="label">Etat de la route commerciale</span>
+								<span class="value">
+									En attente
+								</span>
+							</div>
+
+							<div class="rc {% if not route.isActive %}no-tax{% endif %}" style="height: {{ (370 + route.distance) }}px;">
+								{% if route.playerId1 == current_player.id %}
+									{{ destination_base|raw }}
+								{% else %}
+									{{ origin_base|raw }}
+								{% endif %}
+
+								<ul class="general">
+									<li>Distance <strong>{{ route.distance }} al.</strong></li>
+									<li>
+										Prix
+										<strong>
+											{{ route.price|number }}
+											{% if is_player_from_negora %}
+												<span class="bonus">- {{ (negora_commercial_bonus * route.price / 100)|number }}</span>
+											{% endif %}
+											 <img src="{{ asset('media/resources/credit.png') }}" class="icon-color" />
+										</strong>
+									</li>
+									<li>
+										Estimation du revenu par relève
+										<strong>
+											{{ route.income|number }}
+											{% if player_commercial_income_bonus > 0 %}
+												<span class="bonus">+ {{ (player_commercial_income_bonus * route.income / 100)|number }}</span>
+											{% endif %}
+											<img src="{{ asset('media/resources/credit.png') }}" class="icon-color" />
+										</strong>
+									</li>
+									<li>
+										Population touchée
+										<strong>{{ (route.population1 + route.population2)|number }} millions</strong>
+									</li>
+
+									{% if not route.isProposed %}
+										<li>
+											En service depuis<br />
+											{{ route.dCreation|date|raw }}
+										</li>
+									{% endif %}
+								</ul>
+
+								{% if route.playerId1 == current_player.id %}
+									{{ origin_base|raw }}
+								{% else %}
+									{{ destination_base|raw }}
+								{% endif %}
+							</div>
+						</div>
+					</div>
+				</div>
+			{% endif %}
+		{% endfor %}
+
+		{% for route in routes %}
+			{% if not route.isProposed or route.playerId2 != current_player.id %}
+				{% set origin_base = include('molecules/base/trade/commercial_route_base.html.twig', {
+					'base_id': route.rOrbitalBase,
+					'base_name': route.baseName1,
+					'base_type': route.baseType1,
+					'player_id': route.playerId1,
+					'player_name': route.playerName1,
+					'population': route.population1,
+				}) %}
+				{% set destination_base = include('molecules/base/trade/commercial_route_base.html.twig', {
+					'base_id': route.rOrbitalBaseLinked,
+					'base_name': route.baseName2,
+					'base_type': route.baseType2,
+					'player_id': route.playerId2,
+					'player_name': route.playerName2,
+					'population': route.population2,
+				}) %}
+				<div class="component rc">
+					<div class="head skin-5">
+						{% if loop.index == 1 %}
+							<h2>Routes commerciales</h2>
+						{% endif %}
+					</div>
+					<div class="fix-body">
+						<div class="body">
+							<div class="tool">
+								{% if route.isProposed %}
+									<span><a href="{{ path('cancel_route', {'baseId': current_base.id, 'id': route.id}) }}">annuler la proposition commerciale</a></span>
+								{% else %}
+									<span><a href="{{ path('delete_route', {'baseId': current_base.id, 'id': route.id}) }}">démanteler la route commerciale</a></span>
+								{% endif %}
+							</div>
+
+							<div class="number-box {% if not route.isActive %}grey{% endif %}">
+								<span class="label">Etat de la route commerciale</span>
+								<span class="value">
+									{%- if route.isProposed -%}
+										En attente
+									{%- elseif route.isActive -%}
+										En activité
+									{%- elseif route.isInStandBy -%}
+										Gelée
+									{%- endif -%}
+								</span>
+							</div>
+
+							<div class="rc {% if not route.isActive %}no-tax{% endif %}" style="height: {{ (370 + route.distance) }}px;">
+								{% if route.playerId1 == current_player.id %}
+									{{ destination_base|raw }}
+								{% else %}
+									{{ origin_base|raw }}
+								{% endif %}
+
+								<ul class="general">
+									<li>
+										Distance
+										<strong>{{ route.distance }} al.</strong>
+									</li>
+									<li>
+										Revenu par relève
+										{% if not route.isActive %}[non effectif]{% endif %}
+										<strong>
+											{{ route.income|number }}
+											{% if player_commercial_income_bonus > 0 %}
+											<span class="bonus">+ {{ (player_commercial_income_bonus * route.income / 100)|number }}</span>
+											{% endif %}
+											<img src="{{ asset('media/resources/credit.png') }}" class="icon-color" />
+										</strong>
+									</li>
+									<li>
+										Population touchée
+										<strong>{{ (route.population1 + route.population2)|number }} millions</strong>
+									</li>
+
+									{% if not route.isProposed %}
+										<li>
+											En service depuis <br />
+											{{ route.dCreation|date|raw }}
+										</li>
+									{% endif %}
+								</ul>
+								{% if route.playerId1 == current_player.id %}
+									{{ origin_base|raw }}
+								{% else %}
+									{{ destination_base|raw }}
+								{% endif %}
+							</div>
+						</div>
+					</div>
+				</div>
+			{% endif %}
+		{% endfor %}
+	{% endif %}
+
+	<div class="component">
+		<div class="head skin-2">
+			<h2>À propos</h2>
+		</div>
+		<div class="fix-body">
+			<div class="body">
+				<p class="long-info">{{ get_building_info(constant('App\\Modules\\Athena\\Resource\\OrbitalBaseResource::SPATIOPORT'), 'description')|raw }}</p>
+			</div>
+		</div>
+	</div>
+
+	{% if routes|length == 0 %}
+		{{ include('molecules/common/default.html.twig') }}
+	{% endif %}
+{% endblock content %}