Resolved conflicts in tests/test_config.py by keeping TestActiveTheme tests. Main branch has new architecture components (controller, events, layers, effects). Color scheme feature preserved and compatible.