time fixed and some theme modifications