Minor restructure of the classes. Getting some of the theme options in place.