Tidied up theme to meet requirements