Make everything more consistent and generally more nice.
I am a bit proud of this now.
Let's hope it holds up.