new theme built, theme 1 and 2 edits