Cleaning up the old theme completelly