Sonora updated

Manage Sonora according to theme