[FNA] #147 cleanup and tabifying of remaining Graphics/ files