[escapist] Modernize