Theming changes and minor dev updates