Resolve merge conflicts with publish branch

- Keep GDPR compliance features and privacy policy content
- Preserve font sizing improvements and typography changes
- Maintain compatibility with latest publish branch changes

Author: Dale Kunce