move back to a simple system of classes. Add subtheme layout ability