just our themes, cleanup