Merge in latest fixes to My theme