clean up make, use git for theme