Update Theme and Testing to Pass