updated for the new theeme