use the fixup branch for the theme package