Commit: T602 patch

[Dom Lachowicz]

I just committed a modified version of Petr Tomasek's T602 patch that
seems to work for me. I didn't like how certain things were being stored
in the preferences. Other than that, it seems to fix a few bugs and
looks rather nice. Committed.

Dom