theme cleanup and some basic layout to use when getting started