redoing everything. just getting theme to work
pulling in master