General work to clean up theme