Added thyme. Fix some settings