Again theme fixes

and some others :P