Remove IDs, use template-- and tone-- classes to distinquish between layout and themeing (eventually)