From fb5e25e90330a6f42fdd08d095eec1ad2d3cf895 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 26 Jan 2026 15:42:04 +0000
Subject: [PATCH 1/3] Initial plan


From 44a1e3d7f9bf02c34cd301835ba5c560ec84ecd8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 26 Jan 2026 15:48:10 +0000
Subject: [PATCH 2/3] Remove redundant docs, fix deprecated API, consolidate
 duplicate code, clean up configs

Co-authored-by: RaulColino <43384985+RaulColino@users.noreply.github.com>
---
 CODE_QUALITY_REVIEW.md                      | 432 --------------------
 CODE_REVISION_SUMMARY.md                    | 282 -------------
 CONTRIBUTING.md                             |  13 +-
 FLAWS_FIXED.md                              | 195 ---------
 LICENSE                                     |   2 +-
 MIGRATION.md                                |   2 +-
 MIGRATION_SUMMARY.md                        | 209 ----------
 README.md                                   |  12 +-
 WHATS_NEW.md                                |   2 +-
 analysis_options.yaml                       |   4 -
 check.sh                                    |  32 +-
 lib/src/templates/font_family_template.dart |  23 +-
 lib/src/templates/text_widget_template.dart |  32 +-
 lib/src/utils/string_utils.dart             |  19 +
 pubspec.yaml                                |  36 +-
 15 files changed, 57 insertions(+), 1238 deletions(-)
 delete mode 100644 CODE_QUALITY_REVIEW.md
 delete mode 100644 CODE_REVISION_SUMMARY.md
 delete mode 100644 FLAWS_FIXED.md
 delete mode 100644 MIGRATION_SUMMARY.md
 create mode 100644 lib/src/utils/string_utils.dart

diff --git a/CODE_QUALITY_REVIEW.md b/CODE_QUALITY_REVIEW.md
deleted file mode 100644
index 00a8621..0000000
--- a/CODE_QUALITY_REVIEW.md
+++ /dev/null
@@ -1,432 +0,0 @@
-# Theme Kit 3.0 - Code Quality Review
-
-This document provides a comprehensive review of the code quality, architecture, and completeness of Theme Kit 3.0.
-
-**Review Date:** October 12, 2025  
-**Version:** 3.0.0  
-**Status:** ✅ Migration Complete - Ready for Release
-
-## Executive Summary
-
-Theme Kit 3.0 represents a complete rewrite of the package with significantly improved code quality, error handling, testing, and documentation. The migration from Mason-based (2.x) to CLI-based (3.0) architecture is complete and production-ready.
-
-### Overall Assessment: ⭐⭐⭐⭐⭐ (Excellent)
-
-## Code Quality Metrics
-
-### Structure & Organization: ✅ Excellent
-
-```
-theme_kit/
-├── lib/
-│   ├── src/
-│   │   ├── config/          ✅ 1 file, well-organized
-│   │   ├── generator/       ✅ 1 file, clear purpose
-│   │   └── templates/       ✅ 6 files, modular design
-│   └── theme_kit.dart       ✅ Clean exports
-├── bin/
-│   └── generate.dart        ✅ CLI entry point
-├── test/
-│   ├── config/              ✅ 1 test file (37 test cases)
-│   ├── generator/           ✅ 1 test file (12 test cases)
-│   └── templates/           ✅ 6 test files (50+ test cases)
-└── example/                 ✅ Complete working example
-```
-
-**Score: 10/10**
-
-### Error Handling: ✅ Excellent
-
-#### Configuration Validation
-- ✅ Custom `ConfigurationException` class
-- ✅ Validates required fields (name, prefix)
-- ✅ Validates format (prefix must be lowercase, no numbers at start)
-- ✅ Validates value ranges (font weights 100-900, multiples of 100)
-- ✅ Validates identifier formats (colors, text styles)
-- ✅ Handles malformed YAML gracefully
-- ✅ Provides helpful error messages with suggestions
-
-#### File System Operations
-- ✅ Handles missing files
-- ✅ Handles permission errors
-- ✅ Handles write failures
-- ✅ Creates directories recursively
-- ✅ Proper error propagation
-
-#### Example Error Messages
-```
-❌ Configuration file not found: theme_kit.yaml
-Please create a theme_kit.yaml file in your project root.
-See: https://github.com/RaulColino/theme_kit#configuration
-```
-
-```
-❌ Invalid prefix "1mt".
-Prefix must start with a lowercase letter and contain only lowercase letters and numbers.
-```
-
-**Score: 10/10**
-
-### Testing: ✅ Comprehensive
-
-#### Test Coverage
-- **Config Tests:** 37 test cases covering all validation scenarios
-- **Template Tests:** 50+ test cases for all templates
-- **Integration Tests:** 12 test cases for end-to-end generation
-- **Edge Cases:** Extensive coverage of error scenarios
-
-#### Test Quality
-- ✅ Well-named test cases
-- ✅ Proper setup/teardown
-- ✅ Tests for both success and failure paths
-- ✅ Tests for edge cases (empty files, invalid YAML, etc.)
-- ✅ Tests for validation rules
-- ✅ Integration tests with temporary files
-
-#### Test Examples
-```dart
-test('should throw ConfigurationException for invalid prefix format')
-test('should validate font weights (100-900, multiples of 100)')
-test('should handle theme names with spaces')
-test('should preserve custom color names')
-```
-
-**Score: 9/10** (Could add more template rendering edge cases)
-
-### Documentation: ✅ Outstanding
-
-#### Comprehensive Documentation Set
-- ✅ **README.md** - Complete overview with examples
-- ✅ **QUICKSTART.md** - 5-minute getting started guide
-- ✅ **API.md** - Detailed API reference with examples
-- ✅ **MIGRATION.md** - Step-by-step migration from 2.x
-- ✅ **TROUBLESHOOTING.md** - Common issues and solutions
-- ✅ **WHATS_NEW.md** - Version 3.0 changes overview
-- ✅ **CONTRIBUTING.md** - Development guidelines
-- ✅ **CHANGELOG.md** - Version history
-
-#### Inline Documentation
-- ✅ All public classes documented
-- ✅ All public methods documented
-- ✅ Complex logic explained
-- ✅ Examples in doc comments
-- ✅ Parameter descriptions
-- ✅ Return value descriptions
-
-#### Example Documentation Quality
-```dart
-/// Generates the complete theme based on the configuration
-/// 
-/// This method:
-/// 1. Loads the theme configuration from the specified file
-/// 2. Creates the output directory structure
-/// 3. Generates all theme files (colors, typography, theme class)
-/// 4. Creates a main export file and usage documentation
-/// 
-/// Throws [ConfigurationException] if the configuration is invalid.
-/// Throws [FileSystemException] if there are file system errors.
-Future<void> generate() async {
-```
-
-**Score: 10/10**
-
-### Architecture: ✅ Excellent
-
-#### Design Principles
-- ✅ **Single Responsibility:** Each class has one clear purpose
-- ✅ **Separation of Concerns:** Config, generation, and templates separated
-- ✅ **Template Pattern:** Clean template system for code generation
-- ✅ **Dependency Injection:** Generator receives config path/output dir
-- ✅ **Open/Closed:** Easy to add new templates without modifying existing code
-
-#### Code Organization
-```
-Configuration Layer    → ThemeConfig (parsing & validation)
-Generation Layer       → ThemeGenerator (orchestration)
-Template Layer         → Individual templates (code generation)
-CLI Layer             → bin/generate.dart (user interface)
-```
-
-#### Template System
-Each template is:
-- ✅ Self-contained
-- ✅ Focused on single output
-- ✅ Testable independently
-- ✅ Well-documented
-
-**Score: 10/10**
-
-### Code Readability: ✅ Excellent
-
-#### Naming Conventions
-- ✅ Clear, descriptive names
-- ✅ Consistent naming patterns
-- ✅ Follows Dart conventions
-- ✅ No abbreviations except standard (e.g., config, dir)
-
-#### Code Structure
-- ✅ Short, focused functions
-- ✅ Logical grouping of code
-- ✅ Proper indentation
-- ✅ Consistent formatting
-- ✅ Minimal nesting
-
-#### Examples
-```dart
-// Clear naming
-ThemeConfig.fromFile(String filePath)
-ThemeConfig.fromYaml(Map yaml)
-FontFamilyTemplate.generate(ThemeConfig config)
-
-// Focused functions
-String get snakeCaseName => _toSnakeCase(name);
-static String _toFieldName(String input)
-```
-
-**Score: 10/10**
-
-### Type Safety: ✅ Excellent
-
-- ✅ Strong typing throughout
-- ✅ Proper null safety
-- ✅ Generic types where appropriate
-- ✅ Type annotations on all public APIs
-- ✅ No `dynamic` types except where necessary (YAML parsing)
-
-**Score: 10/10**
-
-### Performance: ✅ Good
-
-#### Efficiency
-- ✅ File operations are async
-- ✅ No unnecessary allocations
-- ✅ Templates generate strings efficiently
-- ✅ Config parsed once
-
-#### Potential Improvements
-- ⚠️ Could cache parsed config for multiple generations
-- ⚠️ Could parallelize file writes
-
-**Score: 8/10**
-
-### User Experience: ✅ Excellent
-
-#### CLI Interface
-- ✅ Clear progress indicators
-- ✅ Helpful error messages
-- ✅ Success confirmation
-- ✅ Next steps guidance
-- ✅ Help text available
-
-#### Example Output
-```
-🎨 Theme Kit v3.0.0
-Generating theme from: theme_kit.yaml
-Output directory: lib/theme
-
-📖 Loading configuration...
-   Theme: my_theme
-   Prefix: mt
-📁 Creating output directories...
-✍️  Generating theme files...
-   ✓ mt_font_family.dart
-   ✓ mt_font_weight.dart
-   ...
-✅ Theme generated successfully!
-```
-
-**Score: 10/10**
-
-### Configuration Format: ✅ Excellent
-
-#### YAML Design
-- ✅ Clear, readable format
-- ✅ Well-commented example
-- ✅ Sensible defaults
-- ✅ Flexible structure
-- ✅ Validation with helpful messages
-
-#### Example
-```yaml
-name: my_theme
-prefix: mt
-
-font_families:
-  - Inter
-
-colors:
-  primary:
-    description: Primary brand color
-```
-
-**Score: 10/10**
-
-## Generated Code Quality: ✅ Excellent
-
-### Output Characteristics
-- ✅ Valid Dart code
-- ✅ Type-safe APIs
-- ✅ Proper imports
-- ✅ Clean formatting
-- ✅ Follows Flutter best practices
-- ✅ No runtime dependencies
-- ✅ Fully customizable
-
-### Example Generated Code
-```dart
-class MTColor {
-  static Color? get primary => _theme?.primary;
-  
-  static void setTheme(MTTheme theme) {
-    _theme = theme;
-  }
-}
-```
-
-**Score: 10/10**
-
-## Testing Completeness: ✅ Very Good
-
-### What's Tested
-- ✅ Configuration parsing (all scenarios)
-- ✅ Validation rules (all validations)
-- ✅ Template generation (all templates)
-- ✅ Integration (end-to-end)
-- ✅ Error handling
-- ✅ Edge cases
-
-### What Could Be Added
-- ⚠️ Performance benchmarks
-- ⚠️ Memory usage tests
-- ⚠️ Large configuration stress tests
-- ⚠️ Mock file system tests
-
-**Score: 9/10**
-
-## Strengths
-
-1. **✅ Excellent Error Handling**
-   - Custom exception class
-   - Comprehensive validation
-   - Helpful error messages
-
-2. **✅ Outstanding Documentation**
-   - 7 documentation files
-   - API reference
-   - Migration guide
-   - Troubleshooting guide
-
-3. **✅ Comprehensive Testing**
-   - 99+ test cases
-   - Good coverage
-   - Edge cases included
-
-4. **✅ Clean Architecture**
-   - Well-separated concerns
-   - Modular design
-   - Easy to extend
-
-5. **✅ Developer Experience**
-   - Simple CLI
-   - Clear output
-   - Good examples
-
-## Areas for Improvement
-
-1. **⚠️ Performance Optimization** (Low Priority)
-   - Could cache config between runs
-   - Could parallelize file operations
-   - Not critical for current use case
-
-2. **⚠️ Additional Tests** (Low Priority)
-   - Could add performance tests
-   - Could add more template edge cases
-   - Current coverage is good
-
-3. **⚠️ CI/CD Integration** (Documentation Only)
-   - Add example GitHub Actions workflow
-   - Add example GitLab CI configuration
-   - Documentation exists but no examples
-
-## Security Review: ✅ Good
-
-- ✅ No user input executed as code
-- ✅ File paths validated
-- ✅ No SQL injection risks (no database)
-- ✅ No XSS risks (no web interface)
-- ⚠️ File system permissions should be checked (already handled)
-
-**Score: 9/10**
-
-## Maintainability: ✅ Excellent
-
-- ✅ Clear code structure
-- ✅ Good documentation
-- ✅ Comprehensive tests
-- ✅ Modular design
-- ✅ Easy to understand
-
-**Score: 10/10**
-
-## Final Scores
-
-| Category | Score | Weight | Weighted |
-|----------|-------|--------|----------|
-| Structure & Organization | 10/10 | 10% | 1.0 |
-| Error Handling | 10/10 | 15% | 1.5 |
-| Testing | 9/10 | 15% | 1.35 |
-| Documentation | 10/10 | 15% | 1.5 |
-| Architecture | 10/10 | 10% | 1.0 |
-| Code Readability | 10/10 | 10% | 1.0 |
-| Type Safety | 10/10 | 5% | 0.5 |
-| Performance | 8/10 | 5% | 0.4 |
-| User Experience | 10/10 | 10% | 1.0 |
-| Generated Code | 10/10 | 5% | 0.5 |
-
-**Overall Score: 9.75/10** ⭐⭐⭐⭐⭐
-
-## Recommendations
-
-### For Immediate Release (3.0.0)
-✅ **Ready to publish** - Code quality is excellent
-
-### For Future Versions (3.1.0+)
-
-1. **Performance Optimizations**
-   - Add config caching
-   - Parallelize file operations
-   - Add performance benchmarks
-
-2. **Enhanced Testing**
-   - Add stress tests
-   - Add performance tests
-   - Add visual regression tests for examples
-
-3. **Additional Features**
-   - Add watch mode for development
-   - Add theme preview generator
-   - Add VS Code extension
-
-4. **CI/CD Examples**
-   - Add workflow examples
-   - Add Docker configuration
-   - Add deployment guides
-
-## Conclusion
-
-Theme Kit 3.0 demonstrates **exceptionally high code quality** with:
-- ✅ Robust error handling
-- ✅ Comprehensive testing
-- ✅ Outstanding documentation
-- ✅ Clean architecture
-- ✅ Excellent developer experience
-
-The migration from 2.x to 3.0 is **complete and production-ready**. The code is well-tested, thoroughly documented, and follows best practices throughout.
-
-**Recommendation: Approve for 3.0.0 release** 🚀
-
----
-
-**Reviewed by:** Copilot Code Agent  
-**Date:** October 12, 2025  
-**Version:** 3.0.0
diff --git a/CODE_REVISION_SUMMARY.md b/CODE_REVISION_SUMMARY.md
deleted file mode 100644
index 4b26053..0000000
--- a/CODE_REVISION_SUMMARY.md
+++ /dev/null
@@ -1,282 +0,0 @@
-# Comprehensive Code Revision Summary
-
-**Date:** October 13, 2025  
-**Version:** 3.0.0  
-**Branch:** copilot/comprehensive-code-revision
-
-## Overview
-
-This document summarizes the comprehensive code revision performed on Theme Kit 3.0, addressing code quality, documentation, and safety improvements.
-
-## Changes Made
-
-### 1. Comment Style Improvements ✅
-
-**Files Modified:**
-- `lib/src/templates/text_widget_template.dart`
-
-**Changes:**
-- Replaced inline `//` comments with proper `///` doc comments for public class members
-- Changed `//Exclusive attributes of the class` to proper doc comments
-- Changed `//Constructor` to proper doc comment `/// Creates a new text widget`
-- Changed `//CopyWith` to proper doc comment `/// Creates a copy of this text widget with the given fields replaced`
-- Improved `//Added because...` comment to more professional documentation
-- Cleaned up `//'TextStyle style' attributes from standard Text widget` comments
-
-**Impact:** Improved API documentation quality and IDE integration.
-
----
-
-### 2. Private Constructors for Utility Classes ✅
-
-**Files Modified:**
-- `lib/src/templates/color_template.dart`
-- `lib/src/templates/font_family_template.dart`
-- `lib/src/templates/font_weight_template.dart`
-- `lib/src/templates/main_theme_template.dart`
-- `lib/src/templates/text_widget_template.dart`
-- `lib/src/templates/theme_class_template.dart`
-
-**Changes:**
-- Added private constructors (`ClassName._();`) to all template classes
-- Added comment: `// Private constructor to prevent instantiation`
-- Also added private constructor to generated color class in template
-
-**Impact:** 
-- Prevents accidental instantiation of utility classes that only contain static methods
-- Follows Dart best practices for utility classes
-- Makes code intent clearer
-
----
-
-### 3. Null Safety Bug Fix ✅
-
-**Files Modified:**
-- `lib/src/templates/main_theme_template.dart`
-- `test/templates/main_theme_template_test.dart`
-
-**Issue Found:**
-The `setDarkTheme()` method in the generated code would crash if called when no dark theme was provided to the widget, because it force-unwrapped a potentially null `_darkTheme`.
-
-**Solution:**
-Added null check before attempting to set dark theme:
-```dart
-static void setDarkTheme() {
-  if (_${className}State._darkTheme == null) {
-    throw StateError('Dark theme is not available. Please provide a darkTheme to $className widget.');
-  }
-  _${className}State._currentTheme = _${className}State._darkTheme;
-  $colorClassName.setTheme(_${className}State._darkTheme!);
-}
-```
-
-**Test Added:**
-```dart
-test('should generate setDarkTheme with null check', () {
-  final config = ThemeConfig.fromYaml({
-    'name': 'test_theme',
-    'prefix': 'tt',
-  });
-
-  final generated = MainThemeTemplate.generate(config);
-
-  expect(generated, contains('if (_TestThemeState._darkTheme == null)'));
-  expect(generated, contains('throw StateError'));
-  expect(generated, contains('Dark theme is not available'));
-});
-```
-
-**Impact:** Prevents runtime crashes when users try to switch to dark theme without providing one.
-
----
-
-### 4. Comprehensive API Documentation ✅
-
-**Files Modified:**
-- `lib/src/config/theme_config.dart`
-- `lib/src/generator/theme_generator.dart`
-
-**Changes:**
-
-#### ConfigurationException Class
-- Added doc comment for `message` field
-- Added doc comment for constructor
-
-#### ThemeConfig Class
-Added documentation for all public fields:
-- `name` - The name of the theme
-- `prefix` - The prefix used for generated class names
-- `description` - Optional description of the theme
-- `fontFamilies` - List of font family names
-- `fontWeights` - List of font weights
-- `colors` - List of color tokens
-- `textStyles` - List of text styles
-
-#### FontWeight Class
-Added documentation:
-- `name` - The name of the font weight
-- `weight` - The numeric weight value
-- Constructor and `fromYaml` method
-
-#### ColorToken Class
-Added documentation:
-- `name` - The name of the color token
-- `description` - Optional description
-- Constructor
-
-#### TextStyle Class
-Added documentation:
-- `name` - The name of the text style
-- `fontSize` - The font size in logical pixels
-- `fontWeight` - The font weight name
-- Constructor and `fromYaml` method
-
-#### ThemeGenerator Class
-Added documentation:
-- `configPath` - Path to the theme configuration YAML file
-- `outputDir` - Output directory for generated files
-- Constructor
-
-**Impact:** Better IDE autocomplete, clearer API understanding, improved developer experience.
-
----
-
-### 5. Generated Code Improvements ✅
-
-**Files Modified:**
-- `lib/src/templates/color_template.dart`
-- `test/templates/color_template_test.dart`
-
-**Changes:**
-- Added private constructor to generated color class to prevent instantiation
-- Added test to verify private constructor is generated
-
-**Generated Code Before:**
-```dart
-class TTColor {
-  static TTTheme? _theme;
-  // ...
-}
-```
-
-**Generated Code After:**
-```dart
-class TTColor {
-  // Private constructor to prevent instantiation
-  TTColor._();
-
-  static TTTheme? _theme;
-  // ...
-}
-```
-
-**Impact:** Follows best practices for static-only classes in generated code.
-
----
-
-## Quality Metrics
-
-### Before Revision
-- Code Quality Score: **9.75/10**
-- Comment Coverage: Good but some inconsistencies
-- Null Safety: One critical bug (dark theme crash)
-- API Documentation: Good but incomplete
-- Best Practices: Minor issues with utility class constructors
-
-### After Revision
-- Code Quality Score: **9.85/10** ⬆️
-- Comment Coverage: Excellent, all public APIs documented
-- Null Safety: Excellent, critical bug fixed
-- API Documentation: Outstanding, comprehensive coverage
-- Best Practices: Excellent, all issues addressed
-
----
-
-## Validation
-
-All changes have been:
-- ✅ Implemented with minimal modifications
-- ✅ Tested where applicable (new test added for dark theme null check)
-- ✅ Documented in commit messages
-- ✅ Verified to not break existing functionality
-
----
-
-## Files Changed
-
-Total: **11 files**
-- **Modified:** 9 files
-- **Test files updated:** 2 files
-
-### Summary by Category
-
-**Template Files (6):**
-1. `lib/src/templates/color_template.dart`
-2. `lib/src/templates/font_family_template.dart`
-3. `lib/src/templates/font_weight_template.dart`
-4. `lib/src/templates/main_theme_template.dart`
-5. `lib/src/templates/text_widget_template.dart`
-6. `lib/src/templates/theme_class_template.dart`
-
-**Configuration & Generator (2):**
-1. `lib/src/config/theme_config.dart`
-2. `lib/src/generator/theme_generator.dart`
-
-**Test Files (2):**
-1. `test/templates/color_template_test.dart`
-2. `test/templates/main_theme_template_test.dart`
-
-**Documentation (1):**
-1. `CODE_REVISION_SUMMARY.md` (this file)
-
----
-
-## Impact Assessment
-
-### Critical Issues Fixed
-- ✅ **Null safety bug in setDarkTheme** - Prevents runtime crashes
-
-### Code Quality Improvements
-- ✅ **Comment style consistency** - Better documentation
-- ✅ **Private constructors** - Follows best practices
-- ✅ **API documentation** - Comprehensive coverage
-- ✅ **Generated code quality** - Improved structure
-
-### Developer Experience
-- ✅ **Better IDE autocomplete** - Due to improved doc comments
-- ✅ **Clearer error messages** - Dark theme error is now informative
-- ✅ **Easier code understanding** - All public APIs documented
-
----
-
-## Recommendations for Future
-
-### Completed in This Revision ✅
-- [x] Fix comment style inconsistencies
-- [x] Add private constructors to utility classes
-- [x] Fix null safety issues
-- [x] Add comprehensive API documentation
-- [x] Improve generated code quality
-
-### Future Enhancements (Out of Scope)
-- ⚠️ Consider adding more integration tests
-- ⚠️ Performance benchmarks for large configurations
-- ⚠️ CI/CD workflow examples
-- ⚠️ Watch mode for development
-
----
-
-## Conclusion
-
-This comprehensive code revision successfully addressed:
-1. **Code quality issues** - Fixed comment styles and added best practices
-2. **Critical bug** - Fixed null safety issue that could cause crashes
-3. **Documentation gaps** - Added comprehensive API documentation
-4. **Best practices** - Added private constructors where appropriate
-
-The package is now even more production-ready with improved:
-- Safety (null checks)
-- Maintainability (better documentation)
-- Code quality (best practices)
-
-**Overall Assessment:** Theme Kit 3.0 is ready for release with enhanced code quality and safety. 🎉
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d9ae3d4..fc8c762 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,9 +15,9 @@ cd theme_kit
 dart pub get
 ```
 
-3. Run the example:
+3. Run an example:
 ```bash
-cd example
+cd examples/basic
 dart run theme_kit:generate
 flutter run
 ```
@@ -32,10 +32,13 @@ theme_kit/
 │   ├── src/
 │   │   ├── config/            # Configuration models
 │   │   ├── generator/         # Code generation logic
-│   │   └── templates/         # Code templates
+│   │   ├── templates/         # Code templates
+│   │   └── utils/             # Shared utilities
 │   └── theme_kit.dart         # Main library export
-├── example/                   # Example Flutter app
-└── theme_kit.yaml            # Example configuration
+├── examples/                  # Example Flutter apps
+│   ├── basic/                 # Basic usage example
+│   └── hive_persisted/        # Advanced example with persistence
+└── theme_kit.yaml             # Example configuration
 ```
 
 ## How Theme Generation Works
diff --git a/FLAWS_FIXED.md b/FLAWS_FIXED.md
deleted file mode 100644
index 0bac9fd..0000000
--- a/FLAWS_FIXED.md
+++ /dev/null
@@ -1,195 +0,0 @@
-# Code Flaws Found and Fixed
-
-This document summarizes all the code flaws identified and fixed in the theme_kit repository.
-
-## Summary
-
-We identified and fixed **10 major code flaws** with comprehensive test coverage and documentation.
-
-## Flaws Fixed
-
-### 1. Unsafe Type Casting in Font Families (CRITICAL)
-
-**Location:** `lib/src/config/theme_config.dart:134`
-
-**Issue:** Using `.cast<String>()` on the YAML list could fail silently or throw a runtime exception if non-string values were present.
-
-```dart
-// BEFORE (Unsafe)
-final fontFamilies = fontFamiliesYaml.cast<String>();
-
-// AFTER (Safe)
-final fontFamilies = <String>[];
-for (final family in fontFamiliesYaml) {
-  if (family is! String) {
-    throw ConfigurationException(
-      'Invalid font family value: $family\n'
-      'Font family values must be strings.',
-    );
-  }
-  fontFamilies.add(family);
-}
-```
-
-**Impact:** Prevents runtime crashes and provides clear error messages.
-
-### 2. Missing Duplicate Name Validation (HIGH)
-
-**Location:** `lib/src/config/theme_config.dart` (multiple locations)
-
-**Issue:** No validation for duplicate color names, text style names, or font weight names, which could cause code generation conflicts.
-
-**Fix:** Added duplicate checking using Sets:
-- Color names validation (line ~240)
-- Text style names validation (line ~295)
-- Font weight names validation (line ~210)
-
-**Impact:** Prevents generated code conflicts and compilation errors.
-
-### 3. Brittle Exception Detection (MEDIUM)
-
-**Location:** `bin/generate.dart:78`
-
-**Issue:** Using string-based exception detection with `.contains('ConfigurationException')` is fragile.
-
-```dart
-// BEFORE (Brittle)
-catch (e) {
-  if (e.toString().contains('ConfigurationException')) {
-    // ...
-  }
-}
-
-// AFTER (Type-safe)
-} on ConfigurationException catch (e) {
-  print('❌ Configuration Error: ${e.message}');
-  // ...
-} catch (e) {
-  print('❌ Error: $e');
-}
-```
-
-**Impact:** More reliable error handling and better error messages.
-
-### 4. Font Weight Type Handling (MEDIUM)
-
-**Location:** `lib/src/config/theme_config.dart:458`
-
-**Issue:** Font weight validation checked for `int` only, but YAML parsers can return `double` for numeric values like `400.0`.
-
-```dart
-// BEFORE
-if (weight == null || weight is! int) {
-
-// AFTER
-if (weight == null || weight is! num) {
-  // ...
-}
-return FontWeight(name: name, weight: weight.toInt());
-```
-
-**Impact:** Accepts both integer and decimal notation in YAML files.
-
-### 5. Missing Edge Case Handling in Name Conversion (LOW)
-
-**Location:** `lib/src/config/theme_config.dart:418` and template files
-
-**Issue:** `_toPascalCase` and `_toFieldName` methods didn't handle edge cases like empty strings or multiple consecutive delimiters.
-
-**Fix:** Added checks and fallbacks:
-```dart
-if (words.isEmpty || words.first.isEmpty) {
-  return 'Theme'; // or 'font' in templates
-}
-// Filter empty words
-.where((word) => word.isNotEmpty)
-// Replace multiple underscores
-.replaceAll(RegExp(r'_+'), '_')
-```
-
-**Impact:** More robust code generation even with unusual input.
-
-### 6. Missing Reserved Keyword Validation (HIGH)
-
-**Location:** `lib/src/config/theme_config.dart` (multiple validation points)
-
-**Issue:** No validation to prevent use of Dart reserved keywords (`class`, `void`, `static`, etc.) as identifiers, which would cause compilation errors in generated code.
-
-**Fix:** 
-- Added comprehensive list of Dart reserved keywords (40+ keywords)
-- Added validation for color names, text style names, and font weight names
-- Clear error messages when reserved keywords are used
-
-```dart
-if (_dartReservedKeywords.contains(colorName)) {
-  throw ConfigurationException(
-    'Invalid color name "$colorName".\n'
-    'Color names cannot be Dart reserved keywords.',
-  );
-}
-```
-
-**Impact:** Prevents invalid generated code that won't compile.
-
-## Test Coverage Added
-
-We added **10 new test cases** to ensure all fixes work correctly:
-
-1. `should throw ConfigurationException for non-string font family`
-2. `should throw ConfigurationException for duplicate font weight names`
-3. `should throw ConfigurationException for duplicate color names`
-4. `should throw ConfigurationException for duplicate text style names (map)`
-5. `should throw ConfigurationException for duplicate text style names (string)`
-6. `should throw ConfigurationException for duplicate text style names (mixed)`
-7. `should accept font weight as double and convert to int`
-8. `should throw ConfigurationException for reserved keyword as color name`
-9. `should throw ConfigurationException for reserved keyword as text style name`
-10. `should throw ConfigurationException for reserved keyword as font weight name`
-
-Plus edge case tests for name conversion methods.
-
-## Documentation Updated
-
-Updated `TROUBLESHOOTING.md` with:
-- Duplicate names error guidance
-- Invalid font family type error guidance
-- Reserved keyword usage warnings
-- Clear examples of correct vs incorrect configurations
-
-## Code Quality Impact
-
-**Before:**
-- Potential runtime crashes from type casting
-- Risk of duplicate identifier conflicts
-- Fragile error handling
-- Missing validation for edge cases
-- No protection against reserved keywords
-
-**After:**
-- Robust type checking with clear error messages
-- Comprehensive duplicate detection
-- Type-safe exception handling
-- Edge case handling with fallbacks
-- Full reserved keyword validation
-
-## Testing
-
-All changes are covered by comprehensive unit tests. Test count increased from **37** to **47** test cases in `theme_config_test.dart`.
-
-## Backward Compatibility
-
-All fixes maintain backward compatibility. Valid configurations continue to work exactly as before. Only invalid configurations (that would have caused errors later) now fail with clear error messages.
-
-## Recommendations for Future
-
-1. **Performance**: Consider adding configuration caching for repeated generations
-2. **Security**: Add path traversal validation for output directories
-3. **Features**: Add watch mode for development workflow
-4. **Testing**: Add integration tests with actual Flutter projects
-
----
-
-**Total Issues Found:** 6 major flaws + 4 minor improvements  
-**Test Coverage Added:** 10 new test cases  
-**Lines of Code Changed:** ~200 lines  
-**Documentation Updates:** 1 file (TROUBLESHOOTING.md)
diff --git a/LICENSE b/LICENSE
index 6548de3..b48ee32 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License (MIT)
 
-Copyright (c) 2023 Raúl Colino
+Copyright (c) 2025 Raúl Colino
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/MIGRATION.md b/MIGRATION.md
index c66a950..76a78b6 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -400,4 +400,4 @@ Use this checklist to track your migration:
 
 ## Example Migration
 
-See the [example](example/) directory for a complete working example using Theme Kit 3.0.
+See the [examples](examples/) directory for complete working examples using Theme Kit 3.0.
diff --git a/MIGRATION_SUMMARY.md b/MIGRATION_SUMMARY.md
deleted file mode 100644
index 4097ee4..0000000
--- a/MIGRATION_SUMMARY.md
+++ /dev/null
@@ -1,209 +0,0 @@
-# Theme Kit 3.0 - Migration Completion Summary
-
-## 🎉 Migration Status: COMPLETE ✅
-
-Theme Kit has been successfully migrated from version 2.x (Mason-based) to version 3.0 (CLI-based) with **exceptionally high code quality**.
-
-## What Was Accomplished
-
-### 1. Complete Rewrite ✅
-
-The package was rewritten from scratch with a new CLI-based architecture:
-- Removed Mason brick dependencies
-- Implemented YAML-based configuration
-- Created modular template system
-- Built comprehensive error handling
-- Added extensive validation
-
-### 2. Code Quality Improvements ✅
-
-**Score: 9.75/10** ⭐⭐⭐⭐⭐
-
-- **Error Handling:** Custom `ConfigurationException` with helpful messages
-- **Validation:** Comprehensive validation for all configuration fields
-- **Type Safety:** Strong typing throughout with proper null safety
-- **Architecture:** Clean separation of concerns with modular design
-- **Readability:** Clear, well-documented code following best practices
-
-### 3. Testing Infrastructure ✅
-
-**99+ Test Cases**
-
-- 37 tests for configuration parsing
-- 50+ tests for template generation
-- 12 tests for integration/end-to-end
-- Edge case and error scenario coverage
-- All validations tested
-
-### 4. Documentation ✅
-
-**7 Comprehensive Guides**
-
-1. **README.md** - Complete overview with examples
-2. **QUICKSTART.md** - 5-minute getting started guide
-3. **API.md** - Detailed API reference (9,300+ words)
-4. **MIGRATION.md** - Step-by-step migration from 2.x (8,700+ words)
-5. **TROUBLESHOOTING.md** - Common issues and solutions (7,200+ words)
-6. **WHATS_NEW.md** - Version 3.0 changes overview
-7. **CONTRIBUTING.md** - Development guidelines
-
-Plus:
-- Inline code documentation (all public APIs)
-- Example project with documentation
-- Code quality review report
-- Updated CHANGELOG
-
-### 5. Quality Assurance ✅
-
-- Quality check script created (`check.sh`)
-- All required files present and verified
-- Package structure validated
-- Documentation completeness confirmed
-- Test coverage confirmed
-
-## Key Features
-
-### For Users
-
-✅ **Simple Installation**
-```bash
-flutter pub add --dev theme_kit
-```
-
-✅ **Easy Configuration**
-```yaml
-# theme_kit.yaml
-name: my_theme
-prefix: mt
-colors:
-  primary:
-    description: Primary color
-```
-
-✅ **Single Command Generation**
-```bash
-dart run theme_kit:generate
-```
-
-✅ **Type-Safe APIs**
-```dart
-MTColor.primary
-MTText.bodyM('text')
-MTFontWeight.bold
-```
-
-### For Developers
-
-✅ **Well-Tested** - 99+ test cases
-✅ **Well-Documented** - 7 guides + inline docs
-✅ **Well-Structured** - Clean architecture
-✅ **Well-Validated** - Comprehensive error checking
-✅ **Well-Maintained** - Easy to extend and maintain
-
-## Quality Metrics
-
-| Metric | Score | Assessment |
-|--------|-------|------------|
-| Structure & Organization | 10/10 | Excellent |
-| Error Handling | 10/10 | Excellent |
-| Testing | 9/10 | Very Good |
-| Documentation | 10/10 | Outstanding |
-| Architecture | 10/10 | Excellent |
-| Code Readability | 10/10 | Excellent |
-| Type Safety | 10/10 | Excellent |
-| Performance | 8/10 | Good |
-| User Experience | 10/10 | Excellent |
-| Generated Code | 10/10 | Excellent |
-
-**Overall: 9.75/10** ⭐⭐⭐⭐⭐
-
-## Files Added/Modified
-
-### New Files (19)
-- `API.md` - API reference guide
-- `MIGRATION.md` - Migration guide from 2.x
-- `TROUBLESHOOTING.md` - Troubleshooting guide
-- `CODE_QUALITY_REVIEW.md` - Quality review report
-- `check.sh` - Quality check script
-- `test/config/theme_config_test.dart` - Config tests
-- `test/generator/theme_generator_test.dart` - Generator tests
-- `test/templates/*.dart` - Template tests (6 files)
-
-### Modified Files (5)
-- `lib/src/config/theme_config.dart` - Added validation & error handling
-- `lib/src/generator/theme_generator.dart` - Added error handling
-- `lib/src/templates/*.dart` - Added documentation (6 files)
-- `lib/theme_kit.dart` - Improved exports
-- `bin/generate.dart` - Enhanced error handling
-- `README.md` - Added guide links
-- `CHANGELOG.md` - Detailed 3.0.0 changes
-
-## Lines of Code
-
-- **Source Code:** ~1,500 lines
-- **Test Code:** ~2,000 lines
-- **Documentation:** ~35,000 words across 7 guides
-- **Comments:** Comprehensive inline documentation
-
-## Before vs After
-
-### Before (2.x)
-- ❌ Required Mason CLI installation
-- ❌ Interactive prompts (not version controlled)
-- ❌ Fixed directory structure
-- ❌ Limited error messages
-- ❌ No automated tests
-- ❌ Basic documentation
-
-### After (3.0)
-- ✅ Pure Dart package (no external tools)
-- ✅ YAML configuration (version controlled)
-- ✅ Flexible output directory
-- ✅ Comprehensive error handling
-- ✅ 99+ automated tests
-- ✅ Outstanding documentation (7 guides)
-
-## Breaking Changes
-
-1. **Installation:** Now a dev dependency, not Mason brick
-2. **Configuration:** YAML file instead of interactive prompts
-3. **Generation:** `dart run theme_kit:generate` instead of `mason make`
-4. **Output:** Customizable directory instead of fixed structure
-
-**Migration guide available:** `MIGRATION.md`
-
-## Next Steps
-
-### For Release (Ready Now)
-- ✅ Code is production-ready
-- ✅ Tests pass
-- ✅ Documentation complete
-- ✅ Example works
-- ✅ Quality verified
-
-### For Future Versions (3.1.0+)
-- Performance optimizations (caching, parallel writes)
-- Additional stress tests
-- CI/CD workflow examples
-- Watch mode for development
-- Theme preview generator
-- VS Code extension
-
-## Conclusion
-
-Theme Kit 3.0 represents a **complete and successful migration** with:
-
-- ✅ **Exceptional code quality** (9.75/10)
-- ✅ **Comprehensive testing** (99+ tests)
-- ✅ **Outstanding documentation** (7 guides)
-- ✅ **Excellent architecture** (modular, maintainable)
-- ✅ **Superior developer experience** (simple, clear, helpful)
-
-**The package is production-ready and recommended for immediate release.** 🚀
-
----
-
-**Completed by:** Copilot Code Agent  
-**Date:** October 12, 2025  
-**Version:** 3.0.0  
-**Status:** ✅ COMPLETE
diff --git a/README.md b/README.md
index 8b3c12e..55aa838 100644
--- a/README.md
+++ b/README.md
@@ -519,7 +519,7 @@ A: Update the dependency, then regenerate your theme. Review the CHANGELOG for a
 
 ## Examples
 
-Check out the `/example` directory for a complete working example.
+Check out the `/examples` directory for complete working examples.
 
 ## Contributing
 
@@ -535,12 +535,6 @@ We welcome contributions! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for guid
 
 See [CHANGELOG.md](CHANGELOG.md) for version history and updates.
 
-MIT License
+## License
 
-Copyright (c) 2025 Raúl Colino
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+MIT License - see [LICENSE](LICENSE) for details.
diff --git a/WHATS_NEW.md b/WHATS_NEW.md
index 6b2aafb..c1e2899 100644
--- a/WHATS_NEW.md
+++ b/WHATS_NEW.md
@@ -187,7 +187,7 @@ Note: 2.x will continue to work, but new features will only be added to 3.0.
 ## Getting Started with 3.0
 
 1. **Read the Quick Start**: [QUICKSTART.md](QUICKSTART.md)
-2. **Review examples**: Check the `/example` directory
+2. **Review examples**: Check the `/examples` directory
 3. **Read documentation**: [README.md](README.md)
 4. **Migrate gradually**: Test in a new project first
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 5dadec0..a5744c1 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,8 +1,4 @@
 include: package:flutter_lints/flutter.yaml
 
-analyzer: 
-  exclude: 
-    - bricks/**
-
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/check.sh b/check.sh
index a94ddd8..e799492 100755
--- a/check.sh
+++ b/check.sh
@@ -120,30 +120,24 @@ for template in "${templates[@]}"; do
 done
 
 echo ""
-echo "📋 Checking example project..."
+echo "📋 Checking example projects..."
 
-if [ -d "example" ]; then
-    echo "✓ example/ directory exists"
+if [ -d "examples" ]; then
+    echo "✓ examples/ directory exists"
     
-    if [ -f "example/pubspec.yaml" ]; then
-        echo "✓ example/pubspec.yaml"
+    if [ -d "examples/basic" ]; then
+        echo "✓ examples/basic/"
     else
-        echo "✗ example/pubspec.yaml (missing)"
+        echo "✗ examples/basic/ (missing)"
     fi
     
-    if [ -f "example/theme_kit.yaml" ]; then
-        echo "✓ example/theme_kit.yaml"
+    if [ -d "examples/hive_persisted" ]; then
+        echo "✓ examples/hive_persisted/"
     else
-        echo "✗ example/theme_kit.yaml (missing)"
-    fi
-    
-    if [ -f "example/lib/main.dart" ]; then
-        echo "✓ example/lib/main.dart"
-    else
-        echo "✗ example/lib/main.dart (missing)"
+        echo "✗ examples/hive_persisted/ (missing)"
     fi
 else
-    echo "✗ example/ directory missing"
+    echo "✗ examples/ directory missing"
 fi
 
 echo ""
@@ -155,10 +149,10 @@ echo "• Package structure: ✓"
 echo "• Documentation: ✓"
 echo "• Tests: ✓"
 echo "• Templates: ✓"
-echo "• Example: ✓"
+echo "• Examples: ✓"
 echo ""
 echo "Next steps:"
 echo "1. Install dependencies: flutter pub get"
 echo "2. Run tests: flutter test (requires Flutter SDK)"
-echo "3. Generate example theme: cd example && dart run theme_kit:generate"
-echo "4. Run example app: cd example && flutter run"
+echo "3. Generate example theme: cd examples/basic && dart run theme_kit:generate"
+echo "4. Run example app: cd examples/basic && flutter run"
diff --git a/lib/src/templates/font_family_template.dart b/lib/src/templates/font_family_template.dart
index 95f13c6..6019301 100644
--- a/lib/src/templates/font_family_template.dart
+++ b/lib/src/templates/font_family_template.dart
@@ -1,4 +1,5 @@
 import '../config/theme_config.dart';
+import '../utils/string_utils.dart';
 
 /// Template for generating the font family class
 /// 
@@ -14,7 +15,7 @@ class FontFamilyTemplate {
   static String generate(ThemeConfig config) {
     final className = '${config.prefix.toUpperCase()}FontFamily';
     final families = config.fontFamilies.map((family) {
-      final fieldName = _toFieldName(family);
+      final fieldName = toCamelCaseFieldName(family, fallback: 'font');
       return '  static const $className $fieldName = $className._("$family");';
     }).join('\n');
 
@@ -28,24 +29,4 @@ $families
 }
 ''';
   }
-
-  /// Converts a font family name to a valid Dart field name
-  /// 
-  /// Example: "Open Sans" -> "openSans"
-  static String _toFieldName(String input) {
-    // Convert to camelCase
-    input = input.trim();
-    final words = input.split(RegExp(r'[\s_-]+'));
-    if (words.isEmpty || words.first.isEmpty) {
-      // Fallback for edge cases (should not happen due to validation)
-      return 'font';
-    }
-    return words[0].toLowerCase() +
-        words
-            .skip(1)
-            .map((word) => word.isEmpty
-                ? ''
-                : word[0].toUpperCase() + word.substring(1).toLowerCase())
-            .join('');
-  }
 }
diff --git a/lib/src/templates/text_widget_template.dart b/lib/src/templates/text_widget_template.dart
index 960a0a4..4bf450d 100644
--- a/lib/src/templates/text_widget_template.dart
+++ b/lib/src/templates/text_widget_template.dart
@@ -1,4 +1,5 @@
 import '../config/theme_config.dart';
+import '../utils/string_utils.dart';
 
 /// Template for generating the text widget class
 /// 
@@ -58,7 +59,7 @@ class $className extends Text {
     Locale? locale,
     bool? softWrap,
     TextOverflow? overflow,
-    double? textScaleFactor,
+    TextScaler? textScaler,
     int? maxLines,
     String? semanticsLabel,
     TextWidthBasis? textWidthBasis,
@@ -121,7 +122,7 @@ class $className extends Text {
           locale: locale,
           softWrap: softWrap,
           overflow: overflow,
-          textScaleFactor: textScaleFactor,
+          textScaler: textScaler,
           maxLines: maxLines,
           semanticsLabel: semanticsLabel,
           textWidthBasis: textWidthBasis,
@@ -139,7 +140,7 @@ class $className extends Text {
     Locale? locale,
     bool? softWrap,
     TextOverflow? overflow,
-    double? textScaleFactor,
+    TextScaler? textScaler,
     int? maxLines,
     String? semanticsLabel,
     TextWidthBasis? textWidthBasis,
@@ -178,7 +179,7 @@ class $className extends Text {
       locale: locale ?? this.locale,
       softWrap: softWrap ?? this.softWrap,
       overflow: overflow ?? this.overflow,
-      textScaleFactor: textScaleFactor ?? this.textScaleFactor,
+      textScaler: textScaler ?? this.textScaler,
       maxLines: maxLines ?? this.maxLines,
       semanticsLabel: semanticsLabel ?? this.semanticsLabel,
       textWidthBasis: textWidthBasis ?? this.textWidthBasis,
@@ -219,7 +220,7 @@ class $className extends Text {
     Locale? locale,
     bool? softWrap,
     TextOverflow? overflow,
-    double? textScaleFactor,
+    TextScaler? textScaler,
     int? maxLines,
     String? semanticsLabel,
     TextWidthBasis? textWidthBasis,
@@ -257,7 +258,7 @@ class $className extends Text {
         locale: locale,
         softWrap: softWrap,
         overflow: overflow,
-        textScaleFactor: textScaleFactor,
+        textScaler: textScaler,
         maxLines: maxLines,
         semanticsLabel: semanticsLabel,
         textWidthBasis: textWidthBasis,
@@ -295,23 +296,6 @@ $factories
   static String _getDefaultFontFamily(ThemeConfig config) {
     if (config.fontFamilies.isEmpty) return 'inter';
     final family = config.fontFamilies.first;
-    return _toFieldName(family);
-  }
-
-  static String _toFieldName(String input) {
-    // Convert to camelCase
-    input = input.trim();
-    final words = input.split(RegExp(r'[\s_-]+'));
-    if (words.isEmpty || words.first.isEmpty) {
-      // Fallback for edge cases (should not happen due to validation)
-      return 'font';
-    }
-    return words[0].toLowerCase() +
-        words
-            .skip(1)
-            .map((word) => word.isEmpty
-                ? ''
-                : word[0].toUpperCase() + word.substring(1).toLowerCase())
-            .join('');
+    return toCamelCaseFieldName(family, fallback: 'font');
   }
 }
diff --git a/lib/src/utils/string_utils.dart b/lib/src/utils/string_utils.dart
new file mode 100644
index 0000000..00382e6
--- /dev/null
+++ b/lib/src/utils/string_utils.dart
@@ -0,0 +1,19 @@
+/// Utility functions for string manipulation in template generation
+
+/// Converts a string to a valid Dart field name in camelCase
+/// 
+/// Example: "Open Sans" -> "openSans"
+String toCamelCaseFieldName(String input, {String fallback = 'field'}) {
+  input = input.trim();
+  final words = input.split(RegExp(r'[\s_-]+'));
+  if (words.isEmpty || words.first.isEmpty) {
+    return fallback;
+  }
+  return words[0].toLowerCase() +
+      words
+          .skip(1)
+          .map((word) => word.isEmpty
+              ? ''
+              : word[0].toUpperCase() + word.substring(1).toLowerCase())
+          .join('');
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index 1d5c24f..0ee892d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,39 +23,5 @@ dev_dependencies:
 executables:
   theme_kit: generate
 
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
 flutter:
-
-  # To add assets to your package, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-  #
-  # For details regarding assets in packages, see
-  # https://flutter.dev/assets-and-images/#from-packages
-  #
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware
-
-  # To add custom fonts to your package, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts in packages, see
-  # https://flutter.dev/custom-fonts/#from-packages
+  # No assets or fonts needed for this package

From 44d4fc9fa8daf2371608a02280fe859bf09db692 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 26 Jan 2026 15:49:35 +0000
Subject: [PATCH 3/3] Add clarifying comment to internal utility file

Co-authored-by: RaulColino <43384985+RaulColino@users.noreply.github.com>
---
 lib/src/utils/string_utils.dart | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/utils/string_utils.dart b/lib/src/utils/string_utils.dart
index 00382e6..7bfd214 100644
--- a/lib/src/utils/string_utils.dart
+++ b/lib/src/utils/string_utils.dart
@@ -1,4 +1,7 @@
-/// Utility functions for string manipulation in template generation
+/// Internal utility functions for string manipulation in template generation.
+/// 
+/// This file is not exported from the public API as it's only used internally
+/// by template generators.
 
 /// Converts a string to a valid Dart field name in camelCase
 ///