The calorie allowance seems to be based not only on your height & weight, but on how much you said you wanted to lose each week. I'm a bit taller and a good bit heavier than you jeni, I set my weight loss at 1-2lbs a week and have a daily calorie allowance of 1320 with more added if I exercise.
I'm not getting too hung up about whether I'm sticking to the numbers in all the separate categories, but I'm making sure I don't go over the total calories.
Like you when, I've changed a lot of eating habits. I only have 1 coffee with my breakfast now and drink green tea during the rest of the day. I use Truvia anyway for sweetening cereal etc, which has no calories. I always used to eat loads of Extra Strong Mints when driving (a habit picked up when I stopped smoking), but I'm limiting them now as each mint has to be entered in the food diary.