Update to upstream 2.3.4 and add custom theme