sync with master theme

Signed-off-by: David Clough <dave@thecodepharmacy.co.uk>