builder/output: retheme, add ender