unify theme integrated
design changes