themer fixes