Second round of creating the new theme