intial commit of theme redesign for 2.2