Yup, I changed it again. This time I used the old layout, but transferred the new fonts and colours over to it.
There are still a bit of glitches, and some parts I need to iron out, but so far so good. Still doesn't quite come out right on my Firefox though. Sigh...
And yes, the logo is still there. Bleah!
Will post again later.