kerykeion 4.26.1__py3-none-any.whl → 5.0.0a1__py3-none-any.whl

kerykeion/charts/kerykeion_chart_svg.py

@@ -6,17 +6,34 @@
 
 import logging
 import swisseph as swe
-from typing import get_args
+from typing import get_args, Union, Optional
 
 from kerykeion.settings.kerykeion_settings import get_settings
 from kerykeion.aspects.synastry_aspects import SynastryAspects
 from kerykeion.aspects.natal_aspects import NatalAspects
-from kerykeion.astrological_subject import AstrologicalSubject
-from kerykeion.kr_types import KerykeionException, ChartType, KerykeionPointModel, Sign, ActiveAspect
+from kerykeion.house_comparison.house_comparison_factory import HouseComparisonFactory
+from kerykeion.kr_types import (
+    KerykeionException,
+    ChartType,
+    Sign,
+    ActiveAspect,
+)
 from kerykeion.kr_types import ChartTemplateDictionary
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, CompositeSubjectModel
-from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsModel
-from kerykeion.kr_types.kr_literals import KerykeionChartTheme, KerykeionChartLanguage, AxialCusps, Planet
+from kerykeion.kr_types.kr_models import (
+    AstrologicalSubjectModel,
+    CompositeSubjectModel,
+    PlanetReturnModel,
+)
+from kerykeion.kr_types.settings_models import (
+    KerykeionSettingsCelestialPointModel,
+    KerykeionSettingsModel,
+)
+from kerykeion.kr_types.kr_literals import (
+    KerykeionChartTheme,
+    KerykeionChartLanguage,
+    AstrologicalPoint,
+)
+from kerykeion.utilities import find_common_active_points
 from kerykeion.charts.charts_utils import (
     draw_zodiac_slice,
     convert_latitude_coordinate_to_string,
@@ -26,25 +43,37 @@ from kerykeion.charts.charts_utils import (
     draw_degree_ring,
     draw_transit_ring,
     draw_first_circle,
+    draw_house_comparison_grid,
     draw_second_circle,
     draw_third_circle,
     draw_aspect_grid,
     draw_houses_cusps_and_text_number,
     draw_transit_aspect_list,
     draw_transit_aspect_grid,
-    calculate_moon_phase_chart_params,
+    draw_single_house_comparison_grid,
+    makeLunarPhase,
     draw_house_grid,
     draw_planet_grid,
+    format_location_string,
+    format_datetime_with_timezone,
+    calculate_element_points,
+    calculate_synastry_element_points,
+    calculate_quality_points,
+    calculate_synastry_quality_points
 )
-from kerykeion.charts.draw_planets import draw_planets # type: ignore
+from kerykeion.charts.draw_planets_v2 import draw_planets_v2 as draw_planets
 from kerykeion.utilities import get_houses_list, inline_css_variables_in_svg
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS, DEFAULT_ACTIVE_ASPECTS
+from kerykeion.settings.config_constants import DEFAULT_ACTIVE_ASPECTS
+from kerykeion.settings.legacy.legacy_color_settings import DEFAULT_CHART_COLORS
+from kerykeion.settings.legacy.legacy_celestial_points_settings import DEFAULT_CELESTIAL_POINTS_SETTINGS
+from kerykeion.settings.legacy.legacy_chart_aspects_settings import DEFAULT_CHART_ASPECTS_SETTINGS
 from pathlib import Path
 from scour.scour import scourString
 from string import Template
 from typing import Union, List, Literal
 from datetime import datetime
 
+
 class KerykeionChartSVG:
     """
     KerykeionChartSVG generates astrological chart visualizations as SVG files.
@@ -77,7 +106,7 @@ class KerykeionChartSVG:
             Specifies rendering style for double-chart aspect grids. Defaults to 'list'.
         chart_language (KerykeionChartLanguage, optional):
             Language code for chart labels. Defaults to 'EN'.
-        active_points (list[Planet | AxialCusps], optional):
+        active_points (list[AstrologicalPoint], optional):
             List of celestial points and angles to include. Defaults to DEFAULT_ACTIVE_POINTS.
             Example:
             ["Sun", "Moon", "Mercury", "Venus"]
@@ -120,19 +149,21 @@ class KerykeionChartSVG:
     """
 
     # Constants
-    _BASIC_CHART_VIEWBOX = "0 0 820 550.0"
-    _WIDE_CHART_VIEWBOX = "0 0 1200 546.0"
-    _TRANSIT_CHART_WITH_TABLE_VIWBOX = "0 0 960 546.0"
 
     _DEFAULT_HEIGHT = 550
     _DEFAULT_FULL_WIDTH = 1200
-    _DEFAULT_NATAL_WIDTH = 820
-    _DEFAULT_FULL_WIDTH_WITH_TABLE = 960
-    _PLANET_IN_ZODIAC_EXTRA_POINTS = 10
+    _DEFAULT_NATAL_WIDTH = 870
+    _DEFAULT_FULL_WIDTH_WITH_TABLE = 1200
+    _DEFAULT_ULTRA_WIDE_WIDTH = 1270
+
+    _BASIC_CHART_VIEWBOX = f"0 0 {_DEFAULT_NATAL_WIDTH} {_DEFAULT_HEIGHT}"
+    _WIDE_CHART_VIEWBOX = f"0 0 {_DEFAULT_FULL_WIDTH} 546.0"
+    _ULTRA_WIDE_CHART_VIEWBOX = f"0 0 {_DEFAULT_ULTRA_WIDE_WIDTH} 546.0"
+    _TRANSIT_CHART_WITH_TABLE_VIWBOX = f"0 0 {_DEFAULT_FULL_WIDTH_WITH_TABLE} 546.0"
 
     # Set at init
-    first_obj: Union[AstrologicalSubject, AstrologicalSubjectModel]
-    second_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, None]
+    first_obj: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel]
+    second_obj: Union[AstrologicalSubjectModel, PlanetReturnModel, None]
     chart_type: ChartType
     new_output_directory: Union[Path, None]
     new_settings_file: Union[Path, None, KerykeionSettingsModel, dict]
@@ -141,7 +172,7 @@ class KerykeionChartSVG:
     theme: Union[KerykeionChartTheme, None]
     double_chart_aspect_grid_type: Literal["list", "table"]
     chart_language: KerykeionChartLanguage
-    active_points: List[Union[Planet, AxialCusps]]
+    active_points: List[AstrologicalPoint]
     active_aspects: List[ActiveAspect]
 
     # Internal properties
@@ -157,7 +188,6 @@ class KerykeionChartSVG:
     chart_colors_settings: dict
     planets_settings: dict
     aspects_settings: dict
-    user: Union[AstrologicalSubject, AstrologicalSubjectModel, CompositeSubjectModel]
     available_planets_setting: List[KerykeionSettingsCelestialPointModel]
     height: float
     location: str
@@ -167,26 +197,30 @@ class KerykeionChartSVG:
 
     def __init__(
         self,
-        first_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, CompositeSubjectModel],
+        first_obj: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
         chart_type: ChartType = "Natal",
-        second_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, None] = None,
+        second_obj: Union[AstrologicalSubjectModel, PlanetReturnModel, None] = None,
         new_output_directory: Union[str, None] = None,
         new_settings_file: Union[Path, None, KerykeionSettingsModel, dict] = None,
         theme: Union[KerykeionChartTheme, None] = "classic",
         double_chart_aspect_grid_type: Literal["list", "table"] = "list",
         chart_language: KerykeionChartLanguage = "EN",
-        active_points: List[Union[Planet, AxialCusps]] = DEFAULT_ACTIVE_POINTS,
-    active_aspects: List[ActiveAspect] = DEFAULT_ACTIVE_ASPECTS,
+        active_points: Optional[list[AstrologicalPoint]] = None,
+        active_aspects: list[ActiveAspect]= DEFAULT_ACTIVE_ASPECTS,
+        *,
+        colors_settings: dict = DEFAULT_CHART_COLORS,
+        celestial_points_settings: list[dict] = DEFAULT_CELESTIAL_POINTS_SETTINGS,
+        aspects_settings: list[dict] = DEFAULT_CHART_ASPECTS_SETTINGS,
     ):
         """
         Initialize the chart generator with subject data and configuration options.
 
         Args:
-            first_obj (AstrologicalSubject, AstrologicalSubjectModel, or CompositeSubjectModel):
+            first_obj (AstrologicalSubjectModel, or CompositeSubjectModel):
                 Primary astrological subject instance.
             chart_type (ChartType, optional):
                 Type of chart to generate (e.g., 'Natal', 'Transit').
-            second_obj (AstrologicalSubject or AstrologicalSubjectModel, optional):
+            second_obj (AstrologicalSubject, optional):
                 Secondary subject for Transit or Synastry charts.
             new_output_directory (str or Path, optional):
                 Base directory to save generated SVG files.
@@ -198,138 +232,341 @@ class KerykeionChartSVG:
                 Layout style for double-chart aspect grids ('list' or 'table').
             chart_language (KerykeionChartLanguage, optional):
                 Language code for chart labels (e.g., 'EN', 'IT').
-            active_points (List[Planet or AxialCusps], optional):
+            active_points (List[AstrologicalPoint], optional):
                 Celestial points to include in the chart visualization.
             active_aspects (List[ActiveAspect], optional):
                 Aspects to calculate, each defined by name and orb.
         """
+        # --------------------
+        # COMMON INITIALIZATION
+        # --------------------
         home_directory = Path.home()
         self.new_settings_file = new_settings_file
         self.chart_language = chart_language
         self.active_points = active_points
         self.active_aspects = active_aspects
+        self.chart_type = chart_type
+        self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
+        self.chart_colors_settings = colors_settings
+        self.planets_settings = celestial_points_settings
+        self.aspects_settings = aspects_settings
 
+        if not active_points:
+            active_points = first_obj.active_points
+        else:
+            active_points = find_common_active_points(
+                active_points,
+                first_obj.active_points
+            )
+
+        if second_obj:
+            active_points = find_common_active_points(
+                active_points,
+                second_obj.active_points
+            )
+
+        # Set output directory
         if new_output_directory:
             self.output_directory = Path(new_output_directory)
         else:
             self.output_directory = home_directory
 
+        # Load settings
         self.parse_json_settings(new_settings_file)
-        self.chart_type = chart_type
 
-        # Kerykeion instance
-        self.user = first_obj
+        # Primary subject
+        self.first_obj = first_obj
 
+        # Default radius for all charts
+        self.main_radius = 240
+
+        # Configure available planets
         self.available_planets_setting = []
         for body in self.planets_settings:
-            if body["name"] not in active_points:
-                continue
-            else:
+            if body["name"] in active_points:
                 body["is_active"] = True
+                self.available_planets_setting.append(body)
 
-            self.available_planets_setting.append(body)
+        # Set available celestial points
+        available_celestial_points_names = [body["name"].lower() for body in self.available_planets_setting]
+        self.available_kerykeion_celestial_points = []
+        for body in available_celestial_points_names:
+            self.available_kerykeion_celestial_points.append(self.first_obj.get(body))
 
-        # Available bodies
-        available_celestial_points_names = []
-        for body in self.available_planets_setting:
-            available_celestial_points_names.append(body["name"].lower())
+        # ------------------------
+        # CHART TYPE SPECIFIC SETUP
+        # ------------------------
 
-        self.available_kerykeion_celestial_points: list[KerykeionPointModel] = []
-        for body in available_celestial_points_names:
-            self.available_kerykeion_celestial_points.append(self.user.get(body))
+        if self.chart_type in ["Natal", "ExternalNatal"]:
+            # --- NATAL / EXTERNAL NATAL CHART SETUP ---
 
-        # Makes the sign number list.
-        if self.chart_type == "Natal" or self.chart_type == "ExternalNatal":
+            # Validate Subject
+            if not isinstance(self.first_obj, AstrologicalSubjectModel):
+                raise KerykeionException("First object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
+
+            # Calculate aspects
             natal_aspects_instance = NatalAspects(
-                self.user, new_settings_file=self.new_settings_file,
+                self.first_obj,
+                new_settings_file=self.new_settings_file,
                 active_points=active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = natal_aspects_instance.relevant_aspects
 
-        elif self.chart_type == "Transit" or self.chart_type == "Synastry":
-            if not second_obj:
-                raise KerykeionException("Second object is required for Transit or Synastry charts.")
-
-            # Kerykeion instance
-            self.t_user = second_obj
+            # Screen size
+            self.height = self._DEFAULT_HEIGHT
+            self.width = self._DEFAULT_NATAL_WIDTH
 
-            # Aspects
-            if self.chart_type == "Transit":
-                synastry_aspects_instance = SynastryAspects(
-                    self.t_user,
-                    self.user,
-                    new_settings_file=self.new_settings_file,
-                    active_points=active_points,
-                    active_aspects=active_aspects,
-                )
+            # Location and coordinates
+            self.location = self.first_obj.city
+            self.geolat = self.first_obj.lat
+            self.geolon = self.first_obj.lng
 
+            # Circle radii
+            if self.chart_type == "ExternalNatal":
+                self.first_circle_radius = 56
+                self.second_circle_radius = 92
+                self.third_circle_radius = 112
             else:
-                synastry_aspects_instance = SynastryAspects(
-                    self.user,
-                    self.t_user,
-                    new_settings_file=self.new_settings_file,
-                    active_points=active_points,
-                    active_aspects=active_aspects,
-                )
+                self.first_circle_radius = 0
+                self.second_circle_radius = 36
+                self.third_circle_radius = 120
+
+        elif self.chart_type == "Composite":
+            # --- COMPOSITE CHART SETUP ---
+
+            # Validate Subject
+            if not isinstance(self.first_obj, CompositeSubjectModel):
+                raise KerykeionException("First object must be a CompositeSubjectModel instance.")
+
+            # Calculate aspects
+            self.aspects_list = NatalAspects(self.first_obj, new_settings_file=self.new_settings_file, active_points=active_points).relevant_aspects
+
+            # Screen size
+            self.height = self._DEFAULT_HEIGHT
+            self.width = self._DEFAULT_NATAL_WIDTH
 
+            # Location and coordinates (average of both subjects)
+            self.location = ""
+            self.geolat = (self.first_obj.first_subject.lat + self.first_obj.second_subject.lat) / 2
+            self.geolon = (self.first_obj.first_subject.lng + self.first_obj.second_subject.lng) / 2
+
+            # Circle radii
+            self.first_circle_radius = 0
+            self.second_circle_radius = 36
+            self.third_circle_radius = 120
+
+        elif self.chart_type == "Transit":
+            # --- TRANSIT CHART SETUP ---
+
+            # Validate Subjects
+            if not second_obj:
+                raise KerykeionException("Second object is required for Transit charts.")
+            if not isinstance(self.first_obj, AstrologicalSubjectModel):
+                raise KerykeionException("First object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
+            if not isinstance(second_obj, AstrologicalSubjectModel):
+                raise KerykeionException("Second object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
+
+            # Secondary subject setup
+            self.second_obj = second_obj
+
+            # Calculate aspects (transit to natal)
+            synastry_aspects_instance = SynastryAspects(
+                self.first_obj,
+                self.second_obj,
+                new_settings_file=self.new_settings_file,
+                active_points=active_points,
+                active_aspects=active_aspects,
+            )
             self.aspects_list = synastry_aspects_instance.relevant_aspects
 
+            # Secondary subject available points
             self.t_available_kerykeion_celestial_points = []
             for body in available_celestial_points_names:
-                self.t_available_kerykeion_celestial_points.append(self.t_user.get(body))
+                self.t_available_kerykeion_celestial_points.append(self.second_obj.get(body))
 
-        elif self.chart_type == "Composite":
-            if not isinstance(first_obj, CompositeSubjectModel):
-                raise KerykeionException("First object must be a CompositeSubjectModel instance.")
+            # Screen size
+            self.height = self._DEFAULT_HEIGHT
+            if self.double_chart_aspect_grid_type == "table":
+                self.width = self._DEFAULT_FULL_WIDTH_WITH_TABLE
+            else:
+                self.width = self._DEFAULT_FULL_WIDTH
+
+            # Location and coordinates (from transit subject)
+            self.location = self.second_obj.city
+            self.geolat = self.second_obj.lat
+            self.geolon = self.second_obj.lng
+            self.t_name = self.language_settings["transit_name"]
 
-            self.aspects_list = NatalAspects(self.user, new_settings_file=self.new_settings_file, active_points=active_points).relevant_aspects
+            # Circle radii
+            self.first_circle_radius = 0
+            self.second_circle_radius = 36
+            self.third_circle_radius = 120
 
-        # Double chart aspect grid type
-        self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
+        elif self.chart_type == "Synastry":
+            # --- SYNASTRY CHART SETUP ---
+
+            # Validate Subjects
+            if not second_obj:
+                raise KerykeionException("Second object is required for Synastry charts.")
+            if not isinstance(self.first_obj, AstrologicalSubjectModel):
+                raise KerykeionException("First object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
+            if not isinstance(second_obj, AstrologicalSubjectModel):
+                raise KerykeionException("Second object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
+
+            # Secondary subject setup
+            self.second_obj = second_obj
+
+            # Calculate aspects (natal to partner)
+            synastry_aspects_instance = SynastryAspects(
+                self.first_obj,
+                self.second_obj,
+                new_settings_file=self.new_settings_file,
+                active_points=active_points,
+                active_aspects=active_aspects,
+            )
+            self.aspects_list = synastry_aspects_instance.relevant_aspects
 
-        # screen size
-        self.height = self._DEFAULT_HEIGHT
-        if self.chart_type == "Synastry" or self.chart_type == "Transit":
+            # Secondary subject available points
+            self.t_available_kerykeion_celestial_points = []
+            for body in available_celestial_points_names:
+                self.t_available_kerykeion_celestial_points.append(self.second_obj.get(body))
+
+            # Screen size
+            self.height = self._DEFAULT_HEIGHT
             self.width = self._DEFAULT_FULL_WIDTH
-        elif self.double_chart_aspect_grid_type == "table" and self.chart_type == "Transit":
-            self.width = self._DEFAULT_FULL_WIDTH_WITH_TABLE
-        else:
-            self.width = self._DEFAULT_NATAL_WIDTH
 
-        if self.chart_type in ["Natal", "ExternalNatal", "Synastry"]:
-            self.location = self.user.city
-            self.geolat = self.user.lat
-            self.geolon =  self.user.lng
+            # Location and coordinates (from primary subject)
+            self.location = self.first_obj.city
+            self.geolat = self.first_obj.lat
+            self.geolon = self.first_obj.lng
 
-        elif self.chart_type == "Composite":
-            self.location = ""
-            self.geolat = (self.user.first_subject.lat + self.user.second_subject.lat) / 2
-            self.geolon = (self.user.first_subject.lng + self.user.second_subject.lng) / 2
+            # Circle radii
+            self.first_circle_radius = 0
+            self.second_circle_radius = 36
+            self.third_circle_radius = 120
 
-        elif self.chart_type in ["Transit"]:
-            self.location = self.t_user.city
-            self.geolat = self.t_user.lat
-            self.geolon = self.t_user.lng
-            self.t_name = self.language_settings["transit_name"]
+        elif self.chart_type == "Return":
+            # --- RETURN CHART SETUP ---
 
-        # Default radius for the chart
-        self.main_radius = 240
+            # Validate Subjects
+            if not second_obj:
+                raise KerykeionException("Second object is required for Return charts.")
+            if not isinstance(self.first_obj, AstrologicalSubjectModel):
+                raise KerykeionException("First object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
+            if not isinstance(second_obj, PlanetReturnModel):
+                raise KerykeionException("Second object must be a PlanetReturnModel instance.")
+
+            # Secondary subject setup
+            self.second_obj = second_obj
+
+            # Calculate aspects (natal to return)
+            synastry_aspects_instance = SynastryAspects(
+                self.first_obj,
+                self.second_obj,
+                new_settings_file=self.new_settings_file,
+                active_points=active_points,
+                active_aspects=active_aspects,
+            )
+            self.aspects_list = synastry_aspects_instance.relevant_aspects
+
+            # Secondary subject available points
+            self.t_available_kerykeion_celestial_points = []
+            for body in available_celestial_points_names:
+                self.t_available_kerykeion_celestial_points.append(self.second_obj.get(body))
+
+            # Screen size
+            self.height = self._DEFAULT_HEIGHT
+            self.width = self._DEFAULT_ULTRA_WIDE_WIDTH
+
+            # Location and coordinates (from natal subject)
+            self.location = self.first_obj.city
+            self.geolat = self.first_obj.lat
+            self.geolon = self.first_obj.lng
+
+            # Circle radii
+            self.first_circle_radius = 0
+            self.second_circle_radius = 36
+            self.third_circle_radius = 120
+
+        elif self.chart_type == "SingleWheelReturn":
+            # --- NATAL / EXTERNAL NATAL CHART SETUP ---
+
+            # Validate Subject
+            if not isinstance(self.first_obj, PlanetReturnModel):
+                raise KerykeionException("First object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
+
+            # Calculate aspects
+            natal_aspects_instance = NatalAspects(
+                self.first_obj,
+                new_settings_file=self.new_settings_file,
+                active_points=active_points,
+                active_aspects=active_aspects,
+            )
+            self.aspects_list = natal_aspects_instance.relevant_aspects
+
+            # Screen size
+            self.height = self._DEFAULT_HEIGHT
+            self.width = self._DEFAULT_NATAL_WIDTH
+
+            # Location and coordinates
+            self.location = self.first_obj.city
+            self.geolat = self.first_obj.lat
+            self.geolon = self.first_obj.lng
+
+            # Circle radii
+            if self.chart_type == "ExternalNatal":
+                self.first_circle_radius = 56
+                self.second_circle_radius = 92
+                self.third_circle_radius = 112
+            else:
+                self.first_circle_radius = 0
+                self.second_circle_radius = 36
+                self.third_circle_radius = 120
 
-        # Set circle radii based on chart type
-        if self.chart_type == "ExternalNatal":
-            self.first_circle_radius, self.second_circle_radius, self.third_circle_radius = 56, 92, 112
+        # --------------------
+        # FINAL COMMON SETUP
+        # --------------------
+
+        # Calculate element points
+        celestial_points_names = [body["name"].lower() for body in self.available_planets_setting]
+        if self.chart_type == "Synastry":
+            element_totals = calculate_synastry_element_points(
+                self.available_planets_setting,
+                celestial_points_names,
+                self.first_obj,
+                self.second_obj,
+            )
         else:
-            self.first_circle_radius, self.second_circle_radius, self.third_circle_radius = 0, 36, 120
+            element_totals = calculate_element_points(
+                self.available_planets_setting,
+                celestial_points_names,
+                self.first_obj,
+            )
 
-        # Initialize element points
-        self.fire = 0.0
-        self.earth = 0.0
-        self.air = 0.0
-        self.water = 0.0
+        self.fire = element_totals["fire"]
+        self.earth = element_totals["earth"]
+        self.air = element_totals["air"]
+        self.water = element_totals["water"]
+
+        # Calculate qualities points
+        if self.chart_type == "Synastry":
+            qualities_totals = calculate_synastry_quality_points(
+                self.available_planets_setting,
+                celestial_points_names,
+                self.first_obj,
+                self.second_obj,
+            )
+        else:
+            qualities_totals = calculate_quality_points(
+                self.available_planets_setting,
+                celestial_points_names,
+                self.first_obj,
+            )
 
-        # Calculate element points from planets
-        self._calculate_elements_points_from_planets()
+        self.cardinal = qualities_totals["cardinal"]
+        self.fixed = qualities_totals["fixed"]
+        self.mutable = qualities_totals["mutable"]
 
         # Set up theme
         if theme not in get_args(KerykeionChartTheme) and theme is not None:
@@ -361,7 +598,7 @@ class KerykeionChartSVG:
             dir_path (Path): Target directory for SVG output.
         """
         self.output_directory = dir_path
-        logging.info(f"Output direcotry set to: {self.output_directory}")
+        logging.info(f"Output directory set to: {self.output_directory}")
 
     def parse_json_settings(self, settings_file_or_dict: Union[Path, dict, KerykeionSettingsModel, None]) -> None:
         """
@@ -374,9 +611,6 @@ class KerykeionChartSVG:
         settings = get_settings(settings_file_or_dict)
 
         self.language_settings = settings["language_settings"][self.chart_language]
-        self.chart_colors_settings = settings["chart_colors"]
-        self.planets_settings = settings["celestial_points"]
-        self.aspects_settings = settings["aspects"]
 
     def _draw_zodiac_circle_slices(self, r):
         """
@@ -394,7 +628,7 @@ class KerykeionChartSVG:
             output += draw_zodiac_slice(
                 c1=self.first_circle_radius,
                 chart_type=self.chart_type,
-                seventh_house_degree_ut=self.user.seventh_house.abs_pos,
+                seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
                 num=i,
                 r=r,
                 style=f'fill:{self.chart_colors_settings[f"zodiac_bg_{i}"]}; fill-opacity: 0.5;',
@@ -403,65 +637,6 @@ class KerykeionChartSVG:
 
         return output
 
-    def _calculate_elements_points_from_planets(self):
-        """
-        Compute elemental point totals based on active planetary positions.
-
-        Iterates over each active planet to determine its zodiac element and adds extra points
-        if the planet is in a related sign. Updates self.fire, self.earth, self.air, and self.water.
-
-        Returns:
-            None
-        """
-
-        ZODIAC = (
-            {"name": "Ari", "element": "fire"},
-            {"name": "Tau", "element": "earth"},
-            {"name": "Gem", "element": "air"},
-            {"name": "Can", "element": "water"},
-            {"name": "Leo", "element": "fire"},
-            {"name": "Vir", "element": "earth"},
-            {"name": "Lib", "element": "air"},
-            {"name": "Sco", "element": "water"},
-            {"name": "Sag", "element": "fire"},
-            {"name": "Cap", "element": "earth"},
-            {"name": "Aqu", "element": "air"},
-            {"name": "Pis", "element": "water"},
-        )
-
-        # Available bodies
-        available_celestial_points_names = []
-        for body in self.available_planets_setting:
-            available_celestial_points_names.append(body["name"].lower())
-
-        # Make list of the points sign
-        points_sign = []
-        for planet in available_celestial_points_names:
-            points_sign.append(self.user.get(planet).sign_num)
-
-        for i in range(len(self.available_planets_setting)):
-            # element: get extra points if planet is in own zodiac sign.
-            related_zodiac_signs = self.available_planets_setting[i]["related_zodiac_signs"]
-            cz = points_sign[i]
-            extra_points = 0
-            if related_zodiac_signs != []:
-                for e in range(len(related_zodiac_signs)):
-                    if int(related_zodiac_signs[e]) == int(cz):
-                        extra_points = self._PLANET_IN_ZODIAC_EXTRA_POINTS
-
-            ele = ZODIAC[points_sign[i]]["element"]
-            if ele == "fire":
-                self.fire = self.fire + self.available_planets_setting[i]["element_points"] + extra_points
-
-            elif ele == "earth":
-                self.earth = self.earth + self.available_planets_setting[i]["element_points"] + extra_points
-
-            elif ele == "air":
-                self.air = self.air + self.available_planets_setting[i]["element_points"] + extra_points
-
-            elif ele == "water":
-                self.water = self.water + self.available_planets_setting[i]["element_points"] + extra_points
-
     def _draw_all_aspects_lines(self, r, ar):
         """
         Render SVG lines for all aspects in the chart.
@@ -483,7 +658,7 @@ class KerykeionChartSVG:
                     ar=ar,
                     aspect=aspect,
                     color=aspect_color,
-                    seventh_house_degree_ut=self.user.seventh_house.abs_pos
+                    seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
                 )
         return out
 
@@ -508,7 +683,7 @@ class KerykeionChartSVG:
                     ar=ar,
                     aspect=aspect,
                     color=aspect_color,
-                    seventh_house_degree_ut=self.user.seventh_house.abs_pos
+                    seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
                 )
         return out
 
@@ -525,168 +700,424 @@ class KerykeionChartSVG:
         # Initialize template dictionary
         template_dict: dict = {}
 
-        # Set the color style tag
-        template_dict["color_style_tag"] = self.color_style_tag
+        # -------------------------------------#
+        #  COMMON SETTINGS FOR ALL CHART TYPES #
+        # -------------------------------------#
 
-        # Set chart dimensions
+        # Set the color style tag and basic dimensions
+        template_dict["color_style_tag"] = self.color_style_tag
         template_dict["chart_height"] = self.height
         template_dict["chart_width"] = self.width
 
-        # Set viewbox based on chart type
-        if self.chart_type in ["Natal", "ExternalNatal", "Composite"]:
-            template_dict['viewbox'] = self._BASIC_CHART_VIEWBOX
-        elif self.double_chart_aspect_grid_type == "table" and self.chart_type == "Transit":
-            template_dict['viewbox'] = self._TRANSIT_CHART_WITH_TABLE_VIWBOX
-        else:
-            template_dict['viewbox'] = self._WIDE_CHART_VIEWBOX
+        # Set paper colors
+        template_dict["paper_color_0"] = self.chart_colors_settings["paper_0"]
+        template_dict["paper_color_1"] = self.chart_colors_settings["paper_1"]
 
-        # Generate rings and circles based on chart type
-        if self.chart_type in ["Transit", "Synastry"]:
-            template_dict["transitRing"] = draw_transit_ring(self.main_radius, self.chart_colors_settings["paper_1"], self.chart_colors_settings["zodiac_transit_ring_3"])
-            template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.user.seventh_house.abs_pos)
-            template_dict["first_circle"] = draw_first_circle(self.main_radius, self.chart_colors_settings["zodiac_transit_ring_2"], self.chart_type)
-            template_dict["second_circle"] = draw_second_circle(self.main_radius, self.chart_colors_settings['zodiac_transit_ring_1'], self.chart_colors_settings['paper_1'], self.chart_type)
-            template_dict['third_circle'] = draw_third_circle(self.main_radius, self.chart_colors_settings['zodiac_transit_ring_0'], self.chart_colors_settings['paper_1'], self.chart_type, self.third_circle_radius)
+        # Set planet colors
+        for planet in self.planets_settings:
+            planet_id = planet["id"]
+            template_dict[f"planets_color_{planet_id}"] = planet["color"]
 
-            if self.double_chart_aspect_grid_type == "list":
-                title = ""
-                if self.chart_type == "Synastry":
-                    title = self.language_settings.get("couple_aspects", "Couple Aspects")
-                else:
-                    title = self.language_settings.get("transit_aspects", "Transit Aspects")
+        # Set zodiac colors
+        for i in range(12):
+            template_dict[f"zodiac_color_{i}"] = self.chart_colors_settings[f"zodiac_icon_{i}"]
 
-                template_dict["makeAspectGrid"] = draw_transit_aspect_list(title, self.aspects_list, self.planets_settings, self.aspects_settings)
-            else:
-                template_dict["makeAspectGrid"] = draw_transit_aspect_grid(self.chart_colors_settings['paper_0'], self.available_planets_setting, self.aspects_list, 550, 450)
+        # Set orb colors
+        for aspect in self.aspects_settings:
+            template_dict[f"orb_color_{aspect['degree']}"] = aspect["color"]
 
-            template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
-        else:
+        # Draw zodiac circle slices
+        template_dict["makeZodiac"] = self._draw_zodiac_circle_slices(self.main_radius)
+
+        # Calculate element percentages
+        total_elements = self.fire + self.water + self.earth + self.air
+        fire_percentage = int(round(100 * self.fire / total_elements))
+        earth_percentage = int(round(100 * self.earth / total_elements))
+        air_percentage = int(round(100 * self.air / total_elements))
+        water_percentage = int(round(100 * self.water / total_elements))
+
+        # Element Percentages
+        template_dict["elements_string"] = f"{self.language_settings.get('elements', 'Elements')}:"
+        template_dict["fire_string"] = f"{self.language_settings['fire']} {fire_percentage}%"
+        template_dict["earth_string"] = f"{self.language_settings['earth']} {earth_percentage}%"
+        template_dict["air_string"] = f"{self.language_settings['air']} {air_percentage}%"
+        template_dict["water_string"] = f"{self.language_settings['water']} {water_percentage}%"
+
+
+        # Qualities Percentages
+        total_qualities = self.cardinal + self.fixed + self.mutable
+        cardinal_percentage = int(round(100 * self.cardinal / total_qualities))
+        fixed_percentage = int(round(100 * self.fixed / total_qualities))
+        mutable_percentage = int(round(100 * self.mutable / total_qualities))
+
+        template_dict["qualities_string"] = f"{self.language_settings.get('qualities', 'Qualities')}:"
+        template_dict["cardinal_string"] = f"{self.language_settings.get('cardinal', 'Cardinal')} {cardinal_percentage}%"
+        template_dict["fixed_string"] = f"{self.language_settings.get('fixed', 'Fixed')} {fixed_percentage}%"
+        template_dict["mutable_string"] = f"{self.language_settings.get('mutable', 'Mutable')} {mutable_percentage}%"
+
+        # Get houses list for main subject
+        first_subject_houses_list = get_houses_list(self.first_obj)
+
+        # ------------------------------- #
+        #  CHART TYPE SPECIFIC SETTINGS   #
+        # ------------------------------- #
+
+        if self.chart_type in ["Natal", "ExternalNatal"]:
+            # Set viewbox
+            template_dict["viewbox"] = self._BASIC_CHART_VIEWBOX
+
+            # Rings and circles
             template_dict["transitRing"] = ""
-            template_dict["degreeRing"] = draw_degree_ring(self.main_radius, self.first_circle_radius, self.user.seventh_house.abs_pos, self.chart_colors_settings["paper_0"])
-            template_dict['first_circle'] = draw_first_circle(self.main_radius, self.chart_colors_settings["zodiac_radix_ring_2"], self.chart_type, self.first_circle_radius)
-            template_dict["second_circle"] = draw_second_circle(self.main_radius, self.chart_colors_settings["zodiac_radix_ring_1"], self.chart_colors_settings["paper_1"], self.chart_type, self.second_circle_radius)
-            template_dict['third_circle'] = draw_third_circle(self.main_radius, self.chart_colors_settings["zodiac_radix_ring_0"], self.chart_colors_settings["paper_1"], self.chart_type, self.third_circle_radius)
-            template_dict["makeAspectGrid"] = draw_aspect_grid(self.chart_colors_settings['paper_0'], self.available_planets_setting, self.aspects_list)
+            template_dict["degreeRing"] = draw_degree_ring(
+                self.main_radius,
+                self.first_circle_radius,
+                self.first_obj.seventh_house.abs_pos,
+                self.chart_colors_settings["paper_0"],
+            )
+            template_dict["first_circle"] = draw_first_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_radix_ring_2"],
+                self.chart_type,
+                self.first_circle_radius,
+            )
+            template_dict["second_circle"] = draw_second_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_radix_ring_1"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+                self.second_circle_radius,
+            )
+            template_dict["third_circle"] = draw_third_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_radix_ring_0"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+                self.third_circle_radius,
+            )
 
+            # Aspects
+            template_dict["makeDoubleChartAspectList"] = ""
+            template_dict["makeAspectGrid"] = draw_aspect_grid(
+                self.chart_colors_settings["paper_0"],
+                self.available_planets_setting,
+                self.aspects_list,
+            )
             template_dict["makeAspects"] = self._draw_all_aspects_lines(self.main_radius, self.main_radius - self.third_circle_radius)
 
-        # Set chart title
-        if self.chart_type == "Synastry":
-            template_dict["stringTitle"] = f"{self.user.name} {self.language_settings['and_word']} {self.t_user.name}"
-        elif self.chart_type == "Transit":
-            template_dict["stringTitle"] = f"{self.language_settings['transits']} {self.t_user.day}/{self.t_user.month}/{self.t_user.year}"
-        elif self.chart_type in ["Natal", "ExternalNatal"]:
-            template_dict["stringTitle"] = self.user.name
-        elif self.chart_type == "Composite":
-            template_dict["stringTitle"] = f"{self.user.first_subject.name} {self.language_settings['and_word']} {self.user.second_subject.name}"
+            # Chart title
+            template_dict["stringTitle"] = f"{self.first_obj.name} - {self.language_settings.get("Birth Chart", "Birth Chart")}"
 
-        # Zodiac Type Info
-        if self.user.zodiac_type == 'Tropic':
-            zodiac_info = f"{self.language_settings.get('zodiac', 'Zodiac')}: {self.language_settings.get('tropical', 'Tropical')}"
-        else:
-            mode_const = "SIDM_" + self.user.sidereal_mode # type: ignore
-            mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
-            zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
+            # Top left section
+            latitude_string = convert_latitude_coordinate_to_string(self.geolat, self.language_settings["north"], self.language_settings["south"])
+            longitude_string = convert_longitude_coordinate_to_string(self.geolon, self.language_settings["east"], self.language_settings["west"])
 
-        template_dict["bottom_left_0"] = f"{self.language_settings.get('houses_system_' + self.user.houses_system_identifier, self.user.houses_system_name)} {self.language_settings.get('houses', 'Houses')}"
-        template_dict["bottom_left_1"] = zodiac_info
+            template_dict["top_left_0"] = f'{self.language_settings.get("location", "Location")}:'
+            template_dict["top_left_1"] = f"{self.first_obj.city}, {self.first_obj.nation}"
+            template_dict["top_left_2"] = f"{self.language_settings['latitude']}: {latitude_string}"
+            template_dict["top_left_3"] = f"{self.language_settings['longitude']}: {longitude_string}"
+            template_dict["top_left_4"] = format_datetime_with_timezone(self.first_obj.iso_formatted_local_datetime) # type: ignore
+            template_dict["top_left_5"] = f"{self.language_settings.get('day_of_week', 'Day of Week')}: {self.first_obj.day_of_week}" # type: ignore
+
+            # Bottom left section
+            if self.first_obj.zodiac_type == "Tropic":
+                zodiac_info = f"{self.language_settings.get('zodiac', 'Zodiac')}: {self.language_settings.get('tropical', 'Tropical')}"
+            else:
+                mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
+                mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
+                zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
+
+            template_dict["bottom_left_0"] = zodiac_info
+            template_dict["bottom_left_1"] = f"{self.language_settings.get('domification', 'Domification')}: {self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)}"
+            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.first_obj.lunar_phase.get("moon_phase", "")}'
+            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.first_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+            template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.first_obj.perspective_type.lower().replace(" ", "_"), self.first_obj.perspective_type)}'
+
+            # Moon phase section calculations
+            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+
+            # Houses and planet drawing
+            template_dict["makeHousesGrid"] = draw_house_grid(
+                main_subject_houses_list=first_subject_houses_list,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                house_cusp_generale_name_label=self.language_settings["cusp"],
+            )
+
+            template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
+                r=self.main_radius,
+                first_subject_houses_list=first_subject_houses_list,
+                standard_house_cusp_color=self.chart_colors_settings["houses_radix_line"],
+                first_house_color=self.planets_settings[12]["color"],
+                tenth_house_color=self.planets_settings[13]["color"],
+                seventh_house_color=self.planets_settings[14]["color"],
+                fourth_house_color=self.planets_settings[15]["color"],
+                c1=self.first_circle_radius,
+                c3=self.third_circle_radius,
+                chart_type=self.chart_type,
+            )
+
+            template_dict["makePlanets"] = draw_planets(
+                available_planets_setting=self.available_planets_setting,
+                chart_type=self.chart_type,
+                radius=self.main_radius,
+                available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
+                third_circle_radius=self.third_circle_radius,
+                main_subject_first_house_degree_ut=self.first_obj.first_house.abs_pos,
+                main_subject_seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
+            )
+
+            template_dict["makePlanetGrid"] = draw_planet_grid(
+                planets_and_houses_grid_title=self.language_settings["planets_and_house"],
+                subject_name=self.first_obj.name,
+                available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                celestial_point_language=self.language_settings["celestial_points"],
+            )
+            template_dict["makeHouseComparisonGrid"] = ""
 
-        if self.chart_type in ["Natal", "ExternalNatal", "Synastry"]:
-            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")} {self.language_settings.get("day", "Day").lower()}: {self.user.lunar_phase.get("moon_phase", "")}'
-            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.user.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.user.lunar_phase.moon_phase_name)}'
-            template_dict["bottom_left_4"] = f'{self.language_settings.get(self.user.perspective_type.lower().replace(" ", "_"), self.user.perspective_type)}'
-        elif self.chart_type == "Transit":
-            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.t_user.lunar_phase.get("moon_phase", "")}'
-            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.t_user.lunar_phase.moon_phase_name}'
-            template_dict["bottom_left_4"] = f'{self.language_settings.get(self.t_user.perspective_type.lower().replace(" ", "_"), self.t_user.perspective_type)}'
         elif self.chart_type == "Composite":
-            template_dict["bottom_left_2"] = f'{self.user.first_subject.perspective_type}'
+            # Set viewbox
+            template_dict["viewbox"] = self._BASIC_CHART_VIEWBOX
+
+            # Rings and circles
+            template_dict["transitRing"] = ""
+            template_dict["degreeRing"] = draw_degree_ring(
+                self.main_radius,
+                self.first_circle_radius,
+                self.first_obj.seventh_house.abs_pos,
+                self.chart_colors_settings["paper_0"],
+            )
+            template_dict["first_circle"] = draw_first_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_radix_ring_2"],
+                self.chart_type,
+                self.first_circle_radius,
+            )
+            template_dict["second_circle"] = draw_second_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_radix_ring_1"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+                self.second_circle_radius,
+            )
+            template_dict["third_circle"] = draw_third_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_radix_ring_0"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+                self.third_circle_radius,
+            )
+
+            # Aspects
+            template_dict["makeDoubleChartAspectList"] = ""
+            template_dict["makeAspectGrid"] = draw_aspect_grid(
+                self.chart_colors_settings["paper_0"],
+                self.available_planets_setting,
+                self.aspects_list,
+            )
+            template_dict["makeAspects"] = self._draw_all_aspects_lines(self.main_radius, self.main_radius - self.third_circle_radius)
+
+            # Chart title
+            template_dict["stringTitle"] = f"{self.first_obj.first_subject.name} {self.language_settings['and_word']} {self.first_obj.second_subject.name}" # type: ignore
+
+            # Top left section
+            # First subject
+            latitude = convert_latitude_coordinate_to_string(
+                self.first_obj.first_subject.lat, # type: ignore
+                self.language_settings["north_letter"],
+                self.language_settings["south_letter"],
+            )
+            longitude = convert_longitude_coordinate_to_string(
+                self.first_obj.first_subject.lng, # type: ignore
+                self.language_settings["east_letter"],
+                self.language_settings["west_letter"],
+            )
+
+            # Second subject
+            latitude_string = convert_latitude_coordinate_to_string(
+                self.first_obj.second_subject.lat, # type: ignore
+                self.language_settings["north_letter"],
+                self.language_settings["south_letter"],
+            )
+            longitude_string = convert_longitude_coordinate_to_string(
+                self.first_obj.second_subject.lng, # type: ignore
+                self.language_settings["east_letter"],
+                self.language_settings["west_letter"],
+            )
+
+            template_dict["top_left_0"] = f"{self.first_obj.first_subject.name}" # type: ignore
+            template_dict["top_left_1"] = f"{datetime.fromisoformat(self.first_obj.first_subject.iso_formatted_local_datetime).strftime('%Y-%m-%d %H:%M')}" # type: ignore
+            template_dict["top_left_2"] = f"{latitude} {longitude}"
+            template_dict["top_left_3"] = self.first_obj.second_subject.name # type: ignore
+            template_dict["top_left_4"] = f"{datetime.fromisoformat(self.first_obj.second_subject.iso_formatted_local_datetime).strftime('%Y-%m-%d %H:%M')}" # type: ignore
+            template_dict["top_left_5"] = f"{latitude_string} / {longitude_string}"
+
+            # Bottom left section
+            if self.first_obj.zodiac_type == "Tropic":
+                zodiac_info = f"{self.language_settings.get('zodiac', 'Zodiac')}: {self.language_settings.get('tropical', 'Tropical')}"
+            else:
+                mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
+                mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
+                zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
+
+            template_dict["bottom_left_0"] = zodiac_info
+            template_dict["bottom_left_1"] = f"{self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)} {self.language_settings.get('houses', 'Houses')}"
+            template_dict["bottom_left_2"] = f"{self.language_settings.get("perspective_type", "Perspective")}: {self.first_obj.first_subject.perspective_type}" # type: ignore
             template_dict["bottom_left_3"] = f'{self.language_settings.get("composite_chart", "Composite Chart")} - {self.language_settings.get("midpoints", "Midpoints")}'
             template_dict["bottom_left_4"] = ""
 
-        # Draw moon phase
-        moon_phase_dict = calculate_moon_phase_chart_params(
-            self.user.lunar_phase["degrees_between_s_m"],
-            self.geolat
-        )
-
-        template_dict["lunar_phase_rotate"] = moon_phase_dict["lunar_phase_rotate"]
-        template_dict["lunar_phase_circle_center_x"] = moon_phase_dict["circle_center_x"]
-        template_dict["lunar_phase_circle_radius"] = moon_phase_dict["circle_radius"]
-
-        if self.chart_type == "Composite":
-            template_dict["top_left_1"] = f"{datetime.fromisoformat(self.user.first_subject.iso_formatted_local_datetime).strftime('%Y-%m-%d %H:%M')}"
-        # Set location string
-        elif len(self.location) > 35:
-            split_location = self.location.split(",")
-            if len(split_location) > 1:
-                template_dict["top_left_1"] = split_location[0] + ", " + split_location[-1]
-                if len(template_dict["top_left_1"]) > 35:
-                    template_dict["top_left_1"] = template_dict["top_left_1"][:35] + "..."
+            # Moon phase section calculations
+            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+
+            # Houses and planet drawing
+            template_dict["makeHousesGrid"] = draw_house_grid(
+                main_subject_houses_list=first_subject_houses_list,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                house_cusp_generale_name_label=self.language_settings["cusp"],
+            )
+
+            template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
+                r=self.main_radius,
+                first_subject_houses_list=first_subject_houses_list,
+                standard_house_cusp_color=self.chart_colors_settings["houses_radix_line"],
+                first_house_color=self.planets_settings[12]["color"],
+                tenth_house_color=self.planets_settings[13]["color"],
+                seventh_house_color=self.planets_settings[14]["color"],
+                fourth_house_color=self.planets_settings[15]["color"],
+                c1=self.first_circle_radius,
+                c3=self.third_circle_radius,
+                chart_type=self.chart_type,
+            )
+
+            template_dict["makePlanets"] = draw_planets(
+                available_planets_setting=self.available_planets_setting,
+                chart_type=self.chart_type,
+                radius=self.main_radius,
+                available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
+                third_circle_radius=self.third_circle_radius,
+                main_subject_first_house_degree_ut=self.first_obj.first_house.abs_pos,
+                main_subject_seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
+            )
+
+            subject_name = f"{self.first_obj.first_subject.name} {self.language_settings['and_word']} {self.first_obj.second_subject.name}" # type: ignore
+
+            template_dict["makePlanetGrid"] = draw_planet_grid(
+                planets_and_houses_grid_title=self.language_settings["planets_and_house"],
+                subject_name=subject_name,
+                available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                celestial_point_language=self.language_settings["celestial_points"],
+            )
+            template_dict["makeHouseComparisonGrid"] = ""
+
+        elif self.chart_type == "Transit":
+
+            # Transit has no Element Percentages
+            template_dict["elements_string"] = ""
+            template_dict["fire_string"] = ""
+            template_dict["earth_string"] = ""
+            template_dict["air_string"] = ""
+            template_dict["water_string"] = ""
+
+            # Transit has no Qualities Percentages
+            template_dict["qualities_string"] = ""
+            template_dict["cardinal_string"] = ""
+            template_dict["fixed_string"] = ""
+            template_dict["mutable_string"] = ""
+
+            # Set viewbox
+            if self.double_chart_aspect_grid_type == "table":
+                template_dict["viewbox"] = self._TRANSIT_CHART_WITH_TABLE_VIWBOX
             else:
-                template_dict["top_left_1"] = self.location[:35] + "..."
-        else:
-            template_dict["top_left_1"] = self.location
+                template_dict["viewbox"] = self._WIDE_CHART_VIEWBOX
 
-        # Set chart name
-        if self.chart_type in ["Synastry", "Transit"]:
-            template_dict["top_left_0"] = f"{self.user.name}:"
-        elif self.chart_type in ["Natal", "ExternalNatal"]:
-            template_dict["top_left_0"] = f'{self.language_settings["info"]}:'
-        elif self.chart_type == "Composite":
-            template_dict["top_left_0"] = f'{self.user.first_subject.name}'
+            # Get houses list for secondary subject
+            second_subject_houses_list = get_houses_list(self.second_obj) # type: ignore
 
-        # Set additional information for Synastry chart type
-        if self.chart_type == "Synastry":
-            template_dict["top_left_3"] = f"{self.t_user.name}: "
-            template_dict["top_left_4"] = self.t_user.city
-            template_dict["top_left_5"] = f"{self.t_user.year}-{self.t_user.month}-{self.t_user.day} {self.t_user.hour:02d}:{self.t_user.minute:02d}"
-        elif self.chart_type == "Composite":
-            template_dict["top_left_3"] = self.user.second_subject.name
-            template_dict["top_left_4"] = f"{datetime.fromisoformat(self.user.second_subject.iso_formatted_local_datetime).strftime('%Y-%m-%d %H:%M')}"
-            latitude_string = convert_latitude_coordinate_to_string(self.user.second_subject.lat, self.language_settings['north_letter'], self.language_settings['south_letter'])
-            longitude_string = convert_longitude_coordinate_to_string(self.user.second_subject.lng, self.language_settings['east_letter'], self.language_settings['west_letter'])
-            template_dict["top_left_5"] = f"{latitude_string} / {longitude_string}"
-        else:
-            latitude_string = convert_latitude_coordinate_to_string(self.geolat, self.language_settings['north'], self.language_settings['south'])
-            longitude_string = convert_longitude_coordinate_to_string(self.geolon, self.language_settings['east'], self.language_settings['west'])
-            template_dict["top_left_3"] = f"{self.language_settings['latitude']}: {latitude_string}"
-            template_dict["top_left_4"] = f"{self.language_settings['longitude']}: {longitude_string}"
-            template_dict["top_left_5"] = f"{self.language_settings['type']}: {self.language_settings.get(self.chart_type, self.chart_type)}"
+            # Rings and circles
+            template_dict["transitRing"] = draw_transit_ring(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["zodiac_transit_ring_3"],
+            )
+            template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.first_obj.seventh_house.abs_pos)
+            template_dict["first_circle"] = draw_first_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_transit_ring_2"],
+                self.chart_type,
+            )
+            template_dict["second_circle"] = draw_second_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_transit_ring_1"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+            )
+            template_dict["third_circle"] = draw_third_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_transit_ring_0"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+                self.third_circle_radius,
+            )
 
+            # Aspects
+            if self.double_chart_aspect_grid_type == "list":
+                title = f"{self.first_obj.name} - {self.language_settings.get("transit_aspects", "Transit Aspects")}"
+                template_dict["makeAspectGrid"] = ""
+                template_dict["makeDoubleChartAspectList"] = draw_transit_aspect_list(title, self.aspects_list, self.planets_settings, self.aspects_settings)
+            else:
+                template_dict["makeAspectGrid"] = ""
+                template_dict["makeDoubleChartAspectList"] = draw_transit_aspect_grid(
+                    self.chart_colors_settings["paper_0"],
+                    self.available_planets_setting,
+                    self.aspects_list,
+                    550,
+                    450,
+                )
 
-        # Set paper colors
-        template_dict["paper_color_0"] = self.chart_colors_settings["paper_0"]
-        template_dict["paper_color_1"] = self.chart_colors_settings["paper_1"]
+            template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
 
-        # Set planet colors
-        for planet in self.planets_settings:
-            planet_id = planet["id"]
-            template_dict[f"planets_color_{planet_id}"] = planet["color"] # type: ignore
+            # Chart title
+            template_dict["stringTitle"] = f"{self.language_settings['transits']} {format_datetime_with_timezone(self.second_obj.iso_formatted_local_datetime)}" # type: ignore
 
-        # Set zodiac colors
-        for i in range(12):
-            template_dict[f"zodiac_color_{i}"] = self.chart_colors_settings[f"zodiac_icon_{i}"] # type: ignore
+            # Top left section
+            latitude_string = convert_latitude_coordinate_to_string(self.geolat, self.language_settings["north"], self.language_settings["south"])
+            longitude_string = convert_longitude_coordinate_to_string(self.geolon, self.language_settings["east"], self.language_settings["west"])
 
-        # Set orb colors
-        for aspect in self.aspects_settings:
-            template_dict[f"orb_color_{aspect['degree']}"] = aspect['color'] # type: ignore
+            template_dict["top_left_0"] = template_dict["top_left_0"] = f'{self.first_obj.name}'
+            template_dict["top_left_1"] = f"{format_location_string(self.first_obj.city)}, {self.first_obj.nation}" # type: ignore
+            template_dict["top_left_2"] = format_datetime_with_timezone(self.first_obj.iso_formatted_local_datetime) # type: ignore
+            template_dict["top_left_3"] = f"{self.language_settings['latitude']}: {latitude_string}"
+            template_dict["top_left_4"] = f"{self.language_settings['longitude']}: {longitude_string}"
+            template_dict["top_left_5"] = ""#f"{self.language_settings['type']}: {self.language_settings.get(self.chart_type, self.chart_type)}"
 
-        # Drawing functions
-        template_dict["makeZodiac"] = self._draw_zodiac_circle_slices(self.main_radius)
+            # Bottom left section
+            if self.first_obj.zodiac_type == "Tropic":
+                zodiac_info = f"{self.language_settings.get('zodiac', 'Zodiac')}: {self.language_settings.get('tropical', 'Tropical')}"
+            else:
+                mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
+                mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
+                zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
 
-        first_subject_houses_list = get_houses_list(self.user)
+            template_dict["bottom_left_0"] = zodiac_info
+            template_dict["bottom_left_1"] = f"{self.language_settings.get('domification', 'Domification')}: {self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)}"
+            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.second_obj.lunar_phase.get("moon_phase", "")}' # type: ignore
+            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.second_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+            template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.second_obj.perspective_type.lower().replace(" ", "_"), self.second_obj.perspective_type)}' # type: ignore
 
-        # Draw houses grid and cusps
-        if self.chart_type in ["Transit", "Synastry"]:
-            second_subject_houses_list = get_houses_list(self.t_user)
+            # Moon phase section calculations
+            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
 
+            # Houses and planet drawing
             template_dict["makeHousesGrid"] = draw_house_grid(
                 main_subject_houses_list=first_subject_houses_list,
                 secondary_subject_houses_list=second_subject_houses_list,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
-                house_cusp_generale_name_label=self.language_settings["cusp"]
+                house_cusp_generale_name_label=self.language_settings["cusp"],
             )
 
             template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
@@ -704,12 +1135,140 @@ class KerykeionChartSVG:
                 transit_house_cusp_color=self.chart_colors_settings["houses_transit_line"],
             )
 
-        else:
+            template_dict["makePlanets"] = draw_planets(
+                available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
+                available_planets_setting=self.available_planets_setting,
+                second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
+                radius=self.main_radius,
+                main_subject_first_house_degree_ut=self.first_obj.first_house.abs_pos,
+                main_subject_seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
+                chart_type=self.chart_type,
+                third_circle_radius=self.third_circle_radius,
+            )
+
+            # Planet grid
+
+            first_return_grid_title = f"{self.first_obj.name} ({self.language_settings.get('inner_wheel', 'Inner Wheel')})"
+            second_return_grid_title = f"{self.language_settings.get('Transit', 'Transit')} ({self.language_settings.get('outer_wheel', 'Outer Wheel')})"
+            template_dict["makePlanetGrid"] = draw_planet_grid(
+                planets_and_houses_grid_title="",
+                subject_name=first_return_grid_title,
+                available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                celestial_point_language=self.language_settings["celestial_points"],
+                second_subject_name=second_return_grid_title,
+                second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
+            )
+
+            # House comparison grid
+            house_comparison_factory = HouseComparisonFactory(
+                first_subject=self.first_obj,
+                second_subject=self.second_obj,
+                active_points=self.active_points,
+            )
+            house_comparison = house_comparison_factory.get_house_comparison()
+
+            template_dict["makeHouseComparisonGrid"] = draw_single_house_comparison_grid(
+                house_comparison,
+                celestial_point_language=self.language_settings.get("celestial_points", "Celestial Points"),
+                active_points=self.active_points,
+                points_owner_subject_number=2, # The second subject is the Transit
+                house_position_comparison_label=self.language_settings.get("house_position_comparison", "House Position Comparison"),
+                return_point_label=self.language_settings.get("transit_point", "Transit Point"),
+                natal_house_label=self.language_settings.get("house_position", "Natal House"),
+                x_position=930,
+            )
+
+        elif self.chart_type == "Synastry":
+            # Set viewbox
+            template_dict["viewbox"] = self._WIDE_CHART_VIEWBOX
+
+            # Get houses list for secondary subject
+            second_subject_houses_list = get_houses_list(self.second_obj) # type: ignore
+
+            # Rings and circles
+            template_dict["transitRing"] = draw_transit_ring(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["zodiac_transit_ring_3"],
+            )
+            template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.first_obj.seventh_house.abs_pos)
+            template_dict["first_circle"] = draw_first_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_transit_ring_2"],
+                self.chart_type,
+            )
+            template_dict["second_circle"] = draw_second_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_transit_ring_1"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+            )
+            template_dict["third_circle"] = draw_third_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_transit_ring_0"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+                self.third_circle_radius,
+            )
+
+            # Aspects
+            if self.double_chart_aspect_grid_type == "list":
+                template_dict["makeAspectGrid"] = ""
+                template_dict["makeDoubleChartAspectList"] = draw_transit_aspect_list(
+                    f"{self.first_obj.name} - {self.second_obj.name} {self.language_settings.get('synastry_aspects', 'Synastry Aspects')}", # type: ignore
+                    self.aspects_list,
+                    self.planets_settings,
+                    self.aspects_settings
+                )
+            else:
+                template_dict["makeAspectGrid"] = ""
+                template_dict["makeDoubleChartAspectList"] = draw_transit_aspect_grid(
+                    self.chart_colors_settings["paper_0"],
+                    self.available_planets_setting,
+                    self.aspects_list,
+                    550,
+                    450,
+                )
+
+            template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
+
+            # Chart title
+            template_dict["stringTitle"] = f"{self.first_obj.name} {self.language_settings['and_word']} {self.second_obj.name}" # type: ignore
+
+            # Top left section
+            template_dict["top_left_0"] = f"{self.first_obj.name}:"
+            template_dict["top_left_1"] = f"{self.first_obj.city}, {self.first_obj.nation}" # type: ignore
+            template_dict["top_left_2"] = format_datetime_with_timezone(self.first_obj.iso_formatted_local_datetime) # type: ignore
+            template_dict["top_left_3"] = f"{self.second_obj.name}: " # type: ignore
+            template_dict["top_left_4"] = f"{self.second_obj.city}, {self.second_obj.nation}" # type: ignore
+            template_dict["top_left_5"] = format_datetime_with_timezone(self.second_obj.iso_formatted_local_datetime) # type: ignore
+
+            # Bottom left section
+            if self.first_obj.zodiac_type == "Tropic":
+                zodiac_info = f"{self.language_settings.get('zodiac', 'Zodiac')}: {self.language_settings.get('tropical', 'Tropical')}"
+            else:
+                mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
+                mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
+                zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
+
+            template_dict["bottom_left_0"] = ""
+            template_dict["bottom_left_1"] = ""
+            template_dict["bottom_left_2"] = zodiac_info
+            template_dict["bottom_left_3"] = f"{self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)} {self.language_settings.get('houses', 'Houses')}"
+            template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.first_obj.perspective_type.lower().replace(" ", "_"), self.first_obj.perspective_type)}'
+
+            # Moon phase section calculations
+            template_dict["makeLunarPhase"] = ""
+
+            # Houses and planet drawing
             template_dict["makeHousesGrid"] = draw_house_grid(
                 main_subject_houses_list=first_subject_houses_list,
+                secondary_subject_houses_list=second_subject_houses_list,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
-                house_cusp_generale_name_label=self.language_settings["cusp"]
+                house_cusp_generale_name_label=self.language_settings["cusp"],
             )
 
             template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
@@ -723,91 +1282,319 @@ class KerykeionChartSVG:
                 c1=self.first_circle_radius,
                 c3=self.third_circle_radius,
                 chart_type=self.chart_type,
+                second_subject_houses_list=second_subject_houses_list,
+                transit_house_cusp_color=self.chart_colors_settings["houses_transit_line"],
             )
 
-        # Draw planets
-        if self.chart_type in ["Transit", "Synastry"]:
             template_dict["makePlanets"] = draw_planets(
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
                 available_planets_setting=self.available_planets_setting,
                 second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
                 radius=self.main_radius,
-                main_subject_first_house_degree_ut=self.user.first_house.abs_pos,
-                main_subject_seventh_house_degree_ut=self.user.seventh_house.abs_pos,
+                main_subject_first_house_degree_ut=self.first_obj.first_house.abs_pos,
+                main_subject_seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
                 chart_type=self.chart_type,
                 third_circle_radius=self.third_circle_radius,
             )
-        else:
-            template_dict["makePlanets"] = draw_planets(
-                available_planets_setting=self.available_planets_setting,
-                chart_type=self.chart_type,
-                radius=self.main_radius,
+
+            # Planet grid
+            template_dict["makePlanetGrid"] = draw_planet_grid(
+                planets_and_houses_grid_title="",
+                subject_name=f"{self.first_obj.name} ({self.language_settings.get('inner_wheel', 'Inner Wheel')})",
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
-                third_circle_radius=self.third_circle_radius,
-                main_subject_first_house_degree_ut=self.user.first_house.abs_pos,
-                main_subject_seventh_house_degree_ut=self.user.seventh_house.abs_pos
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                celestial_point_language=self.language_settings["celestial_points"],
+                second_subject_name= f"{self.second_obj.name} ({self.language_settings.get('outer_wheel', 'Outer Wheel')})", # type: ignore
+                second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
             )
+            template_dict["makeHouseComparisonGrid"] = ""
 
-        # Draw elements percentages
-        total = self.fire + self.water + self.earth + self.air
+        elif self.chart_type == "Return":
+            # Set viewbox
+            template_dict["viewbox"] = self._ULTRA_WIDE_CHART_VIEWBOX
 
-        fire_percentage = int(round(100 * self.fire / total))
-        earth_percentage = int(round(100 * self.earth / total))
-        air_percentage = int(round(100 * self.air / total))
-        water_percentage = int(round(100 * self.water / total))
+            # Get houses list for secondary subject
+            second_subject_houses_list = get_houses_list(self.second_obj) # type: ignore
 
-        template_dict["fire_string"] = f"{self.language_settings['fire']} {fire_percentage}%"
-        template_dict["earth_string"] = f"{self.language_settings['earth']} {earth_percentage}%"
-        template_dict["air_string"] = f"{self.language_settings['air']} {air_percentage}%"
-        template_dict["water_string"] = f"{self.language_settings['water']} {water_percentage}%"
+            # Rings and circles
+            template_dict["transitRing"] = draw_transit_ring(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["zodiac_transit_ring_3"],
+            )
+            template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.first_obj.seventh_house.abs_pos)
+            template_dict["first_circle"] = draw_first_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_transit_ring_2"],
+                self.chart_type,
+            )
+            template_dict["second_circle"] = draw_second_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_transit_ring_1"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+            )
+            template_dict["third_circle"] = draw_third_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_transit_ring_0"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+                self.third_circle_radius,
+            )
+
+            # Aspects
+            if self.double_chart_aspect_grid_type == "list":
+                title = self.language_settings.get("return_aspects", "Natal to Return Aspects")
+                template_dict["makeAspectGrid"] = ""
+                template_dict["makeDoubleChartAspectList"] = draw_transit_aspect_list(title, self.aspects_list, self.planets_settings, self.aspects_settings, max_columns=7)
+            else:
+                template_dict["makeAspectGrid"] = ""
+                template_dict["makeDoubleChartAspectList"] = draw_transit_aspect_grid(
+                    self.chart_colors_settings["paper_0"],
+                    self.available_planets_setting,
+                    self.aspects_list,
+                    550,
+                    450,
+                )
+
+            template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
 
-        # Draw planet grid
-        if self.chart_type in ["Transit", "Synastry"]:
-            if self.chart_type == "Transit":
-                second_subject_table_name = self.language_settings["transit_name"]
+            # Chart title
+            if self.second_obj.return_type == "Solar":
+                template_dict["stringTitle"] = f"{self.first_obj.name} - {self.language_settings.get('solar_return', 'Solar Return')}"
             else:
-                second_subject_table_name = self.t_user.name
+                template_dict["stringTitle"] = f"{self.first_obj.name} - {self.language_settings.get('lunar_return', 'Lunar Return')}"
 
+
+            # Top left section
+            # Subject
+            latitude_string = convert_latitude_coordinate_to_string(self.first_obj.lat, self.language_settings["north"], self.language_settings["south"]) # type: ignore
+            longitude_string = convert_longitude_coordinate_to_string(self.first_obj.lng, self.language_settings["east"], self.language_settings["west"]) # type: ignore
+
+            # Return
+            return_latitude_string = convert_latitude_coordinate_to_string(self.second_obj.lat, self.language_settings["north"], self.language_settings["south"]) # type: ignore
+            return_longitude_string = convert_longitude_coordinate_to_string(self.second_obj.lng, self.language_settings["east"], self.language_settings["west"]) # type: ignore
+
+            if self.second_obj.return_type == "Solar":
+                template_dict["top_left_0"] = f"{self.language_settings.get('solar_return', 'Solar Return')}:"
+            else:
+                template_dict["top_left_0"] = f"{self.language_settings.get('lunar_return', 'Lunar Return')}:"
+            template_dict["top_left_1"] = format_datetime_with_timezone(self.second_obj.iso_formatted_local_datetime) # type: ignore
+            template_dict["top_left_2"] = f"{return_latitude_string} / {return_longitude_string}"
+            template_dict["top_left_3"] = f"{self.first_obj.name}"
+            template_dict["top_left_4"] = format_datetime_with_timezone(self.first_obj.iso_formatted_local_datetime) # type: ignore
+            template_dict["top_left_5"] = f"{latitude_string} / {longitude_string}"
+
+            # Bottom left section
+            if self.first_obj.zodiac_type == "Tropic":
+                zodiac_info = f"{self.language_settings.get('zodiac', 'Zodiac')}: {self.language_settings.get('tropical', 'Tropical')}"
+            else:
+                mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
+                mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
+                zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
+
+            template_dict["bottom_left_0"] = zodiac_info
+            template_dict["bottom_left_1"] = f"{self.language_settings.get('domification', 'Domification')}: {self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)}"
+            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.first_obj.lunar_phase.get("moon_phase", "")}'
+            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.first_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+            template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.first_obj.perspective_type.lower().replace(" ", "_"), self.first_obj.perspective_type)}'
+
+            # Moon phase section calculations
+            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+
+            # Houses and planet drawing
+            template_dict["makeHousesGrid"] = draw_house_grid(
+                main_subject_houses_list=first_subject_houses_list,
+                secondary_subject_houses_list=second_subject_houses_list,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                house_cusp_generale_name_label=self.language_settings["cusp"],
+            )
+
+            template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
+                r=self.main_radius,
+                first_subject_houses_list=first_subject_houses_list,
+                standard_house_cusp_color=self.chart_colors_settings["houses_radix_line"],
+                first_house_color=self.planets_settings[12]["color"],
+                tenth_house_color=self.planets_settings[13]["color"],
+                seventh_house_color=self.planets_settings[14]["color"],
+                fourth_house_color=self.planets_settings[15]["color"],
+                c1=self.first_circle_radius,
+                c3=self.third_circle_radius,
+                chart_type=self.chart_type,
+                second_subject_houses_list=second_subject_houses_list,
+                transit_house_cusp_color=self.chart_colors_settings["houses_transit_line"],
+            )
+
+            template_dict["makePlanets"] = draw_planets(
+                available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
+                available_planets_setting=self.available_planets_setting,
+                second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
+                radius=self.main_radius,
+                main_subject_first_house_degree_ut=self.first_obj.first_house.abs_pos,
+                main_subject_seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
+                chart_type=self.chart_type,
+                third_circle_radius=self.third_circle_radius,
+            )
+
+            # Planet grid
+            if self.second_obj.return_type == "Solar":
+                first_return_grid_title = f"{self.first_obj.name} ({self.language_settings.get('inner_wheel', 'Inner Wheel')})"
+                second_return_grid_title = f"{self.language_settings.get('solar_return', 'Solar Return')} ({self.language_settings.get('outer_wheel', 'Outer Wheel')})"
+            else:
+                first_return_grid_title = f"{self.first_obj.name} ({self.language_settings.get('inner_wheel', 'Inner Wheel')})"
+                second_return_grid_title = f"{self.language_settings.get("lunar_return", "Lunar Return")} ({self.language_settings.get("outer_wheel", "Outer Wheel")})"
             template_dict["makePlanetGrid"] = draw_planet_grid(
-                planets_and_houses_grid_title=self.language_settings["planets_and_house"],
-                subject_name=self.user.name,
+                planets_and_houses_grid_title="",
+                subject_name=first_return_grid_title,
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
                 celestial_point_language=self.language_settings["celestial_points"],
-                second_subject_name=second_subject_table_name,
+                second_subject_name=second_return_grid_title,
                 second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
             )
-        else:
-            if self.chart_type == "Composite":
-                subject_name = f"{self.user.first_subject.name} {self.language_settings['and_word']} {self.user.second_subject.name}"
+
+            house_comparison_factory = HouseComparisonFactory(
+                first_subject=self.first_obj,
+                second_subject=self.second_obj,
+                active_points=self.active_points,
+            )
+            house_comparison = house_comparison_factory.get_house_comparison()
+
+            template_dict["makeHouseComparisonGrid"] = draw_house_comparison_grid(
+                house_comparison,
+                celestial_point_language=self.language_settings["celestial_points"],
+                active_points=self.active_points,
+                points_owner_subject_number=2, # The second subject is the Solar Return
+                house_position_comparison_label=self.language_settings.get("house_position_comparison", "House Position Comparison"),
+                return_point_label=self.language_settings.get("return_point", "Return Point"),
+                return_label=self.language_settings.get("Return", "Return"),
+                radix_label=self.language_settings.get("Natal", "Natal"),
+            )
+
+        elif self.chart_type == "SingleWheelReturn":
+            # Set viewbox
+            template_dict["viewbox"] = self._BASIC_CHART_VIEWBOX
+
+            # Rings and circles
+            template_dict["transitRing"] = ""
+            template_dict["degreeRing"] = draw_degree_ring(
+                self.main_radius,
+                self.first_circle_radius,
+                self.first_obj.seventh_house.abs_pos,
+                self.chart_colors_settings["paper_0"],
+            )
+            template_dict["first_circle"] = draw_first_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_radix_ring_2"],
+                self.chart_type,
+                self.first_circle_radius,
+            )
+            template_dict["second_circle"] = draw_second_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_radix_ring_1"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+                self.second_circle_radius,
+            )
+            template_dict["third_circle"] = draw_third_circle(
+                self.main_radius,
+                self.chart_colors_settings["zodiac_radix_ring_0"],
+                self.chart_colors_settings["paper_1"],
+                self.chart_type,
+                self.third_circle_radius,
+            )
+
+            # Aspects
+            template_dict["makeDoubleChartAspectList"] = ""
+            template_dict["makeAspectGrid"] = draw_aspect_grid(
+                self.chart_colors_settings["paper_0"],
+                self.available_planets_setting,
+                self.aspects_list,
+            )
+            template_dict["makeAspects"] = self._draw_all_aspects_lines(self.main_radius, self.main_radius - self.third_circle_radius)
+
+            # Chart title
+            template_dict["stringTitle"] = self.first_obj.name
+
+            # Top left section
+            latitude_string = convert_latitude_coordinate_to_string(self.geolat, self.language_settings["north"], self.language_settings["south"])
+            longitude_string = convert_longitude_coordinate_to_string(self.geolon, self.language_settings["east"], self.language_settings["west"])
+
+            template_dict["top_left_0"] = f'{self.language_settings["info"]}:'
+            template_dict["top_left_1"] = format_datetime_with_timezone(self.first_obj.iso_formatted_local_datetime) # type: ignore
+            template_dict["top_left_2"] = format_location_string(self.location)
+            template_dict["top_left_3"] = f"{self.language_settings['latitude']}: {latitude_string}"
+            template_dict["top_left_4"] = f"{self.language_settings['longitude']}: {longitude_string}"
+
+            if self.first_obj.return_type == "Solar":
+                template_dict["top_left_5"] = f"{self.language_settings['type']}: {self.language_settings.get('solar_return', 'Solar Return')}"
             else:
-                subject_name = self.user.name
+                template_dict["top_left_5"] = f"{self.language_settings['type']}: {self.language_settings.get('lunar_return', 'Lunar Return')}"
+
+            # Bottom left section
+            if self.first_obj.zodiac_type == "Tropic":
+                zodiac_info = f"{self.language_settings.get('zodiac', 'Zodiac')}: {self.language_settings.get('tropical', 'Tropical')}"
+            else:
+                mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
+                mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
+                zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
+
+            template_dict["bottom_left_0"] = zodiac_info
+            template_dict["bottom_left_1"] = f"{self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)} {self.language_settings.get('houses', 'Houses')}"
+            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.first_obj.lunar_phase.get("moon_phase", "")}'
+            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.first_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+            template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.first_obj.perspective_type.lower().replace(" ", "_"), self.first_obj.perspective_type)}'
+
+            # Moon phase section calculations
+            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+
+            # Houses and planet drawing
+            template_dict["makeHousesGrid"] = draw_house_grid(
+                main_subject_houses_list=first_subject_houses_list,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                house_cusp_generale_name_label=self.language_settings["cusp"],
+            )
+
+            template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
+                r=self.main_radius,
+                first_subject_houses_list=first_subject_houses_list,
+                standard_house_cusp_color=self.chart_colors_settings["houses_radix_line"],
+                first_house_color=self.planets_settings[12]["color"],
+                tenth_house_color=self.planets_settings[13]["color"],
+                seventh_house_color=self.planets_settings[14]["color"],
+                fourth_house_color=self.planets_settings[15]["color"],
+                c1=self.first_circle_radius,
+                c3=self.third_circle_radius,
+                chart_type=self.chart_type,
+            )
+
+            template_dict["makePlanets"] = draw_planets(
+                available_planets_setting=self.available_planets_setting,
+                chart_type=self.chart_type,
+                radius=self.main_radius,
+                available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
+                third_circle_radius=self.third_circle_radius,
+                main_subject_first_house_degree_ut=self.first_obj.first_house.abs_pos,
+                main_subject_seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
+            )
 
             template_dict["makePlanetGrid"] = draw_planet_grid(
                 planets_and_houses_grid_title=self.language_settings["planets_and_house"],
-                subject_name=subject_name,
+                subject_name=self.first_obj.name,
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
                 celestial_point_language=self.language_settings["celestial_points"],
             )
-
-        # Set date time string
-        if self.chart_type in ["Composite"]:
-            # First Subject Latitude and Longitude
-            latitude = convert_latitude_coordinate_to_string(self.user.first_subject.lat, self.language_settings["north_letter"], self.language_settings["south_letter"])
-            longitude = convert_longitude_coordinate_to_string(self.user.first_subject.lng, self.language_settings["east_letter"], self.language_settings["west_letter"])
-            template_dict["top_left_2"] = f"{latitude} {longitude}"
-        else:
-            dt = datetime.fromisoformat(self.user.iso_formatted_local_datetime)
-            custom_format = dt.strftime('%Y-%m-%d %H:%M [%z]')
-            custom_format = custom_format[:-3] + ':' + custom_format[-3:]
-            template_dict["top_left_2"] = f"{custom_format}"
+            template_dict["makeHouseComparisonGrid"] = ""
 
         return ChartTemplateDictionary(**template_dict)
 
-    def makeTemplate(self, minify: bool = False, remove_css_variables = False) -> str:
+    def makeTemplate(self, minify: bool = False, remove_css_variables=False) -> str:
         """
         Render the full chart SVG as a string.
 
@@ -840,14 +1627,14 @@ class KerykeionChartSVG:
             template = inline_css_variables_in_svg(template)
 
         if minify:
-            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t","").replace("    ", "").replace("  ", "")
+            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t", "").replace("    ", "").replace("  ", "")
 
         else:
             template = template.replace('"', "'")
 
         return template
 
-    def makeSVG(self, minify: bool = False, remove_css_variables = False):
+    def makeSVG(self, minify: bool = False, remove_css_variables=False):
         """
         Generate and save the full chart SVG to disk.
 
@@ -864,14 +1651,19 @@ class KerykeionChartSVG:
 
         self.template = self.makeTemplate(minify, remove_css_variables)
 
-        chartname = self.output_directory / f"{self.user.name} - {self.chart_type} Chart.svg"
+        if self.chart_type == "Return" and self.second_obj.return_type == "Lunar":
+            chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart - Lunar Return.svg"
+        elif self.chart_type == "Return" and self.second_obj.return_type == "Solar":
+            chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart - Solar Return.svg"
+        else:
+            chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart.svg"
 
         with open(chartname, "w", encoding="utf-8", errors="ignore") as output_file:
             output_file.write(self.template)
 
         print(f"SVG Generated Correctly in: {chartname}")
 
-    def makeWheelOnlyTemplate(self, minify: bool = False, remove_css_variables = False):
+    def makeWheelOnlyTemplate(self, minify: bool = False, remove_css_variables=False):
         """
         Render the wheel-only chart SVG as a string.
 
@@ -886,7 +1678,12 @@ class KerykeionChartSVG:
             str: SVG markup for the chart wheel only.
         """
 
-        with open(Path(__file__).parent / "templates" / "wheel_only.xml", "r", encoding="utf-8", errors="ignore") as f:
+        with open(
+            Path(__file__).parent / "templates" / "wheel_only.xml",
+            "r",
+            encoding="utf-8",
+            errors="ignore",
+        ) as f:
             template = f.read()
 
         template_dict = self._create_template_dictionary()
@@ -896,14 +1693,14 @@ class KerykeionChartSVG:
             template = inline_css_variables_in_svg(template)
 
         if minify:
-            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t","").replace("    ", "").replace("  ", "")
+            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t", "").replace("    ", "").replace("  ", "")
 
         else:
             template = template.replace('"', "'")
 
         return template
 
-    def makeWheelOnlySVG(self, minify: bool = False, remove_css_variables = False):
+    def makeWheelOnlySVG(self, minify: bool = False, remove_css_variables=False):
         """
         Generate and save wheel-only chart SVG to disk.
 
@@ -919,14 +1716,14 @@ class KerykeionChartSVG:
         """
 
         template = self.makeWheelOnlyTemplate(minify, remove_css_variables)
-        chartname = self.output_directory / f"{self.user.name} - {self.chart_type} Chart - Wheel Only.svg"
+        chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart - Wheel Only.svg"
 
         with open(chartname, "w", encoding="utf-8", errors="ignore") as output_file:
             output_file.write(template)
 
         print(f"SVG Generated Correctly in: {chartname}")
 
-    def makeAspectGridOnlyTemplate(self, minify: bool = False, remove_css_variables = False):
+    def makeAspectGridOnlyTemplate(self, minify: bool = False, remove_css_variables=False):
         """
         Render the aspect-grid-only chart SVG as a string.
 
@@ -941,15 +1738,30 @@ class KerykeionChartSVG:
             str: SVG markup for the aspect grid only.
         """
 
-        with open(Path(__file__).parent / "templates" / "aspect_grid_only.xml", "r", encoding="utf-8", errors="ignore") as f:
+        with open(
+            Path(__file__).parent / "templates" / "aspect_grid_only.xml",
+            "r",
+            encoding="utf-8",
+            errors="ignore",
+        ) as f:
             template = f.read()
 
         template_dict = self._create_template_dictionary()
 
-        if self.chart_type in ["Transit", "Synastry"]:
-            aspects_grid = draw_transit_aspect_grid(self.chart_colors_settings['paper_0'], self.available_planets_setting, self.aspects_list)
+        if self.chart_type in ["Transit", "Synastry", "Return"]:
+            aspects_grid = draw_transit_aspect_grid(
+                self.chart_colors_settings["paper_0"],
+                self.available_planets_setting,
+                self.aspects_list,
+            )
         else:
-            aspects_grid = draw_aspect_grid(self.chart_colors_settings['paper_0'], self.available_planets_setting, self.aspects_list, x_start=50, y_start=250)
+            aspects_grid = draw_aspect_grid(
+                self.chart_colors_settings["paper_0"],
+                self.available_planets_setting,
+                self.aspects_list,
+                x_start=50,
+                y_start=250,
+            )
 
         template = Template(template).substitute({**template_dict, "makeAspectGrid": aspects_grid})
 
@@ -957,14 +1769,14 @@ class KerykeionChartSVG:
             template = inline_css_variables_in_svg(template)
 
         if minify:
-            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t","").replace("    ", "").replace("  ", "")
+            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t", "").replace("    ", "").replace("  ", "")
 
         else:
             template = template.replace('"', "'")
 
         return template
 
-    def makeAspectGridOnlySVG(self, minify: bool = False, remove_css_variables = False):
+    def makeAspectGridOnlySVG(self, minify: bool = False, remove_css_variables=False):
         """
         Generate and save aspect-grid-only chart SVG to disk.
 
@@ -980,240 +1792,125 @@ class KerykeionChartSVG:
         """
 
         template = self.makeAspectGridOnlyTemplate(minify, remove_css_variables)
-        chartname = self.output_directory / f"{self.user.name} - {self.chart_type} Chart - Aspect Grid Only.svg"
+        chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart - Aspect Grid Only.svg"
 
         with open(chartname, "w", encoding="utf-8", errors="ignore") as output_file:
             output_file.write(template)
 
         print(f"SVG Generated Correctly in: {chartname}")
 
+
 if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
-    from kerykeion.composite_subject_factory import CompositeSubjectFactory
-    setup_logging(level="debug")
-
-    first = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    second = AstrologicalSubject("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")
-
-    # Internal Natal Chart
-    internal_natal_chart = KerykeionChartSVG(first)
-    internal_natal_chart.makeSVG()
-
-    # External Natal Chart
-    external_natal_chart = KerykeionChartSVG(first, "ExternalNatal", second)
-    external_natal_chart.makeSVG()
-
-    # Synastry Chart
-    synastry_chart = KerykeionChartSVG(first, "Synastry", second)
-    synastry_chart.makeSVG()
-
-    # Transits Chart
-    transits_chart = KerykeionChartSVG(first, "Transit", second)
-    transits_chart.makeSVG()
-
-    # Sidereal Birth Chart (Lahiri)
-    sidereal_subject = AstrologicalSubject("John Lennon Lahiri", 1940, 10, 9, 18, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="LAHIRI")
-    sidereal_chart = KerykeionChartSVG(sidereal_subject)
-    sidereal_chart.makeSVG()
-
-    # Sidereal Birth Chart (Fagan-Bradley)
-    sidereal_subject = AstrologicalSubject("John Lennon Fagan-Bradley", 1940, 10, 9, 18, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="FAGAN_BRADLEY")
-    sidereal_chart = KerykeionChartSVG(sidereal_subject)
-    sidereal_chart.makeSVG()
-
-    # Sidereal Birth Chart (DeLuce)
-    sidereal_subject = AstrologicalSubject("John Lennon DeLuce", 1940, 10, 9, 18, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="DELUCE")
-    sidereal_chart = KerykeionChartSVG(sidereal_subject)
-    sidereal_chart.makeSVG()
-
-    # Sidereal Birth Chart (J2000)
-    sidereal_subject = AstrologicalSubject("John Lennon J2000", 1940, 10, 9, 18, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="J2000")
-    sidereal_chart = KerykeionChartSVG(sidereal_subject)
-    sidereal_chart.makeSVG()
-
-    # House System Morinus
-    morinus_house_subject = AstrologicalSubject("John Lennon - House System Morinus", 1940, 10, 9, 18, 30, "Liverpool", "GB", houses_system_identifier="M")
-    morinus_house_chart = KerykeionChartSVG(morinus_house_subject)
-    morinus_house_chart.makeSVG()
-
-    ## To check all the available house systems uncomment the following code:
-    # from kerykeion.kr_types import HousesSystemIdentifier
-    # from typing import get_args
-    # for i in get_args(HousesSystemIdentifier):
-    #     alternatives_house_subject = AstrologicalSubject(f"John Lennon - House System {i}", 1940, 10, 9, 18, 30, "Liverpool", "GB", houses_system=i)
-    #     alternatives_house_chart = KerykeionChartSVG(alternatives_house_subject)
-    #     alternatives_house_chart.makeSVG()
-
-    # With True Geocentric Perspective
-    true_geocentric_subject = AstrologicalSubject("John Lennon - True Geocentric", 1940, 10, 9, 18, 30, "Liverpool", "GB", perspective_type="True Geocentric")
-    true_geocentric_chart = KerykeionChartSVG(true_geocentric_subject)
-    true_geocentric_chart.makeSVG()
-
-    # With Heliocentric Perspective
-    heliocentric_subject = AstrologicalSubject("John Lennon - Heliocentric", 1940, 10, 9, 18, 30, "Liverpool", "GB", perspective_type="Heliocentric")
-    heliocentric_chart = KerykeionChartSVG(heliocentric_subject)
-    heliocentric_chart.makeSVG()
-
-    # With Topocentric Perspective
-    topocentric_subject = AstrologicalSubject("John Lennon - Topocentric", 1940, 10, 9, 18, 30, "Liverpool", "GB", perspective_type="Topocentric")
-    topocentric_chart = KerykeionChartSVG(topocentric_subject)
-    topocentric_chart.makeSVG()
-
-    # Minified SVG
-    minified_subject = AstrologicalSubject("John Lennon - Minified", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    minified_chart = KerykeionChartSVG(minified_subject)
-    minified_chart.makeSVG(minify=True)
-
-    # Dark Theme Natal Chart
-    dark_theme_subject = AstrologicalSubject("John Lennon - Dark Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    dark_theme_natal_chart = KerykeionChartSVG(dark_theme_subject, theme="dark")
-    dark_theme_natal_chart.makeSVG()
-
-    # Dark High Contrast Theme Natal Chart
-    dark_high_contrast_theme_subject = AstrologicalSubject("John Lennon - Dark High Contrast Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    dark_high_contrast_theme_natal_chart = KerykeionChartSVG(dark_high_contrast_theme_subject, theme="dark-high-contrast")
-    dark_high_contrast_theme_natal_chart.makeSVG()
-
-    # Light Theme Natal Chart
-    light_theme_subject = AstrologicalSubject("John Lennon - Light Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    light_theme_natal_chart = KerykeionChartSVG(light_theme_subject, theme="light")
-    light_theme_natal_chart.makeSVG()
-
-    # Dark Theme External Natal Chart
-    dark_theme_external_subject = AstrologicalSubject("John Lennon - Dark Theme External", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    dark_theme_external_chart = KerykeionChartSVG(dark_theme_external_subject, "ExternalNatal", second, theme="dark")
-    dark_theme_external_chart.makeSVG()
-
-    # Dark Theme Synastry Chart
-    dark_theme_synastry_subject = AstrologicalSubject("John Lennon - DTS", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    dark_theme_synastry_chart = KerykeionChartSVG(dark_theme_synastry_subject, "Synastry", second, theme="dark")
-    dark_theme_synastry_chart.makeSVG()
-
-    # Wheel Natal Only Chart
-    wheel_only_subject = AstrologicalSubject("John Lennon - Wheel Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    wheel_only_chart = KerykeionChartSVG(wheel_only_subject)
-    wheel_only_chart.makeWheelOnlySVG()
-
-    # Wheel External Natal Only Chart
-    wheel_external_subject = AstrologicalSubject("John Lennon - Wheel External Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    wheel_external_chart = KerykeionChartSVG(wheel_external_subject, "ExternalNatal", second)
-    wheel_external_chart.makeWheelOnlySVG()
-
-    # Wheel Synastry Only Chart
-    wheel_synastry_subject = AstrologicalSubject("John Lennon - Wheel Synastry Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    wheel_synastry_chart = KerykeionChartSVG(wheel_synastry_subject, "Synastry", second)
-    wheel_synastry_chart.makeWheelOnlySVG()
-
-    # Wheel Transit Only Chart
-    wheel_transit_subject = AstrologicalSubject("John Lennon - Wheel Transit Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    wheel_transit_chart = KerykeionChartSVG(wheel_transit_subject, "Transit", second)
-    wheel_transit_chart.makeWheelOnlySVG()
-
-    # Wheel Sidereal Birth Chart (Lahiri) Dark Theme
-    sidereal_dark_subject = AstrologicalSubject("John Lennon Lahiri - Dark Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="LAHIRI")
-    sidereal_dark_chart = KerykeionChartSVG(sidereal_dark_subject, theme="dark")
-    sidereal_dark_chart.makeWheelOnlySVG()
-
-    # Wheel Sidereal Birth Chart (Fagan-Bradley) Light Theme
-    sidereal_light_subject = AstrologicalSubject("John Lennon Fagan-Bradley - Light Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="FAGAN_BRADLEY")
-    sidereal_light_chart = KerykeionChartSVG(sidereal_light_subject, theme="light")
-    sidereal_light_chart.makeWheelOnlySVG()
-
-    # Aspect Grid Only Natal Chart
-    aspect_grid_only_subject = AstrologicalSubject("John Lennon - Aspect Grid Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    aspect_grid_only_chart = KerykeionChartSVG(aspect_grid_only_subject)
-    aspect_grid_only_chart.makeAspectGridOnlySVG()
-
-    # Aspect Grid Only Dark Theme Natal Chart
-    aspect_grid_dark_subject = AstrologicalSubject("John Lennon - Aspect Grid Dark Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    aspect_grid_dark_chart = KerykeionChartSVG(aspect_grid_dark_subject, theme="dark")
-    aspect_grid_dark_chart.makeAspectGridOnlySVG()
-
-    # Aspect Grid Only Light Theme Natal Chart
-    aspect_grid_light_subject = AstrologicalSubject("John Lennon - Aspect Grid Light Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    aspect_grid_light_chart = KerykeionChartSVG(aspect_grid_light_subject, theme="light")
-    aspect_grid_light_chart.makeAspectGridOnlySVG()
-
-    # Synastry Chart Aspect Grid Only
-    aspect_grid_synastry_subject = AstrologicalSubject("John Lennon - Aspect Grid Synastry", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    aspect_grid_synastry_chart = KerykeionChartSVG(aspect_grid_synastry_subject, "Synastry", second)
-    aspect_grid_synastry_chart.makeAspectGridOnlySVG()
-
-    # Transit Chart Aspect Grid Only
-    aspect_grid_transit_subject = AstrologicalSubject("John Lennon - Aspect Grid Transit", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    aspect_grid_transit_chart = KerykeionChartSVG(aspect_grid_transit_subject, "Transit", second)
-    aspect_grid_transit_chart.makeAspectGridOnlySVG()
-
-    # Synastry Chart Aspect Grid Only Dark Theme
-    aspect_grid_dark_synastry_subject = AstrologicalSubject("John Lennon - Aspect Grid Dark Synastry", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    aspect_grid_dark_synastry_chart = KerykeionChartSVG(aspect_grid_dark_synastry_subject, "Synastry", second, theme="dark")
-    aspect_grid_dark_synastry_chart.makeAspectGridOnlySVG()
-
-    # Synastry Chart With draw_transit_aspect_list table
-    synastry_chart_with_table_list_subject = AstrologicalSubject("John Lennon - SCTWL", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    synastry_chart_with_table_list = KerykeionChartSVG(synastry_chart_with_table_list_subject, "Synastry", second, double_chart_aspect_grid_type="list", theme="dark")
-    synastry_chart_with_table_list.makeSVG()
-
-    # Transit Chart With draw_transit_aspect_grid table
-    transit_chart_with_table_grid_subject = AstrologicalSubject("John Lennon - TCWTG", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    transit_chart_with_table_grid = KerykeionChartSVG(transit_chart_with_table_grid_subject, "Transit", second, double_chart_aspect_grid_type="table", theme="dark")
-    transit_chart_with_table_grid.makeSVG()
-
-    # Chines Language Chart
-    chinese_subject = AstrologicalSubject("Hua Chenyu", 1990, 2, 7, 12, 0, "Hunan", "CN")
-    chinese_chart = KerykeionChartSVG(chinese_subject, chart_language="CN")
-    chinese_chart.makeSVG()
-
-    # French Language Chart
-    french_subject = AstrologicalSubject("Jeanne Moreau", 1928, 1, 23, 10, 0, "Paris", "FR")
-    french_chart = KerykeionChartSVG(french_subject, chart_language="FR")
-    french_chart.makeSVG()
-
-    # Spanish Language Chart
-    spanish_subject = AstrologicalSubject("Antonio Banderas", 1960, 8, 10, 12, 0, "Malaga", "ES")
-    spanish_chart = KerykeionChartSVG(spanish_subject, chart_language="ES")
-    spanish_chart.makeSVG()
-
-    # Portuguese Language Chart
-    portuguese_subject = AstrologicalSubject("Cristiano Ronaldo", 1985, 2, 5, 5, 25, "Funchal", "PT")
-    portuguese_chart = KerykeionChartSVG(portuguese_subject, chart_language="PT")
-    portuguese_chart.makeSVG()
-
-    # Italian Language Chart
-    italian_subject = AstrologicalSubject("Sophia Loren", 1934, 9, 20, 2, 0, "Rome", "IT")
-    italian_chart = KerykeionChartSVG(italian_subject, chart_language="IT")
-    italian_chart.makeSVG()
-
-    # Russian Language Chart
-    russian_subject = AstrologicalSubject("Mikhail Bulgakov", 1891, 5, 15, 12, 0, "Kiev", "UA")
-    russian_chart = KerykeionChartSVG(russian_subject, chart_language="RU")
-    russian_chart.makeSVG()
-
-    # Turkish Language Chart
-    turkish_subject = AstrologicalSubject("Mehmet Oz", 1960, 6, 11, 12, 0, "Istanbul", "TR")
-    turkish_chart = KerykeionChartSVG(turkish_subject, chart_language="TR")
-    turkish_chart.makeSVG()
-
-    # German Language Chart
-    german_subject = AstrologicalSubject("Albert Einstein", 1879, 3, 14, 11, 30, "Ulm", "DE")
-    german_chart = KerykeionChartSVG(german_subject, chart_language="DE")
-    german_chart.makeSVG()
-
-    # Hindi Language Chart
-    hindi_subject = AstrologicalSubject("Amitabh Bachchan", 1942, 10, 11, 4, 0, "Allahabad", "IN")
-    hindi_chart = KerykeionChartSVG(hindi_subject, chart_language="HI")
-    hindi_chart.makeSVG()
-
-    # Kanye West Natal Chart
-    kanye_west_subject = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta", "US")
-    kanye_west_chart = KerykeionChartSVG(kanye_west_subject)
-    kanye_west_chart.makeSVG()
-
-    # Composite Chart
-    angelina = AstrologicalSubject("Angelina Jolie", 1975, 6, 4, 9, 9, "Los Angeles", "US", lng=-118.15, lat=34.03, tz_str="America/Los_Angeles")
-    brad = AstrologicalSubject("Brad Pitt", 1963, 12, 18, 6, 31, "Shawnee", "US", lng=-96.56, lat=35.20, tz_str="America/Chicago")
-
-    composite_subject_factory = CompositeSubjectFactory(angelina, brad)
-    composite_subject_model = composite_subject_factory.get_midpoint_composite_subject_model()
-    composite_chart = KerykeionChartSVG(composite_subject_model, "Composite")
-    composite_chart.makeSVG()
+    from kerykeion.planetary_return_factory import PlanetaryReturnFactory
+    from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
+
+    setup_logging(level="info")
+
+    subject = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+
+    return_factory = PlanetaryReturnFactory(
+        subject,
+        city="Los Angeles",
+        nation="US",
+        lng=-118.2437,
+        lat=34.0522,
+        tz_str="America/Los_Angeles",
+        altitude=0,
+    )
+
+    ###
+    ## Birth Chart
+    birth_chart = KerykeionChartSVG(
+        first_obj=subject,
+        chart_language="IT",
+        theme="strawberry",
+    )
+    birth_chart.makeSVG() # minify=True, remove_css_variables=True)
+
+    ###
+    ## Solar Return Chart
+    solar_return = return_factory.next_return_from_iso_formatted_time(
+        "2025-01-09T18:30:00+01:00",  # UTC+1
+        return_type="Solar",
+    )
+    solar_return_chart = KerykeionChartSVG(
+        first_obj=subject, chart_type="Return",
+        second_obj=solar_return,
+        chart_language="IT",
+        theme="classic",
+        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Ascendant"],
+    )
+
+    solar_return_chart.makeSVG() # minify=True, remove_css_variables=True)
+
+    ###
+    ## Single wheel return
+    single_wheel_return_chart = KerykeionChartSVG(
+        first_obj=solar_return,
+        chart_type="SingleWheelReturn",
+        second_obj=solar_return,
+        chart_language="IT",
+        theme="dark",
+        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"],
+    )
+
+    single_wheel_return_chart.makeSVG() # minify=True, remove_css_variables=True)
+
+    ###
+    ## Lunar return
+    lunar_return = return_factory.next_return_from_iso_formatted_time(
+        "2025-01-09T18:30:00+01:00",  # UTC+1
+        return_type="Lunar",
+    )
+    lunar_return_chart = KerykeionChartSVG(
+        first_obj=subject,
+        chart_type="Return",
+        second_obj=lunar_return,
+        chart_language="IT",
+        theme="dark",
+        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"],
+    )
+    lunar_return_chart.makeSVG() # minify=True, remove_css_variables=True)
+
+    ###
+    ## Transit Chart
+    transit = AstrologicalSubjectFactory.from_current_time()
+    transit_chart = KerykeionChartSVG(
+        first_obj=subject,
+        chart_type="Transit",
+        second_obj=transit,
+        chart_language="IT",
+        theme="dark",
+        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Ascendant"]
+    )
+    transit_chart.makeSVG() # minify=True, remove_css_variables=True)
+
+    ###
+    ## Synastry Chart
+    second_subject = AstrologicalSubjectFactory.from_birth_data("Yoko Ono", 1933, 2, 18, 18, 30, "Tokyo", "JP")
+    synastry_chart = KerykeionChartSVG(
+        first_obj=subject,
+        chart_type="Synastry",
+        second_obj=second_subject,
+        chart_language="IT",
+        theme="dark",
+        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"],
+    )
+    synastry_chart.makeSVG() # minify=True, remove_css_variables=True)
+
+    ##
+    # Transit Chart with Grid
+    subject.name = "Grid"
+    transit_chart_with_grid = KerykeionChartSVG(
+        first_obj=subject,
+        chart_type="Transit",
+        second_obj=transit,
+        chart_language="IT",
+        theme="dark",
+        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Ascendant"],
+        double_chart_aspect_grid_type="table"
+    )
+    transit_chart_with_grid.makeSVG() # minify=True, remove_css_variables=True)
+    transit_chart_with_grid.makeAspectGridOnlySVG()
+    transit_chart_with_grid.makeWheelOnlySVG()