Refactor ThemeView for new Page relation