cleaned up themes