cleanup & some theme adjustments