theme setting, more formatting fixes