Some theming tweaks. Added star + triangle shapes.