Theme fixes

Multiple small fixes that make the new themes work a bit better