some theme fix and trick fix