New theme (Unfinished)

And various other fixes