Merges in functionality from the ChargeQuietly project.
Reorganize preference screen.