More Theme File Cleanup