Updates with root theme and changes naming conventions.