applying unify theme first time - major code change