Started implementing new theme