Theme again

Various theme fixes.