Great work! That looks really good and a lot better for the eyes.
Are you willing to share the endresult? As a jar file or as a fork on sourceforge?
I'd appreciate that very much.