Theme: First pass on new default theme