More Theme and Error Killing