Updated with theme fixes