Text theme fixes