Second Round of Theme Check Corrections