Theme fixes

Theme fixes