Refactor scooch theming to match new HTML