More theme modifications