Improved theme [ADS-72]