Updated new theme and mockup some pages version 1