Fix Light and Mandarine themes as well

See d7b58fa