Restored original theme pt2