kerykeion 5.0.0a12__py3-none-any.whl → 5.0.0b2__py3-none-any.whl

kerykeion/charts/{kerykeion_chart_svg.py → chart_drawer.py}

@@ -6,33 +6,34 @@
 
 import logging
 import swisseph as swe
-from typing import get_args, Union, Optional
+from typing import get_args, Union, Any
 
+
+from kerykeion.schemas.kr_models import ChartDataModel
+from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
 from kerykeion.settings.kerykeion_settings import get_settings
-from kerykeion.aspects import AspectsFactory
 from kerykeion.house_comparison.house_comparison_factory import HouseComparisonFactory
-from kerykeion.kr_types import (
+from kerykeion.schemas import (
     KerykeionException,
     ChartType,
     Sign,
     ActiveAspect,
 )
-from kerykeion.kr_types import ChartTemplateDictionary
-from kerykeion.kr_types.kr_models import (
+from kerykeion.schemas import ChartTemplateModel
+from kerykeion.schemas.kr_models import (
     AstrologicalSubjectModel,
     CompositeSubjectModel,
     PlanetReturnModel,
 )
-from kerykeion.kr_types.settings_models import (
+from kerykeion.schemas.settings_models import (
     KerykeionSettingsCelestialPointModel,
     KerykeionSettingsModel,
 )
-from kerykeion.kr_types.kr_literals import (
+from kerykeion.schemas.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,
@@ -57,15 +58,10 @@ from kerykeion.charts.charts_utils import (
     draw_main_planet_grid,
     draw_secondary_planet_grid,
     format_location_string,
-    format_datetime_with_timezone,
-    calculate_element_points,
-    calculate_synastry_element_points,
-    calculate_quality_points,
-    calculate_synastry_quality_points
+    format_datetime_with_timezone
 )
 from kerykeion.charts.draw_planets import draw_planets
-from kerykeion.utilities import get_houses_list, inline_css_variables_in_svg
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_ASPECTS
+from kerykeion.utilities import get_houses_list, inline_css_variables_in_svg, distribute_percentages_to_100
 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
@@ -76,30 +72,32 @@ from typing import List, Literal
 from datetime import datetime
 
 
-class KerykeionChartSVG:
+class ChartDrawer:
     """
-    KerykeionChartSVG generates astrological chart visualizations as SVG files.
+    ChartDrawer generates astrological chart visualizations as SVG files from pre-computed chart data.
+
+    This class is designed for pure visualization and requires chart data to be pre-computed using
+    ChartDataFactory. This separation ensures clean architecture where ChartDataFactory handles
+    all calculations (aspects, element/quality distributions, subjects) while ChartDrawer focuses
+    solely on rendering SVG visualizations.
 
-    This class supports creating full chart SVGs, wheel-only SVGs, and aspect-grid-only SVGs
-    for various chart types including Natal, ExternalNatal, Transit, Synastry, and Composite.
+    ChartDrawer supports creating full chart SVGs, wheel-only SVGs, and aspect-grid-only SVGs
+    for various chart types including Natal, Transit, Synastry, and Composite.
     Charts are rendered using XML templates and drawing utilities, with customizable themes,
-    language, active points, and aspects.
-    The rendered SVGs can be saved to a specified output directory or, by default, to the user's home directory.
+    language, and visual settings.
+
+    The generated SVG files are optimized for web use and can be saved to any specified
+    destination path using the save_svg method.
 
     NOTE:
         The generated SVG files are optimized for web use, opening in browsers. If you want to
         use them in other applications, you might need to adjust the SVG settings or styles.
 
     Args:
-        first_obj (AstrologicalSubject | AstrologicalSubjectModel | CompositeSubjectModel):
-            The primary astrological subject for the chart.
-        chart_type (ChartType, optional):
-            The type of chart to generate ('Natal', 'ExternalNatal', 'Transit', 'Synastry', 'Composite').
-            Defaults to 'Natal'.
-        second_obj (AstrologicalSubject | AstrologicalSubjectModel, optional):
-            The secondary subject for Transit or Synastry charts. Not required for Natal or Composite.
-        new_output_directory (str | Path, optional):
-            Directory to write generated SVG files. Defaults to the user's home directory.
+        chart_data (ChartDataModel):
+            Pre-computed chart data from ChartDataFactory containing all subjects, aspects,
+            element/quality distributions, and other analytical data. This is the ONLY source
+            of chart information - no calculations are performed by ChartDrawer.
         new_settings_file (Path | dict | KerykeionSettingsModel, optional):
             Path or settings object to override default chart configuration (colors, fonts, aspects).
         theme (KerykeionChartTheme, optional):
@@ -108,55 +106,75 @@ 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[AstrologicalPoint], optional):
-            List of celestial points and angles to include. Defaults to DEFAULT_ACTIVE_POINTS.
-            Example:
-            ["Sun", "Moon", "Mercury", "Venus"]
-
-        active_aspects (list[ActiveAspect], optional):
-            List of aspects (name and orb) to calculate. Defaults to DEFAULT_ACTIVE_ASPECTS.
-            Example:
-            [
-                {"name": "conjunction", "orb": 10},
-                {"name": "opposition", "orb": 10},
-                {"name": "trine", "orb": 8},
-                {"name": "sextile", "orb": 6},
-                {"name": "square", "orb": 5},
-                {"name": "quintile", "orb": 1},
-            ]
+        transparent_background (bool, optional):
+            Whether to use a transparent background instead of the theme color. Defaults to False.
 
     Public Methods:
         makeTemplate(minify=False, remove_css_variables=False) -> str:
             Render the full chart SVG as a string without writing to disk. Use `minify=True`
             to remove whitespace and quotes, and `remove_css_variables=True` to embed CSS vars.
 
-        makeSVG(minify=False, remove_css_variables=False) -> None:
-            Generate and write the full chart SVG file to the output directory.
-            Filenames follow the pattern:
-            '{subject.name} - {chart_type} Chart.svg'.
+        save_svg(output_path=None, filename=None, minify=False, remove_css_variables=False) -> None:
+            Generate and write the full chart SVG file to the specified path.
+            If output_path is None, saves to the user's home directory.
+            If filename is None, uses default pattern: '{subject.name} - {chart_type} Chart.svg'.
 
         makeWheelOnlyTemplate(minify=False, remove_css_variables=False) -> str:
             Render only the chart wheel (no aspect grid) as an SVG string.
 
-        makeWheelOnlySVG(minify=False, remove_css_variables=False) -> None:
-            Generate and write the wheel-only SVG file:
-            '{subject.name} - {chart_type} Chart - Wheel Only.svg'.
+        save_wheel_only_svg_file(output_path=None, filename=None, minify=False, remove_css_variables=False) -> None:
+            Generate and write the wheel-only SVG file to the specified path.
+            If output_path is None, saves to the user's home directory.
+            If filename is None, uses default pattern: '{subject.name} - {chart_type} Chart - Wheel Only.svg'.
 
         makeAspectGridOnlyTemplate(minify=False, remove_css_variables=False) -> str:
             Render only the aspect grid as an SVG string.
 
-        makeAspectGridOnlySVG(minify=False, remove_css_variables=False) -> None:
-            Generate and write the aspect-grid-only SVG file:
-            '{subject.name} - {chart_type} Chart - Aspect Grid Only.svg'.
+        save_aspect_grid_only_svg_file(output_path=None, filename=None, minify=False, remove_css_variables=False) -> None:
+            Generate and write the aspect-grid-only SVG file to the specified path.
+            If output_path is None, saves to the user's home directory.
+            If filename is None, uses default pattern: '{subject.name} - {chart_type} Chart - Aspect Grid Only.svg'.
+
+    Example:
+        >>> from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
+        >>> from kerykeion.chart_data_factory import ChartDataFactory
+        >>> from kerykeion.charts.chart_drawer import ChartDrawer
+        >>>
+        >>> # Step 1: Create subject
+        >>> subject = AstrologicalSubjectFactory.from_birth_data("John", 1990, 1, 1, 12, 0, "London", "GB")
+        >>>
+        >>> # Step 2: Pre-compute chart data
+        >>> chart_data = ChartDataFactory.create_natal_chart_data(subject)
+        >>>
+        >>> # Step 3: Create visualization
+        >>> chart_drawer = ChartDrawer(chart_data=chart_data, theme="classic")
+        >>> chart_drawer.save_svg()  # Saves to home directory with default filename
+        >>> # Or specify custom path and filename:
+        >>> chart_drawer.save_svg("/path/to/output/directory", "my_custom_chart")
     """
 
     # Constants
 
     _DEFAULT_HEIGHT = 550
-    _DEFAULT_FULL_WIDTH = 1200
+    _DEFAULT_FULL_WIDTH = 1250
     _DEFAULT_NATAL_WIDTH = 870
-    _DEFAULT_FULL_WIDTH_WITH_TABLE = 1200
-    _DEFAULT_ULTRA_WIDE_WIDTH = 1270
+    _DEFAULT_FULL_WIDTH_WITH_TABLE = 1250
+    _DEFAULT_ULTRA_WIDE_WIDTH = 1320
+
+    _BASE_VERTICAL_OFFSETS = {
+        "wheel": 50,
+        "grid": 0,
+        "aspect_grid": 50,
+        "aspect_list": 50,
+        "title": 0,
+        "elements": 0,
+        "qualities": 0,
+        "lunar_phase": 518,
+        "bottom_left": 0,
+    }
+    _MAX_TOP_SHIFT = 80
+    _TOP_SHIFT_FACTOR = 2
+    _ROW_HEIGHT = 8
 
     _BASIC_CHART_VIEWBOX = f"0 0 {_DEFAULT_NATAL_WIDTH} {_DEFAULT_HEIGHT}"
     _WIDE_CHART_VIEWBOX = f"0 0 {_DEFAULT_FULL_WIDTH} 546.0"
@@ -167,9 +185,6 @@ class KerykeionChartSVG:
     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]
-    output_directory: Path
     new_settings_file: Union[Path, None, KerykeionSettingsModel, dict]
     theme: Union[KerykeionChartTheme, None]
     double_chart_aspect_grid_type: Literal["list", "table"]
@@ -177,6 +192,8 @@ class KerykeionChartSVG:
     active_points: List[AstrologicalPoint]
     active_aspects: List[ActiveAspect]
     transparent_background: bool
+    external_view: bool
+    custom_title: Union[str, None]
 
     # Internal properties
     fire: float
@@ -189,8 +206,8 @@ class KerykeionChartSVG:
     width: Union[float, int]
     language_settings: dict
     chart_colors_settings: dict
-    planets_settings: dict
-    aspects_settings: dict
+    planets_settings: list[dict[Any, Any]]
+    aspects_settings: list[dict[Any, Any]]
     available_planets_setting: List[KerykeionSettingsCelestialPointModel]
     height: float
     location: str
@@ -200,34 +217,28 @@ class KerykeionChartSVG:
 
     def __init__(
         self,
-        first_obj: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
-        chart_type: ChartType = "Natal",
-        second_obj: Union[AstrologicalSubjectModel, PlanetReturnModel, None] = None,
-        new_output_directory: Union[str, None] = None,
+        chart_data: "ChartDataModel",
+        *,
         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: Optional[list[AstrologicalPoint]] = None,
-        active_aspects: list[ActiveAspect]= DEFAULT_ACTIVE_ASPECTS,
-        *,
+        external_view: bool = False,
         transparent_background: bool = False,
         colors_settings: dict = DEFAULT_CHART_COLORS,
         celestial_points_settings: list[dict] = DEFAULT_CELESTIAL_POINTS_SETTINGS,
         aspects_settings: list[dict] = DEFAULT_CHART_ASPECTS_SETTINGS,
+        custom_title: Union[str, None] = None,
+        auto_size: bool = True,
+        padding: int = 20,
     ):
         """
-        Initialize the chart generator with subject data and configuration options.
+        Initialize the chart visualizer with pre-computed chart data.
 
         Args:
-            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, optional):
-                Secondary subject for Transit or Synastry charts.
-            new_output_directory (str or Path, optional):
-                Base directory to save generated SVG files.
+            chart_data (ChartDataModel):
+                Pre-computed chart data from ChartDataFactory containing all subjects,
+                aspects, element/quality distributions, and other analytical data.
             new_settings_file (Path, dict, or KerykeionSettingsModel, optional):
                 Custom settings source for chart colors, fonts, and aspects.
             theme (KerykeionChartTheme or None, optional):
@@ -236,99 +247,91 @@ 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[AstrologicalPoint], optional):
-                Celestial points to include in the chart visualization.
-            active_aspects (List[ActiveAspect], optional):
-                Aspects to calculate, each defined by name and orb.
+            external_view (bool, optional):
+                Whether to use external visualization (planets on outer ring) for single-subject charts. Defaults to False.
             transparent_background (bool, optional):
                 Whether to use a transparent background instead of the theme color. Defaults to False.
+            custom_title (str or None, optional):
+                Custom title for the chart. If None, the default title will be used based on chart type. Defaults to None.
         """
         # --------------------
         # COMMON INITIALIZATION
         # --------------------
-        home_directory = Path.home()
         self.new_settings_file = new_settings_file
         self.chart_language = chart_language
-        self.active_aspects = active_aspects
-        self.chart_type = chart_type
         self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
         self.transparent_background = transparent_background
+        self.external_view = external_view
         self.chart_colors_settings = colors_settings
         self.planets_settings = celestial_points_settings
         self.aspects_settings = aspects_settings
-
-        if not active_points:
-            self.active_points = first_obj.active_points
-        else:
-            self.active_points = find_common_active_points(
-                active_points,
-                first_obj.active_points
-            )
-
-        if second_obj:
-            self.active_points = find_common_active_points(
-                self.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
+        self.custom_title = custom_title
+        self.auto_size = auto_size
+        self._padding = padding
+        self._vertical_offsets: dict[str, int] = self._BASE_VERTICAL_OFFSETS.copy()
+
+        # Extract data from ChartDataModel
+        self.chart_data = chart_data
+        self.chart_type = chart_data.chart_type
+        self.active_points = chart_data.active_points
+        self.active_aspects = chart_data.active_aspects
+
+        # Extract subjects based on chart type
+        if chart_data.chart_type in ["Natal", "Composite", "SingleReturnChart"]:
+            # SingleChartDataModel
+            self.first_obj = getattr(chart_data, 'subject')
+            self.second_obj = None
+
+        else:  # DualChartDataModel for Transit, Synastry, DualReturnChart
+            self.first_obj = getattr(chart_data, 'first_subject')
+            self.second_obj = getattr(chart_data, 'second_subject')
 
         # Load settings
         self.parse_json_settings(new_settings_file)
 
-        # Primary subject
-        self.first_obj = first_obj
-
         # Default radius for all charts
         self.main_radius = 240
 
-        # Configure available planets
+        # Configure available planets from chart data
         self.available_planets_setting = []
         for body in self.planets_settings:
             if body["name"] in self.active_points:
                 body["is_active"] = True
-                self.available_planets_setting.append(body)
+                self.available_planets_setting.append(body)  # type: ignore[arg-type]
+
+        active_points_count = len(self.available_planets_setting)
+        if active_points_count > 24:
+            logging.warning(
+                "ChartDrawer detected %s active celestial points; rendering may look crowded beyond 24.",
+                active_points_count,
+            )
 
         # 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))
+            if hasattr(self.first_obj, body):
+                self.available_kerykeion_celestial_points.append(self.first_obj.get(body))  # type: ignore[arg-type]
 
         # ------------------------
-        # CHART TYPE SPECIFIC SETUP
+        # CHART TYPE SPECIFIC SETUP FROM CHART DATA
         # ------------------------
 
-        if self.chart_type in ["Natal", "ExternalNatal"]:
-            # --- NATAL / EXTERNAL NATAL CHART SETUP ---
-
-            # Validate Subject
-            if not isinstance(self.first_obj, AstrologicalSubjectModel):
-                raise KerykeionException("First object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
+        if self.chart_type == "Natal":
+            # --- NATAL CHART SETUP ---
 
-            # Calculate aspects
-            aspects_instance = AspectsFactory.single_chart_aspects(
-                self.first_obj,
-                active_points=self.active_points,
-                active_aspects=active_aspects,
-            )
-            self.aspects_list = aspects_instance.relevant_aspects
+            # Extract aspects from pre-computed chart data
+            self.aspects_list = chart_data.aspects.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
+            # Get location and coordinates
+            self.location, self.geolat, self.geolon = self._get_location_info()
 
-            # Circle radii
-            if self.chart_type == "ExternalNatal":
+            # Circle radii - depends on external_view
+            if self.external_view:
                 self.first_circle_radius = 56
                 self.second_circle_radius = 92
                 self.third_circle_radius = 112
@@ -340,21 +343,15 @@ class KerykeionChartSVG:
         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 = AspectsFactory.single_chart_aspects(self.first_obj, active_points=self.active_points).relevant_aspects
+            # Extract aspects from pre-computed chart data
+            self.aspects_list = chart_data.aspects.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
+            # Get location and coordinates
+            self.location, self.geolat, self.geolon = self._get_location_info()
 
             # Circle radii
             self.first_circle_radius = 0
@@ -364,25 +361,8 @@ class KerykeionChartSVG:
         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 = AspectsFactory.dual_chart_aspects(
-                self.first_obj,
-                self.second_obj,
-                active_points=self.active_points,
-                active_aspects=active_aspects,
-            )
-            self.aspects_list = synastry_aspects_instance.relevant_aspects
+            # Extract aspects from pre-computed chart data
+            self.aspects_list = chart_data.aspects.relevant_aspects
 
             # Secondary subject available points
             self.t_available_kerykeion_celestial_points = self.available_kerykeion_celestial_points
@@ -394,11 +374,8 @@ class KerykeionChartSVG:
             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"]
+            # Get location and coordinates
+            self.location, self.geolat, self.geolon = self._get_location_info()
 
             # Circle radii
             self.first_circle_radius = 0
@@ -408,25 +385,8 @@ class KerykeionChartSVG:
         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 = AspectsFactory.dual_chart_aspects(
-                self.first_obj,
-                self.second_obj,
-                active_points=self.active_points,
-                active_aspects=active_aspects,
-            )
-            self.aspects_list = synastry_aspects_instance.relevant_aspects
+            # Extract aspects from pre-computed chart data
+            self.aspects_list = chart_data.aspects.relevant_aspects
 
             # Secondary subject available points
             self.t_available_kerykeion_celestial_points = self.available_kerykeion_celestial_points
@@ -435,38 +395,19 @@ class KerykeionChartSVG:
             self.height = self._DEFAULT_HEIGHT
             self.width = self._DEFAULT_FULL_WIDTH
 
-            # Location and coordinates (from primary subject)
-            self.location = self.first_obj.city
-            self.geolat = self.first_obj.lat
-            self.geolon = self.first_obj.lng
+            # Get location and coordinates
+            self.location, self.geolat, self.geolon = self._get_location_info()
 
             # Circle radii
             self.first_circle_radius = 0
             self.second_circle_radius = 36
             self.third_circle_radius = 120
 
-        elif self.chart_type == "Return":
+        elif self.chart_type == "DualReturnChart":
             # --- RETURN CHART SETUP ---
 
-            # 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 = AspectsFactory.dual_chart_aspects(
-                self.first_obj,
-                self.second_obj,
-                active_points=self.active_points,
-                active_aspects=active_aspects,
-            )
-            self.aspects_list = synastry_aspects_instance.relevant_aspects
+            # Extract aspects from pre-computed chart data
+            self.aspects_list = chart_data.aspects.relevant_aspects
 
             # Secondary subject available points
             self.t_available_kerykeion_celestial_points = self.available_kerykeion_celestial_points
@@ -475,93 +416,45 @@ class KerykeionChartSVG:
             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
+            # Get location and coordinates
+            self.location, self.geolat, self.geolon = self._get_location_info()
 
             # 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 ---
+        elif self.chart_type == "SingleReturnChart":
+            # --- SINGLE WHEEL RETURN CHART SETUP ---
 
-            # Validate Subject
-            if not isinstance(self.first_obj, PlanetReturnModel):
-                raise KerykeionException("First object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
-
-            # Calculate aspects
-            aspects_instance = AspectsFactory.single_chart_aspects(
-                self.first_obj,
-                active_points=self.active_points,
-                active_aspects=active_aspects,
-            )
-            self.aspects_list = aspects_instance.relevant_aspects
+            # Extract aspects from pre-computed chart data
+            self.aspects_list = chart_data.aspects.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
+            # Get location and coordinates
+            self.location, self.geolat, self.geolon = self._get_location_info()
 
             # 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
+            self.first_circle_radius = 0
+            self.second_circle_radius = 36
+            self.third_circle_radius = 120
 
         # --------------------
-        # FINAL COMMON SETUP
+        # FINAL COMMON SETUP FROM CHART DATA
         # --------------------
 
-        # 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:
-            element_totals = calculate_element_points(
-                self.available_planets_setting,
-                celestial_points_names,
-                self.first_obj,
-            )
+        # Extract pre-computed element and quality distributions
+        self.fire = chart_data.element_distribution.fire
+        self.earth = chart_data.element_distribution.earth
+        self.air = chart_data.element_distribution.air
+        self.water = chart_data.element_distribution.water
 
-        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,
-            )
-
-        self.cardinal = qualities_totals["cardinal"]
-        self.fixed = qualities_totals["fixed"]
-        self.mutable = qualities_totals["mutable"]
+        self.cardinal = chart_data.quality_distribution.cardinal
+        self.fixed = chart_data.quality_distribution.fixed
+        self.mutable = chart_data.quality_distribution.mutable
 
         # Set up theme
         if theme not in get_args(KerykeionChartTheme) and theme is not None:
@@ -569,6 +462,215 @@ class KerykeionChartSVG:
 
         self.set_up_theme(theme)
 
+        # Optionally expand width dynamically to fit content
+        if self.auto_size:
+            try:
+                required_width = self._estimate_required_width_full()
+                if required_width > self.width:
+                    self.width = required_width
+            except Exception as e:
+                # Keep default on any unexpected issue; do not break rendering
+                logging.debug(f"Auto-size width calculation failed: {e}")
+
+        self._apply_dynamic_height_adjustment()
+
+    def _count_active_planets(self) -> int:
+        """Return number of active celestial points in the current chart."""
+        return len([p for p in self.available_planets_setting if p.get("is_active")])
+
+    def _apply_dynamic_height_adjustment(self) -> None:
+        """Adjust chart height and vertical offsets based on active points."""
+        active_points_count = self._count_active_planets()
+
+        offsets = self._BASE_VERTICAL_OFFSETS.copy()
+
+        minimum_height = self._DEFAULT_HEIGHT
+        if active_points_count <= 20:
+            self.height = max(self.height, minimum_height)
+            self._vertical_offsets = offsets
+            return
+
+        extra_points = active_points_count - 20
+        extra_height = extra_points * self._ROW_HEIGHT
+
+        self.height = max(self.height, minimum_height + extra_height)
+
+        delta_height = max(self.height - minimum_height, 0)
+
+        # Anchor wheel, aspect grid/list, and lunar phase to the bottom
+        offsets["wheel"] += delta_height
+        offsets["aspect_grid"] += delta_height
+        offsets["aspect_list"] += delta_height
+        offsets["lunar_phase"] += delta_height
+        offsets["bottom_left"] += delta_height
+
+        # Smooth top offsets to keep breathing room near the title and grids
+        shift = min(extra_points * self._TOP_SHIFT_FACTOR, self._MAX_TOP_SHIFT)
+        top_shift = shift // 2
+
+        offsets["grid"] += shift
+        offsets["title"] += top_shift
+        offsets["elements"] += top_shift
+        offsets["qualities"] += top_shift
+
+        self._vertical_offsets = offsets
+
+    def _dynamic_viewbox(self) -> str:
+        """Return the viewBox string based on current width/height."""
+        return f"0 0 {int(self.width)} {int(self.height)}"
+
+    def _wheel_only_viewbox(self, margin: int = 20) -> str:
+        """Return a tight viewBox for the wheel-only template.
+
+        The wheel is drawn inside a group translated by (100, 50) and has
+        diameter 2 * main_radius. We add a small margin around it.
+        """
+        left = 100 - margin
+        top = 50 - margin
+        width = (2 * self.main_radius) + (2 * margin)
+        height = (2 * self.main_radius) + (2 * margin)
+        return f"{left} {top} {width} {height}"
+
+    def _grid_only_viewbox(self, margin: int = 10) -> str:
+        """Compute a tight viewBox for the Aspect Grid Only SVG.
+
+        The grid is rendered using fixed origins and box size:
+        - For Transit/Synastry/DualReturn charts, `draw_transit_aspect_grid`
+          uses `x_indent=50`, `y_indent=250`, `box_size=14` and draws:
+            • a header row to the right of `x_indent`
+            • a left header column at `x_indent - box_size`
+            • an NxN grid of cells above `y_indent`
+
+        - For Natal/Composite/SingleReturn charts, `draw_aspect_grid` uses
+          `x_start=50`, `y_start=250`, `box_size=14` and draws a triangular grid
+          that extends to the right (x) and upwards (y).
+
+        This function mirrors that geometry to return a snug viewBox around the
+        content, with a small configurable `margin`.
+
+        Args:
+            margin: Extra pixels to add on each side of the computed bounds.
+
+        Returns:
+            A string "minX minY width height" suitable for the SVG `viewBox`.
+        """
+        # Must match defaults used in the renderers
+        x0 = 50
+        y0 = 250
+        box = 14
+
+        n = max(len([p for p in self.available_planets_setting if p.get("is_active")]), 1)
+
+        if self.chart_type in ("Transit", "Synastry", "DualReturnChart"):
+            # Full N×N grid
+            left = (x0 - box) - margin
+            top = (y0 - box * n) - margin
+            right = (x0 + box * n) + margin
+            bottom = (y0 + box) + margin
+        else:
+            # Triangular grid (no extra left column)
+            left = x0 - margin
+            top = (y0 - box * n) - margin
+            right = (x0 + box * n) + margin
+            bottom = (y0 + box) + margin
+
+        width = max(1, int(right - left))
+        height = max(1, int(bottom - top))
+
+        return f"{int(left)} {int(top)} {width} {height}"
+
+    def _estimate_required_width_full(self) -> int:
+        """Estimate minimal width to contain all rendered groups for the full chart.
+
+        The calculation is heuristic and mirrors the default x positions used in
+        the SVG templates and drawing utilities. We keep a conservative padding.
+        """
+        # Wheel footprint (translate(100,50) + diameter of 2*radius)
+        wheel_right = 100 + (2 * self.main_radius)
+        extents = [wheel_right]
+
+        n_active = max(self._count_active_planets(), 1)
+
+        # Common grids present on many chart types
+        main_planet_grid_right = 645 + 80
+        main_houses_grid_right = 750 + 120
+        extents.extend([main_planet_grid_right, main_houses_grid_right])
+
+        if self.chart_type in ("Natal", "Composite", "SingleReturnChart"):
+            # Triangular aspect grid at x_start=540, width ~ 14 * n_active
+            aspect_grid_right = 560 + 14 * n_active
+            extents.append(aspect_grid_right)
+
+        if self.chart_type in ("Transit", "Synastry", "DualReturnChart"):
+            # Double-chart aspects placement
+            if self.double_chart_aspect_grid_type == "list":
+                # Columnar list placed at translate(565,273), ~100-110px per column, 14 aspects per column
+                aspects_per_column = 14
+                total_aspects = len(self.aspects_list) if hasattr(self, "aspects_list") else 0
+                columns = max((total_aspects + aspects_per_column - 1) // aspects_per_column, 1)
+                # Respect the max columns cap used in rendering: DualReturn=7, others=6
+                max_cols_cap = 7
+                columns = min(columns, max_cols_cap)
+                aspect_list_right = 565 + (columns * 110)
+                extents.append(aspect_list_right)
+            else:
+                # Grid table placed with x_indent ~550, width ~ 14px per cell across n_active+1
+                aspect_grid_table_right = 550 + (14 * (n_active + 1))
+                extents.append(aspect_grid_table_right)
+
+            # Secondary grids
+            secondary_planet_grid_right = 910 + 80
+            extents.append(secondary_planet_grid_right)
+
+            if self.chart_type == "Synastry":
+                # Secondary houses grid default x ~ 1015
+                secondary_houses_grid_right = 1015 + 120
+                extents.append(secondary_houses_grid_right)
+
+            if self.chart_type == "Transit":
+                # House comparison grid at x ~ 1030
+                house_comparison_grid_right = 1030 + 180
+                extents.append(house_comparison_grid_right)
+
+            if self.chart_type == "DualReturnChart":
+                # House comparison grid at x ~ 1030
+                house_comparison_grid_right = 1030 + 320
+                extents.append(house_comparison_grid_right)
+
+        # Conservative safety padding
+        return int(max(extents) + self._padding)
+
+    def _get_location_info(self) -> tuple[str, float, float]:
+        """
+        Determine location information based on chart type and subjects.
+
+        Returns:
+            tuple: (location_name, latitude, longitude)
+        """
+        if self.chart_type == "Composite":
+            # For composite charts, use average location of the two composite subjects
+            if isinstance(self.first_obj, CompositeSubjectModel):
+                location_name = ""
+                latitude = (self.first_obj.first_subject.lat + self.first_obj.second_subject.lat) / 2
+                longitude = (self.first_obj.first_subject.lng + self.first_obj.second_subject.lng) / 2
+            else:
+                # Fallback to first subject location
+                location_name = self.first_obj.city or "Unknown"
+                latitude = self.first_obj.lat or 0.0
+                longitude = self.first_obj.lng or 0.0
+        elif self.chart_type in ["Transit", "DualReturnChart"] and self.second_obj:
+            # Use location from the second subject (transit/return)
+            location_name = self.second_obj.city or "Unknown"
+            latitude = self.second_obj.lat or 0.0
+            longitude = self.second_obj.lng or 0.0
+        else:
+            # Use location from the first subject
+            location_name = self.first_obj.city or "Unknown"
+            latitude = self.first_obj.lat or 0.0
+            longitude = self.first_obj.lng or 0.0
+
+        return location_name, latitude, longitude
+
     def set_up_theme(self, theme: Union[KerykeionChartTheme, None] = None) -> None:
         """
         Load and apply a CSS theme for the chart visualization.
@@ -585,16 +687,6 @@ class KerykeionChartSVG:
         with open(theme_dir / f"{theme}.css", "r") as f:
             self.color_style_tag = f.read()
 
-    def set_output_directory(self, dir_path: Path) -> None:
-        """
-        Set the directory where generated SVG files will be saved.
-
-        Args:
-            dir_path (Path): Target directory for SVG output.
-        """
-        self.output_directory = dir_path
-        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:
         """
         Load and parse chart configuration settings.
@@ -682,7 +774,89 @@ class KerykeionChartSVG:
                 )
         return out
 
-    def _create_template_dictionary(self) -> ChartTemplateDictionary:
+    def _truncate_name(self, name: str, max_length: int = 50) -> str:
+        """
+        Truncate a name if it's too long, preserving readability.
+
+        Args:
+            name (str): The name to truncate
+            max_length (int): Maximum allowed length
+
+        Returns:
+            str: Truncated name with ellipsis if needed
+        """
+        if len(name) <= max_length:
+            return name
+        return name[:max_length-1] + "…"
+
+    def _get_chart_title(self) -> str:
+        """
+        Generate the chart title based on chart type and custom title settings.
+
+        If a custom title is provided, it will be used. Otherwise, generates the
+        appropriate default title based on the chart type and subjects.
+
+        Returns:
+            str: The chart title to display (max ~40 characters).
+        """
+        # If custom title is provided, use it
+        if self.custom_title is not None:
+            return self.custom_title
+
+        # Generate default title based on chart type
+        if self.chart_type == "Natal":
+            natal_label = self.language_settings.get("birth_chart", "Natal")
+            truncated_name = self._truncate_name(self.first_obj.name)
+            return f'{truncated_name} - {natal_label}'
+
+        elif self.chart_type == "Composite":
+            composite_label = self.language_settings.get("composite_chart", "Composite")
+            and_word = self.language_settings.get("and_word", "&")
+            name1 = self._truncate_name(self.first_obj.first_subject.name) # type: ignore
+            name2 = self._truncate_name(self.first_obj.second_subject.name) # type: ignore
+            return f"{composite_label}: {name1} {and_word} {name2}"
+
+        elif self.chart_type == "Transit":
+            transit_label = self.language_settings.get("transits", "Transits")
+            from datetime import datetime
+            date_obj = datetime.fromisoformat(self.second_obj.iso_formatted_local_datetime) # type: ignore
+            date_str = date_obj.strftime("%d/%m/%y")
+            truncated_name = self._truncate_name(self.first_obj.name)
+            return f"{truncated_name} - {transit_label} {date_str}"
+
+        elif self.chart_type == "Synastry":
+            synastry_label = self.language_settings.get("synastry_chart", "Synastry")
+            and_word = self.language_settings.get("and_word", "&")
+            name1 = self._truncate_name(self.first_obj.name)
+            name2 = self._truncate_name(self.second_obj.name) # type: ignore
+            return f"{synastry_label}: {name1} {and_word} {name2}"
+
+        elif self.chart_type == "DualReturnChart":
+            from datetime import datetime
+            year = datetime.fromisoformat(self.second_obj.iso_formatted_local_datetime).year # type: ignore
+            truncated_name = self._truncate_name(self.first_obj.name)
+            if self.second_obj is not None and isinstance(self.second_obj, PlanetReturnModel) and self.second_obj.return_type == "Solar":
+                solar_label = self.language_settings.get("solar_return", "Solar")
+                return f"{truncated_name} - {solar_label} {year}"
+            else:
+                lunar_label = self.language_settings.get("lunar_return", "Lunar")
+                return f"{truncated_name} - {lunar_label} {year}"
+
+        elif self.chart_type == "SingleReturnChart":
+            from datetime import datetime
+            year = datetime.fromisoformat(self.first_obj.iso_formatted_local_datetime).year # type: ignore
+            truncated_name = self._truncate_name(self.first_obj.name)
+            if isinstance(self.first_obj, PlanetReturnModel) and self.first_obj.return_type == "Solar":
+                solar_label = self.language_settings.get("solar_return", "Solar")
+                return f"{truncated_name} - {solar_label} {year}"
+            else:
+                lunar_label = self.language_settings.get("lunar_return", "Lunar")
+                return f"{truncated_name} - {lunar_label} {year}"
+
+        # Fallback for unknown chart types
+        return self._truncate_name(self.first_obj.name)
+
+    def _create_template_dictionary(self) -> ChartTemplateModel:
         """
         Assemble chart data and rendering instructions into a template dictionary.
 
@@ -690,7 +864,7 @@ class KerykeionChartSVG:
         chart type and subjects.
 
         Returns:
-            ChartTemplateDictionary: Populated structure of template variables.
+            ChartTemplateModel: Populated structure of template variables.
         """
         # Initialize template dictionary
         template_dict: dict = {}
@@ -704,9 +878,19 @@ class KerykeionChartSVG:
         template_dict["chart_height"] = self.height
         template_dict["chart_width"] = self.width
 
+        offsets = self._vertical_offsets
+        template_dict["full_wheel_translate_y"] = offsets["wheel"]
+        template_dict["houses_and_planets_translate_y"] = offsets["grid"]
+        template_dict["aspect_grid_translate_y"] = offsets["aspect_grid"]
+        template_dict["aspect_list_translate_y"] = offsets["aspect_list"]
+        template_dict["title_translate_y"] = offsets["title"]
+        template_dict["elements_translate_y"] = offsets["elements"]
+        template_dict["qualities_translate_y"] = offsets["qualities"]
+        template_dict["lunar_phase_translate_y"] = offsets["lunar_phase"]
+        template_dict["bottom_left_translate_y"] = offsets["bottom_left"]
+
         # 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"]
 
         # Set background color based on transparent_background setting
         if self.transparent_background:
@@ -714,7 +898,12 @@ class KerykeionChartSVG:
         else:
             template_dict["background_color"] = self.chart_colors_settings["paper_1"]
 
-        # Set planet colors
+        # Set planet colors - initialize all possible colors first with defaults
+        default_color = "#000000"  # Default black color for unused planets
+        for i in range(42):  # Support all 42 celestial points (0-41)
+            template_dict[f"planets_color_{i}"] = default_color
+
+        # Override with actual colors from settings
         for planet in self.planets_settings:
             planet_id = planet["id"]
             template_dict[f"planets_color_{planet_id}"] = planet["color"]
@@ -732,10 +921,12 @@ class KerykeionChartSVG:
 
         # 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_values = {"fire": self.fire, "earth": self.earth, "air": self.air, "water": self.water}
+        element_percentages = distribute_percentages_to_100(element_values) if total_elements > 0 else {"fire": 0, "earth": 0, "air": 0, "water": 0}
+        fire_percentage = element_percentages["fire"]
+        earth_percentage = element_percentages["earth"]
+        air_percentage = element_percentages["air"]
+        water_percentage = element_percentages["water"]
 
         # Element Percentages
         template_dict["elements_string"] = f"{self.language_settings.get('elements', 'Elements')}:"
@@ -747,9 +938,11 @@ class KerykeionChartSVG:
 
         # 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))
+        quality_values = {"cardinal": self.cardinal, "fixed": self.fixed, "mutable": self.mutable}
+        quality_percentages = distribute_percentages_to_100(quality_values) if total_qualities > 0 else {"cardinal": 0, "fixed": 0, "mutable": 0}
+        cardinal_percentage = quality_percentages["cardinal"]
+        fixed_percentage = quality_percentages["fixed"]
+        mutable_percentage = quality_percentages["mutable"]
 
         template_dict["qualities_string"] = f"{self.language_settings.get('qualities', 'Qualities')}:"
         template_dict["cardinal_string"] = f"{self.language_settings.get('cardinal', 'Cardinal')} {cardinal_percentage}%"
@@ -759,13 +952,16 @@ class KerykeionChartSVG:
         # Get houses list for main subject
         first_subject_houses_list = get_houses_list(self.first_obj)
 
+        # Chart title
+        template_dict["stringTitle"] = self._get_chart_title()
+
         # ------------------------------- #
         #  CHART TYPE SPECIFIC SETTINGS   #
         # ------------------------------- #
 
-        if self.chart_type in ["Natal", "ExternalNatal"]:
-            # Set viewbox
-            template_dict["viewbox"] = self._BASIC_CHART_VIEWBOX
+        if self.chart_type == "Natal":
+            # Set viewbox dynamically
+            template_dict["viewbox"] = self._dynamic_viewbox()
 
             # Rings and circles
             template_dict["transitRing"] = ""
@@ -810,9 +1006,6 @@ class KerykeionChartSVG:
             )
             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.name} - {self.language_settings.get("birth_chart", "Birth Chart")}'
-
             # 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"])
@@ -822,7 +1015,8 @@ class KerykeionChartSVG:
             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
+            localized_weekday = self.language_settings.get('weekdays', {}).get(self.first_obj.day_of_week, self.first_obj.day_of_week)  # type: ignore
+            template_dict["top_left_5"] = f"{self.language_settings.get('day_of_week', 'Day of Week')}: {localized_weekday}" # type: ignore
 
             # Bottom left section
             if self.first_obj.zodiac_type == "Tropic":
@@ -870,6 +1064,7 @@ class KerykeionChartSVG:
                 c1=self.first_circle_radius,
                 c3=self.third_circle_radius,
                 chart_type=self.chart_type,
+                external_view=self.external_view,
             )
 
             template_dict["makePlanets"] = draw_planets(
@@ -880,6 +1075,7 @@ class KerykeionChartSVG:
                 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,
+                external_view=self.external_view,
             )
 
             template_dict["makeMainPlanetGrid"] = draw_main_planet_grid(
@@ -894,8 +1090,8 @@ class KerykeionChartSVG:
             template_dict["makeHouseComparisonGrid"] = ""
 
         elif self.chart_type == "Composite":
-            # Set viewbox
-            template_dict["viewbox"] = self._BASIC_CHART_VIEWBOX
+            # Set viewbox dynamically
+            template_dict["viewbox"] = self._dynamic_viewbox()
 
             # Rings and circles
             template_dict["transitRing"] = ""
@@ -940,9 +1136,6 @@ class KerykeionChartSVG:
             )
             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(
@@ -1014,6 +1207,7 @@ class KerykeionChartSVG:
                 c1=self.first_circle_radius,
                 c3=self.third_circle_radius,
                 chart_type=self.chart_type,
+                external_view=self.external_view,
             )
 
             template_dict["makePlanets"] = draw_planets(
@@ -1024,6 +1218,7 @@ class KerykeionChartSVG:
                 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,
+                external_view=self.external_view,
             )
 
             subject_name = f"{self.first_obj.first_subject.name} {self.language_settings['and_word']} {self.first_obj.second_subject.name}" # type: ignore
@@ -1054,11 +1249,8 @@ class KerykeionChartSVG:
             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["viewbox"] = self._WIDE_CHART_VIEWBOX
+            # Set viewbox dynamically
+            template_dict["viewbox"] = self._dynamic_viewbox()
 
             # Get houses list for secondary subject
             second_subject_houses_list = get_houses_list(self.second_obj) # type: ignore
@@ -1098,22 +1290,19 @@ class KerykeionChartSVG:
             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)
+                template_dict["makeDoubleChartAspectList"] = draw_transit_aspect_list(title, self.aspects_list, self.planets_settings, self.aspects_settings)  # type: ignore[arg-type]  # type: ignore[arg-type]
             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,
+                    600,
+                    520,
                 )
 
             template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
 
-            # Chart title
-            template_dict["stringTitle"] = f"{self.language_settings['transits']} {format_datetime_with_timezone(self.second_obj.iso_formatted_local_datetime)}" # 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"])
@@ -1176,6 +1365,7 @@ class KerykeionChartSVG:
                 c1=self.first_circle_radius,
                 c3=self.third_circle_radius,
                 chart_type=self.chart_type,
+                external_view=self.external_view,
                 second_subject_houses_list=second_subject_houses_list,
                 transit_house_cusp_color=self.chart_colors_settings["houses_transit_line"],
             )
@@ -1189,6 +1379,7 @@ class KerykeionChartSVG:
                 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,
+                external_view=self.external_view,
             )
 
             # Planet grids
@@ -1214,8 +1405,8 @@ class KerykeionChartSVG:
 
             # House comparison grid
             house_comparison_factory = HouseComparisonFactory(
-                first_subject=self.first_obj,
-                second_subject=self.second_obj,
+                first_subject=self.first_obj,  # type: ignore[arg-type]
+                second_subject=self.second_obj,  # type: ignore[arg-type]
                 active_points=self.active_points,
             )
             house_comparison = house_comparison_factory.get_house_comparison()
@@ -1228,12 +1419,12 @@ class KerykeionChartSVG:
                 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,
+                x_position=980,
             )
 
         elif self.chart_type == "Synastry":
-            # Set viewbox
-            template_dict["viewbox"] = self._WIDE_CHART_VIEWBOX
+            # Set viewbox dynamically
+            template_dict["viewbox"] = self._dynamic_viewbox()
 
             # Get houses list for secondary subject
             second_subject_houses_list = get_houses_list(self.second_obj) # type: ignore
@@ -1273,10 +1464,10 @@ class KerykeionChartSVG:
             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
+                    f"{self.first_obj.name} - {self.second_obj.name} {self.language_settings.get('synastry_aspects', 'Synastry Aspects')}",  # type: ignore[union-attr]
                     self.aspects_list,
-                    self.planets_settings,
-                    self.aspects_settings
+                    self.planets_settings,  # type: ignore[arg-type]
+                    self.aspects_settings  # type: ignore[arg-type]
                 )
             else:
                 template_dict["makeAspectGrid"] = ""
@@ -1290,9 +1481,6 @@ class KerykeionChartSVG:
 
             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
@@ -1343,6 +1531,7 @@ class KerykeionChartSVG:
                 c1=self.first_circle_radius,
                 c3=self.third_circle_radius,
                 chart_type=self.chart_type,
+                external_view=self.external_view,
                 second_subject_houses_list=second_subject_houses_list,
                 transit_house_cusp_color=self.chart_colors_settings["houses_transit_line"],
             )
@@ -1356,6 +1545,7 @@ class KerykeionChartSVG:
                 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,
+                external_view=self.external_view,
             )
 
             # Planet grid
@@ -1377,9 +1567,9 @@ class KerykeionChartSVG:
             )
             template_dict["makeHouseComparisonGrid"] = ""
 
-        elif self.chart_type == "Return":
-            # Set viewbox
-            template_dict["viewbox"] = self._ULTRA_WIDE_CHART_VIEWBOX
+        elif self.chart_type == "DualReturnChart":
+            # Set viewbox dynamically
+            template_dict["viewbox"] = self._dynamic_viewbox()
 
             # Get houses list for secondary subject
             second_subject_houses_list = get_houses_list(self.second_obj) # type: ignore
@@ -1419,7 +1609,7 @@ class KerykeionChartSVG:
             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)
+                template_dict["makeDoubleChartAspectList"] = draw_transit_aspect_list(title, self.aspects_list, self.planets_settings, self.aspects_settings, max_columns=7)  # type: ignore[arg-type]  # type: ignore[arg-type]
             else:
                 template_dict["makeAspectGrid"] = ""
                 template_dict["makeDoubleChartAspectList"] = draw_transit_aspect_grid(
@@ -1432,12 +1622,6 @@ class KerykeionChartSVG:
 
             template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
 
-            # Chart title
-            if self.second_obj is not None and hasattr(self.second_obj, 'return_type') and self.second_obj.return_type == "Solar":
-                template_dict["stringTitle"] = f"{self.first_obj.name} - {self.language_settings.get('solar_return', 'Solar Return')}"
-            else:
-                template_dict["stringTitle"] = f"{self.first_obj.name} - {self.language_settings.get('lunar_return', 'Lunar Return')}"
-
 
             # Top left section
             # Subject
@@ -1509,6 +1693,7 @@ class KerykeionChartSVG:
                 c1=self.first_circle_radius,
                 c3=self.third_circle_radius,
                 chart_type=self.chart_type,
+                external_view=self.external_view,
                 second_subject_houses_list=second_subject_houses_list,
                 transit_house_cusp_color=self.chart_colors_settings["houses_transit_line"],
             )
@@ -1522,6 +1707,7 @@ class KerykeionChartSVG:
                 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,
+                external_view=self.external_view,
             )
 
             # Planet grid
@@ -1549,8 +1735,8 @@ class KerykeionChartSVG:
             )
 
             house_comparison_factory = HouseComparisonFactory(
-                first_subject=self.first_obj,
-                second_subject=self.second_obj,
+                first_subject=self.first_obj,  # type: ignore[arg-type]
+                second_subject=self.second_obj,  # type: ignore[arg-type]
                 active_points=self.active_points,
             )
             house_comparison = house_comparison_factory.get_house_comparison()
@@ -1562,13 +1748,13 @@ class KerykeionChartSVG:
                 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"),
+                return_label=self.language_settings.get("Return", "DualReturnChart"),
                 radix_label=self.language_settings.get("Natal", "Natal"),
             )
 
-        elif self.chart_type == "SingleWheelReturn":
-            # Set viewbox
-            template_dict["viewbox"] = self._BASIC_CHART_VIEWBOX
+        elif self.chart_type == "SingleReturnChart":
+            # Set viewbox dynamically
+            template_dict["viewbox"] = self._dynamic_viewbox()
 
             # Rings and circles
             template_dict["transitRing"] = ""
@@ -1613,9 +1799,6 @@ class KerykeionChartSVG:
             )
             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"])
@@ -1677,6 +1860,7 @@ class KerykeionChartSVG:
                 c1=self.first_circle_radius,
                 c3=self.third_circle_radius,
                 chart_type=self.chart_type,
+                external_view=self.external_view,
             )
 
             template_dict["makePlanets"] = draw_planets(
@@ -1687,6 +1871,7 @@ class KerykeionChartSVG:
                 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,
+                external_view=self.external_view,
             )
 
             template_dict["makeMainPlanetGrid"] = draw_main_planet_grid(
@@ -1700,9 +1885,9 @@ class KerykeionChartSVG:
             template_dict["makeSecondaryPlanetGrid"] = ""
             template_dict["makeHouseComparisonGrid"] = ""
 
-        return ChartTemplateDictionary(**template_dict)
+        return ChartTemplateModel(**template_dict)
 
-    def makeTemplate(self, minify: bool = False, remove_css_variables=False) -> str:
+    def generate_svg_string(self, minify: bool = False, remove_css_variables=False) -> str:
         """
         Render the full chart SVG as a string.
 
@@ -1723,11 +1908,11 @@ class KerykeionChartSVG:
 
         # read template
         with open(xml_svg, "r", encoding="utf-8", errors="ignore") as f:
-            template = Template(f.read()).substitute(td)
+            template = Template(f.read()).substitute(td.model_dump())
 
         # return filename
 
-        logging.debug(f"Template dictionary keys: {td.keys()}")
+        logging.debug(f"Template dictionary has {len(td.model_dump())} fields")
 
         self._create_template_dictionary()
 
@@ -1742,36 +1927,50 @@ class KerykeionChartSVG:
 
         return template
 
-    def makeSVG(self, minify: bool = False, remove_css_variables=False):
+    def save_svg(self, output_path: Union[str, Path, None] = None, filename: Union[str, None] = None, minify: bool = False, remove_css_variables=False):
         """
         Generate and save the full chart SVG to disk.
 
-        Calls makeTemplate to render the SVG, then writes a file named
-        "{subject.name} - {chart_type} Chart.svg" in the output directory.
+        Calls generate_svg_string to render the SVG, then writes a file named
+        "{subject.name} - {chart_type} Chart.svg" in the specified output directory.
 
         Args:
-            minify (bool): Pass-through to makeTemplate for compact output.
-            remove_css_variables (bool): Pass-through to makeTemplate to embed CSS variables.
+            output_path (str, Path, or None): Directory path where the SVG file will be saved.
+                If None, defaults to the user's home directory.
+            filename (str or None): Custom filename for the SVG file (without extension).
+                If None, uses the default pattern: "{subject.name} - {chart_type} Chart".
+            minify (bool): Pass-through to generate_svg_string for compact output.
+            remove_css_variables (bool): Pass-through to generate_svg_string to embed CSS variables.
 
         Returns:
             None
         """
 
-        self.template = self.makeTemplate(minify, remove_css_variables)
+        self.template = self.generate_svg_string(minify, remove_css_variables)
+
+        # Convert output_path to Path object, default to home directory
+        output_directory = Path(output_path) if output_path is not None else Path.home()
 
-        if self.chart_type == "Return" and self.second_obj is not None and hasattr(self.second_obj, 'return_type') 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 is not None and hasattr(self.second_obj, 'return_type') and self.second_obj.return_type == "Solar":
-            chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart - Solar Return.svg"
+        # Determine filename
+        if filename is not None:
+            chartname = output_directory / f"{filename}.svg"
         else:
-            chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart.svg"
+            # Use default filename pattern
+            chart_type_for_filename = self.chart_type
+
+            if self.chart_type == "DualReturnChart" and self.second_obj is not None and hasattr(self.second_obj, 'return_type') and self.second_obj.return_type == "Lunar":
+                chartname = output_directory / f"{self.first_obj.name} - {chart_type_for_filename} Chart - Lunar Return.svg"
+            elif self.chart_type == "DualReturnChart" and self.second_obj is not None and hasattr(self.second_obj, 'return_type') and self.second_obj.return_type == "Solar":
+                chartname = output_directory / f"{self.first_obj.name} - {chart_type_for_filename} Chart - Solar Return.svg"
+            else:
+                chartname = output_directory / f"{self.first_obj.name} - {chart_type_for_filename} 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 generate_wheel_only_svg_string(self, minify: bool = False, remove_css_variables=False):
         """
         Render the wheel-only chart SVG as a string.
 
@@ -1795,7 +1994,9 @@ class KerykeionChartSVG:
             template = f.read()
 
         template_dict = self._create_template_dictionary()
-        template = Template(template).substitute(template_dict)
+        # Use a compact viewBox specific for the wheel-only rendering
+        wheel_viewbox = self._wheel_only_viewbox()
+        template = Template(template).substitute({**template_dict.model_dump(), "viewbox": wheel_viewbox})
 
         if remove_css_variables:
             template = inline_css_variables_in_svg(template)
@@ -1808,30 +2009,44 @@ class KerykeionChartSVG:
 
         return template
 
-    def makeWheelOnlySVG(self, minify: bool = False, remove_css_variables=False):
+    def save_wheel_only_svg_file(self, output_path: Union[str, Path, None] = None, filename: Union[str, None] = None, minify: bool = False, remove_css_variables=False):
         """
         Generate and save wheel-only chart SVG to disk.
 
-        Calls makeWheelOnlyTemplate and writes a file named
-        "{subject.name} - {chart_type} Chart - Wheel Only.svg" in the output directory.
+        Calls generate_wheel_only_svg_string and writes a file named
+        "{subject.name} - {chart_type} Chart - Wheel Only.svg" in the specified output directory.
 
         Args:
-            minify (bool): Pass-through to makeWheelOnlyTemplate for compact output.
-            remove_css_variables (bool): Pass-through to makeWheelOnlyTemplate to embed CSS variables.
+            output_path (str, Path, or None): Directory path where the SVG file will be saved.
+                If None, defaults to the user's home directory.
+            filename (str or None): Custom filename for the SVG file (without extension).
+                If None, uses the default pattern: "{subject.name} - {chart_type} Chart - Wheel Only".
+            minify (bool): Pass-through to generate_wheel_only_svg_string for compact output.
+            remove_css_variables (bool): Pass-through to generate_wheel_only_svg_string to embed CSS variables.
 
         Returns:
             None
         """
 
-        template = self.makeWheelOnlyTemplate(minify, remove_css_variables)
-        chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart - Wheel Only.svg"
+        template = self.generate_wheel_only_svg_string(minify, remove_css_variables)
+
+        # Convert output_path to Path object, default to home directory
+        output_directory = Path(output_path) if output_path is not None else Path.home()
+
+        # Determine filename
+        if filename is not None:
+            chartname = output_directory / f"{filename}.svg"
+        else:
+            # Use default filename pattern
+            chart_type_for_filename = "ExternalNatal" if self.external_view and self.chart_type == "Natal" else self.chart_type
+            chartname = output_directory / f"{self.first_obj.name} - {chart_type_for_filename} 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 generate_aspect_grid_only_svg_string(self, minify: bool = False, remove_css_variables=False):
         """
         Render the aspect-grid-only chart SVG as a string.
 
@@ -1856,7 +2071,7 @@ class KerykeionChartSVG:
 
         template_dict = self._create_template_dictionary()
 
-        if self.chart_type in ["Transit", "Synastry", "Return"]:
+        if self.chart_type in ["Transit", "Synastry", "DualReturnChart"]:
             aspects_grid = draw_transit_aspect_grid(
                 self.chart_colors_settings["paper_0"],
                 self.available_planets_setting,
@@ -1871,7 +2086,10 @@ class KerykeionChartSVG:
                 y_start=250,
             )
 
-        template = Template(template).substitute({**template_dict, "makeAspectGrid": aspects_grid})
+        # Use a compact, known-good viewBox that frames the grid
+        viewbox_override = self._grid_only_viewbox()
+
+        template = Template(template).substitute({**template_dict.model_dump(), "makeAspectGrid": aspects_grid, "viewbox": viewbox_override})
 
         if remove_css_variables:
             template = inline_css_variables_in_svg(template)
@@ -1884,42 +2102,55 @@ class KerykeionChartSVG:
 
         return template
 
-    def makeAspectGridOnlySVG(self, minify: bool = False, remove_css_variables=False):
+    def save_aspect_grid_only_svg_file(self, output_path: Union[str, Path, None] = None, filename: Union[str, None] = None, minify: bool = False, remove_css_variables=False):
         """
         Generate and save aspect-grid-only chart SVG to disk.
 
-        Calls makeAspectGridOnlyTemplate and writes a file named
-        "{subject.name} - {chart_type} Chart - Aspect Grid Only.svg" in the output directory.
+        Calls generate_aspect_grid_only_svg_string and writes a file named
+        "{subject.name} - {chart_type} Chart - Aspect Grid Only.svg" in the specified output directory.
 
         Args:
-            minify (bool): Pass-through to makeAspectGridOnlyTemplate for compact output.
-            remove_css_variables (bool): Pass-through to makeAspectGridOnlyTemplate to embed CSS variables.
+            output_path (str, Path, or None): Directory path where the SVG file will be saved.
+                If None, defaults to the user's home directory.
+            filename (str or None): Custom filename for the SVG file (without extension).
+                If None, uses the default pattern: "{subject.name} - {chart_type} Chart - Aspect Grid Only".
+            minify (bool): Pass-through to generate_aspect_grid_only_svg_string for compact output.
+            remove_css_variables (bool): Pass-through to generate_aspect_grid_only_svg_string to embed CSS variables.
 
         Returns:
             None
         """
 
-        template = self.makeAspectGridOnlyTemplate(minify, remove_css_variables)
-        chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart - Aspect Grid Only.svg"
+        template = self.generate_aspect_grid_only_svg_string(minify, remove_css_variables)
+
+        # Convert output_path to Path object, default to home directory
+        output_directory = Path(output_path) if output_path is not None else Path.home()
+
+        # Determine filename
+        if filename is not None:
+            chartname = output_directory / f"{filename}.svg"
+        else:
+            # Use default filename pattern
+            chart_type_for_filename = "ExternalNatal" if self.external_view and self.chart_type == "Natal" else self.chart_type
+            chartname = output_directory / f"{self.first_obj.name} - {chart_type_for_filename} 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.planetary_return_factory import PlanetaryReturnFactory
     from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
+    from kerykeion.chart_data_factory import ChartDataFactory
+    from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
 
-    ACTIVE_PLANETS: list[AstrologicalPoint] = [
-        "Sun", "Moon", "Pars_Fortunae", "Mercury", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune", "Pluto", "Chiron", "True_Node"
-    ]
-
+    ACTIVE_PLANETS: list[AstrologicalPoint] = DEFAULT_ACTIVE_POINTS
+    # ACTIVE_PLANETS: list[AstrologicalPoint] = ALL_ACTIVE_POINTS
     setup_logging(level="info")
 
-    subject = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    subject = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB", active_points=ACTIVE_PLANETS)
 
     return_factory = PlanetaryReturnFactory(
         subject,
@@ -1932,101 +2163,118 @@ if __name__ == "__main__":
     )
 
     ###
-    ## Birth Chart
-    birth_chart = KerykeionChartSVG(
-        first_obj=subject,
+    ## Birth Chart - NEW APPROACH with ChartDataFactory
+    birth_chart_data = ChartDataFactory.create_natal_chart_data(
+        subject,
+        active_points=ACTIVE_PLANETS,
+    )
+    birth_chart = ChartDrawer(
+        chart_data=birth_chart_data,
         chart_language="IT",
         theme="strawberry",
-        active_points=ACTIVE_PLANETS,
     )
-    birth_chart.makeSVG() # minify=True, remove_css_variables=True)
+    birth_chart.save_svg() # minify=True, remove_css_variables=True)
 
     ###
-    ## Solar Return Chart
+    ## Solar Return Chart - NEW APPROACH with ChartDataFactory
     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,
+    solar_return_chart_data = ChartDataFactory.create_return_chart_data(
+        subject,
+        solar_return,
+        active_points=ACTIVE_PLANETS,
+    )
+    solar_return_chart = ChartDrawer(
+        chart_data=solar_return_chart_data,
         chart_language="IT",
         theme="classic",
-        active_points=ACTIVE_PLANETS,
     )
 
-    solar_return_chart.makeSVG() # minify=True, remove_css_variables=True)
+    solar_return_chart.save_svg() # 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,
+    ## Single wheel return - NEW APPROACH with ChartDataFactory
+    single_wheel_return_chart_data = ChartDataFactory.create_single_wheel_return_chart_data(
+        solar_return,
+        active_points=ACTIVE_PLANETS,
+    )
+    single_wheel_return_chart = ChartDrawer(
+        chart_data=single_wheel_return_chart_data,
         chart_language="IT",
         theme="dark",
-        active_points=ACTIVE_PLANETS,
     )
 
-    single_wheel_return_chart.makeSVG() # minify=True, remove_css_variables=True)
+    single_wheel_return_chart.save_svg() # minify=True, remove_css_variables=True)
 
     ###
-    ## Lunar return
+    ## Lunar return - NEW APPROACH with ChartDataFactory
     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,
+    lunar_return_chart_data = ChartDataFactory.create_return_chart_data(
+        subject,
+        lunar_return,
+        active_points=ACTIVE_PLANETS,
+    )
+    lunar_return_chart = ChartDrawer(
+        chart_data=lunar_return_chart_data,
         chart_language="IT",
         theme="dark",
-        active_points=ACTIVE_PLANETS,
     )
-    lunar_return_chart.makeSVG() # minify=True, remove_css_variables=True)
+    lunar_return_chart.save_svg() # minify=True, remove_css_variables=True)
 
     ###
-    ## Transit Chart
+    ## Transit Chart - NEW APPROACH with ChartDataFactory
     transit = AstrologicalSubjectFactory.from_iso_utc_time(
         "Transit",
         "2021-10-04T18:30:00+01:00",
     )
-    transit_chart = KerykeionChartSVG(
-        first_obj=subject,
-        chart_type="Transit",
-        second_obj=transit,
+    transit_chart_data = ChartDataFactory.create_transit_chart_data(
+        subject,
+        transit,
+        active_points=ACTIVE_PLANETS,
+    )
+    transit_chart = ChartDrawer(
+        chart_data=transit_chart_data,
         chart_language="IT",
         theme="dark",
-        active_points=ACTIVE_PLANETS
     )
-    transit_chart.makeSVG() # minify=True, remove_css_variables=True)
+    transit_chart.save_svg() # minify=True, remove_css_variables=True)
 
     ###
-    ## Synastry Chart
+    ## Synastry Chart - NEW APPROACH with ChartDataFactory
     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,
+    synastry_chart_data = ChartDataFactory.create_synastry_chart_data(
+        subject,
+        second_subject,
+        active_points=ACTIVE_PLANETS,
+    )
+    synastry_chart = ChartDrawer(
+        chart_data=synastry_chart_data,
         chart_language="IT",
         theme="dark",
-        active_points=ACTIVE_PLANETS
     )
-    synastry_chart.makeSVG() # minify=True, remove_css_variables=True)
+    synastry_chart.save_svg() # minify=True, remove_css_variables=True)
 
     ##
-    # Transit Chart with Grid
+    # Transit Chart with Grid - NEW APPROACH with ChartDataFactory
     subject.name = "Grid"
-    transit_chart_with_grid = KerykeionChartSVG(
-        first_obj=subject,
-        chart_type="Transit",
-        second_obj=transit,
+    transit_chart_with_grid_data = ChartDataFactory.create_transit_chart_data(
+        subject,
+        transit,
+        active_points=ACTIVE_PLANETS,
+    )
+    transit_chart_with_grid = ChartDrawer(
+        chart_data=transit_chart_with_grid_data,
         chart_language="IT",
         theme="dark",
-        active_points=ACTIVE_PLANETS,
         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()
+    transit_chart_with_grid.save_svg() # minify=True, remove_css_variables=True)
+    transit_chart_with_grid.save_aspect_grid_only_svg_file()
+    transit_chart_with_grid.save_wheel_only_svg_file()
+
+    print("✅ All chart examples completed using ChartDataFactory + ChartDrawer architecture!")