Clean up MMS theming