Number of Fixes (V 1.8 <-> 1.9)

Nearly done with this theme as far as I can tell. I still have a few
more issues to fix but otherwise, I am almost there...