tidied up theme base