moved from theme edge to base