Fix bad render on charger in fast graphics. More package refactors.