tweaks
resolve theme conflicts