Hodge podge commit #2

Same as before - disorganised dev, disorganised commit. I should start helping out with the habari theme documentation when I finish this.