Improved theme extendability